51 files changed, 202261 insertions, 169417 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d3a1d98c5..ff4b6ed04a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-02  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: bump version, requirements
+
 2004-06-24  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
 	* configure.in: Added Walloon (wa) to ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index 0498096588..792d7041b3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 1.5.9, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 1.5.90, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -1009,9 +1009,9 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.1.10
-GTKHTML_REQUIRED=3.1.15
-EDS_REQUIRED=0.0.94
+GAL_REQUIRED=2.1.11
+GTKHTML_REQUIRED=3.1.17
+EDS_REQUIRED=0.0.95
 BONOBOUI_REQUIRED=2.4.2
 
 AC_SUBST(GAL_REQUIRED)
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c71e66be8d..bff037ecf0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-02  JP Rosevaer  <jpr@novell.com>
+
+	* Makefile.am (SUBDIRS): Revert previous error change
+
 2004-07-01  Rodney Dawes  <dobey@novell.com>
 
 	* Makefile.am (BUILT_SOURCES): Remove $(error_i18n)
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 5d7f3c3eed..d830f00882 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -282,7 +282,6 @@ install-data-local:
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
-
-CLEANFILES = $(BUILT_SOURCES) $(error_i18n)
+BUILT_SOURCES = $(SPELL_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(error_i18n)
 
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2eff319353..6fda907726 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -316,7 +316,6 @@ mail/mail-config.c
 mail/mail-config.glade
 mail/mail-crypto.c
 mail/mail-dialogs.glade
-mail/mail-errors.xml
 mail/mail-errors.xml.h
 mail/mail-folder-cache.c
 mail/mail-mt.c
@@ -354,7 +353,7 @@ shell/evolution-test-component.c
 shell/importer/import.glade
 shell/importer/intelligent.c
 shell/main.c
-shell/shell-errors.xml
+shell/shell-errors.xml.h
 smime/gui/ca-trust-dialog.c
 smime/gui/cert-trust-dialog.c
 smime/gui/certificate-manager.c
diff --git a/po/am.po b/po/am.po
index 4a2a6de6be..9363023204 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -22,14 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "አድራሻ"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -52,33 +44,245 @@ msgstr ""
 msgid " card"
 msgstr " እና "
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "አድራሻ"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "አድራሻ"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "አድራሻ"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr ""
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+msgid "Unable to save contact(s)."
+msgstr ""
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+msgid "Error saving contacts to {0}: {1}"
+msgstr ""
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "አድራሻ"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "አውቶማቲክ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "ወር"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+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 "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -117,7 +321,7 @@ msgstr "ወር"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "ወር"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -142,15 +346,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -159,21 +363,21 @@ msgid "Personal"
 msgstr "የግል"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "አውቶማቲክ"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,57 +385,66 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -252,60 +465,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "አውቶማቲክ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "ወር"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-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 "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -313,7 +472,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -322,8 +481,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -349,6 +507,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "_ቦታ"
@@ -398,13 +557,11 @@ msgid "Anonymously"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "ቀላል"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "ዝርዝሮች"
 
@@ -620,33 +777,26 @@ msgid "cards"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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.c:702
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "ሁሉንም አስወግድ"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "ሁሉንም አስወግድ"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -661,7 +811,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr ""
 
@@ -669,14 +819,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "ምንጭ"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -704,6 +861,11 @@ msgstr "ምድብ፦ (_C)"
 msgid "_Find"
 msgstr "ፈልግ"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "ፈልግ"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -750,9 +912,8 @@ msgid "<b>Work</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -775,7 +936,6 @@ msgid "Birthday:"
 msgstr "የልደት በዓል፦"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "ቀን መቁጠሪያ፦ (_A)"
@@ -791,15 +951,15 @@ msgid "Company:"
 msgstr "የሼሉን ትእዛዝ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr ""
 
@@ -906,8 +1066,8 @@ msgstr "ገጽ"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -928,40 +1088,28 @@ msgid "_File under:"
 msgstr "የፋይል ስም"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "አድራሻ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr ""
 
@@ -1939,136 +2087,128 @@ msgstr "ዛምቢያ"
 msgid "Zimbabwe"
 msgstr "ዚምቧቤ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "ስልክ"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "የውይይት መድረክ"
+msgid "Service"
+msgstr "_የሰርቨር ስም፦"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "ቦታ፦"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "የተጠቃሚ ስም"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "መጀመሪያ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "ሌላ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "ስልክ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "የውይይት መድረክ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "ምንጭ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "ኒጀር"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d ሴኮንዶች"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "_የሰርቨር ስም፦"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "ቦታ፦"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "የተጠቃሚ ስም"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2089,6 +2229,18 @@ msgstr "ሙሉ ስም"
 msgid "E-_mail:"
 msgstr "ኢሜይል፦"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "አድራሻ"
@@ -2216,47 +2368,65 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Members"
+msgid "Add an email to the List"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "_Hide addresses when sending mail to this list"
+msgid "Insert email adresses from Adress Book"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
+msgid "Members"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "ምረጥ"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "የፋይል ስም"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr ""
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
-msgid "Contact List Editor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
+msgid "Contact List Editor"
 msgstr ""
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
@@ -2293,408 +2463,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "የፋይል ስም"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "መግለጫ የለም"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "የውይይት መድረክ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "የቤት ስልክ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "መሥራት"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "የግል"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "ማስታወሻ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "አርእስት"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "የቤት ፋክስ"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "አድራሻ"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr ""
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "አልተገኘም"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "በላዩ ላይ ይጻፍ"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "ዝርዝር"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(ምንም)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "አድራሻ"
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2708,9 +2481,9 @@ msgstr[1] "%d ሴኮንዶች"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr ""
 
@@ -2726,134 +2499,134 @@ msgstr "ሞዴል"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "ጠለቅ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "ዓይነት"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -2887,6 +2660,8 @@ msgid "Car Phone"
 msgstr ""
 
 #: 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:3
 msgid "Categories"
 msgstr "ምድቦች"
 
@@ -2894,6 +2669,21 @@ msgstr "ምድቦች"
 msgid "Company Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "ኢሜይል"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "ኢሜይል"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "ኢሜይል"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
@@ -2933,14 +2723,29 @@ msgstr "ጆርዳን"
 msgid "Manager"
 msgstr "መቆጣጠሪያ"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "ማስታወሻ"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "ቢሮ"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2994,29 +2799,21 @@ msgstr "ያልተሰየመ"
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "ስፋት"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "እርዝማኔ"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "ተመርጠዋል"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "መጻፊያ ሳጥን"
@@ -3033,7 +2830,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3042,19 +2843,383 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "ተመርጠዋል"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "የፋይል ስም"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "ኢሜይል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "መግለጫ የለም"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "የቤት ስልክ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "መሥራት"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "የግል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "አርእስት"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "የቤት ፋክስ"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "አድራሻ"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "አልተገኘም"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "በላዩ ላይ ይጻፍ"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "ዝርዝር"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(ምንም)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "አድራሻ"
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3099,6 +3264,11 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
@@ -3108,11 +3278,6 @@ msgstr ""
 msgid "Print contact"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3297,6 +3462,22 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "አድራሻ"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3352,22 +3533,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "የውስጥ ብልሽት"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "አድራሻ"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3384,40 +3549,348 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "አስወግድ"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "ላክ"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "የቀን መቁጠሪያ ኩነቶች"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "በሌላ ስም አስቀምጥ..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "ላክ"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+msgid "Could not start evolution-data-server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "ቀን መቁጠሪያ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "ቀን መቁጠሪያ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "እየጀመረ ነው"
@@ -3501,10 +3974,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "bonobo ማስጀመር አልቻልኩም!"
@@ -3645,9 +4114,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "ቦታ፦"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3665,8 +4155,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "ቀን"
 
@@ -3677,7 +4167,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3726,69 +4216,57 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 #, fuzzy
 msgid "New meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "ቀን መቁጠሪያ፦ (_A)"
+msgid "Cale_ndar"
+msgstr "ቀን መቁጠሪያ"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "አዲስ ዶሴ ፍጠር"
@@ -3819,27 +4297,6 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "ቦታ፦"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3857,228 +4314,133 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Message to Display:"
-msgstr "መልዕክት"
+msgid "<b>Alarm</b>\t"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Send"
-msgstr "መልዕክት"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "ድምፅ አጫውት፦"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "ፕሮግራምን አስኪድ፦"
+msgid "<b>Options</b>"
+msgstr "መግለጫ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Send To:"
-msgstr "ላክ"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
+msgid "<b>Repeat</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ሰዓትን"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "መልዕክት"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "ጨምር"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
 #, fuzzy
-msgid "Basics"
-msgstr "ቀላል"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "ቀን/ሰዓት፦"
+msgid "Mes_sage:"
+msgstr "መልዕክቶች"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "ድምፅ አጫውት"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "ደቂቃዎች"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "ፕሮግራምን አስኪድ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "ላክ"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "ማጠቃለያ፦"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "የመድረክ ስም"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "ፕሮግራምን አስኪድ፦"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "ምርጫዎች... (_O)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "ላክ"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "በኋላ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "ቀድሞ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "ቀን(ኦች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ሰዓትን"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "ኒው ካሌዶኒያ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "አድራሻ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "ቀለሞች (_O)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "ቀለም ምረጡ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "ኒው ካሌዶኒያ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "አዲስ መድረክ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "በድጋሚ ጀምር"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "ዓይነት፦"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "ጨምር"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_URL:"
-msgstr "url"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "ሳመንታት"
+msgid "Alarms"
+msgstr "ሁል ጊዜ"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4194,7 +4556,7 @@ msgid "Free/Busy Publishing"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "ዓርብ"
@@ -4208,7 +4570,7 @@ msgid "Minutes"
 msgstr "ደቂቃዎች"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "ሰኞ"
@@ -4218,7 +4580,7 @@ msgid "S_un"
 msgstr "_እሑድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "ቅዳሜ"
@@ -4232,7 +4594,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "እሑድ"
@@ -4246,7 +4608,7 @@ msgid "T_hu"
 msgstr "_ሐሙስ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "ሐሙስ"
@@ -4260,7 +4622,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "ማክሰኞ"
@@ -4270,7 +4632,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "ረቡዕ"
@@ -4304,7 +4666,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4354,6 +4717,80 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "ኒው ካሌዶኒያ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "አድራሻ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "ቀለሞች (_O)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "ቀለም ምረጡ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "ኒው ካሌዶኒያ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "አዲስ መድረክ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "በድጋሚ ጀምር"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "ዓይነት፦"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "url"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "ሳመንታት"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4398,77 +4835,71 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
-msgid "Could not update object"
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
-msgid "Edit Appointment"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "ወደ"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "በሌላ ስም አስቀምጥ..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
-msgid "Changes made to this item may be discarded if an update arrives"
+#: calendar/gui/dialogs/comp-editor.c:264
+msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
-msgid "Unable to use current version!"
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
-msgid "Validation error: %s"
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "ወደ"
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
+#, c-format
+msgid "Task - %s"
+msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
 msgstr ""
 
 #: calendar/gui/dialogs/copy-source-dialog.c:57
@@ -4534,8 +4965,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Contacts..."
+msgstr "ወር"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4545,164 +4977,222 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "አቀማመጥ"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "የአሁኑን ፋይል አስቀምጥ"
+msgstr[1] "የአሁኑን ፋይል አስቀምጥ"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "የአሁኑን ፋይል አስቀምጥ"
+msgstr[1] "የአሁኑን ፋይል አስቀምጥ"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "የአሁኑን ፋይል አስቀምጥ"
+msgstr[1] "የአሁኑን ፋይል አስቀምጥ"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr ""
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "የአሁኑን ፋይል አስቀምጥ"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr ""
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "የአሁኑን ፋይል አስቀምጥ"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "ምድብ... (_T)"
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "የአሁኑን ፋይል አስቀምጥ"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr ""
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "ቀን እና ሰዓት"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "ሚስጢራዊ"
+msgid "A_ll day event"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "ቀን/ሰዓት፦"
+msgid "C_ustomize..."
+msgstr "የተለመደው ዕይታ አስቀምጥ"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_ነፃ"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "ምድብ... (_T)"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
+msgid "Cale_ndar:"
+msgstr "ቀን መቁጠሪያ፦ (_A)"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "ሚስጢራዊ"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
+#, fuzzy
 msgid "L_ocation:"
 msgstr "ቦታ፦"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+#: calendar/gui/dialogs/event-page.glade.h:16
+msgid "Show time as _busy"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "ማጠቃለያ፦"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "ሰርዝ"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "መግለጫ"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "ምንም"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "አጥፉ"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "አስወግድ"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4741,34 +5231,42 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ሁኔታ"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "አድራሻ"
+msgid "<b>Organizer</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "Change Or_ganizer"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "ወር"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "_Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -4844,151 +5342,142 @@ msgstr "ዋሊስ እና ፉቱና ደሴቶች"
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "አብራ"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "መጀመሪያ"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "ሁለተኛ"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "መጨረሻ"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "ቀን ኦች"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "ቀን/ሰዓት፦"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "&ምርጫዎች"
+msgid "<b>Exceptions</b>"
+msgstr "መግለጫ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
+msgid "<b>Preview</b>"
 msgstr "ቅድመ ዕይታ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "ለውጡ"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "አስወግድ"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "This appointment rec_urs"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "ወር"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "ሳመንት"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "ዓመት"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "የፋይል ስም"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>ሁኔታ፦</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
+msgid "<span weight=\"bold\">Status</span>"
 msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
@@ -5000,8 +5489,8 @@ msgstr "ከፍ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
@@ -5013,23 +5502,22 @@ msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "የተለመደ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "ይሻሻል"
+msgid "P_ercent complete:"
+msgstr "አጥፉ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5054,37 +5542,40 @@ msgstr "ሁኔታ"
 msgid "_Web Page:"
 msgstr "ገጽ"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "ሚስጢራዊ"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "መግለጫ"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_ዶሴ፦"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5095,57 +5586,56 @@ msgstr "ቀን፦"
 msgid "_Due date:"
 msgstr "ቀን፦"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "የውይይት መድረክ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
+msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "ቀን ኦች"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr ""
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "_ቦታ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "የፋይል ስም"
+msgid "_Daily"
+msgstr "ቀን ኦች"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "ሚስጢራዊ ቃል"
+msgid "_Manual"
+msgstr "ፖስታ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "ሚስጢራዊ ቃል"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "url"
+#, fuzzy
+msgid "_Username:"
+msgstr "የተጠቃሚ ስም"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "ሳመንት"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5227,7 +5717,7 @@ msgstr "%s በ %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5236,6 +5726,11 @@ msgstr ""
 msgid "Untitled"
 msgstr "ያልተሰየመ"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "ማጠቃለያ፦"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5249,7 +5744,7 @@ msgstr "ቀን፦"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
@@ -5263,20 +5758,91 @@ msgstr "ቅድሚያ"
 msgid "Web Page:"
 msgstr "ገጽ"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "ቀን"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "ማጠቃለያ"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "ነፃ"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "ሚስጢራዊ"
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "n"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "s"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "ምሥራቅ"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "ምዕራብ"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "አዎ"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "አይ"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "ያልታወቀ"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5322,95 +5888,101 @@ msgstr ""
 msgid "100%"
 msgstr "100"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "ነፃ"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "ክፈት"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "አትም"
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ቁረጥ"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "ቅጂ"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "ለጥፍ"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "አጥፉ"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "በሌላ ስም አስቀምጥ..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5419,179 +5991,112 @@ msgstr ""
 msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "አውቶማቲክ"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "ቀን፦"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "ቅድሚያ"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "ቀን፦"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "ማጠቃለያ"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "ዶሴን አስወግድ"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "ዶሴ"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "ዶሴ ምረጡ"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "አጥፉ..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "ቀን"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "ያልታወቀ"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "አዎ"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "አይ"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "n"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "s"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "ምሥራቅ"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "ምዕራብ"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5612,36 +6117,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "ጠዋት"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "ከሳዓት"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "ጠዋት"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "ከሳዓት"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5708,341 +6213,318 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr ""
+#, fuzzy
+msgid "Starts"
+msgstr "ሁኔታ"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>ምንም</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "ቦታ፦"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6071,6 +6553,10 @@ msgstr ""
 msgid "Loading calendar..."
 msgstr ""
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -6087,11 +6573,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6159,6 +6640,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6167,207 +6670,110 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "አድራሻ"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "ምርጫዎች (_O)"
+msgid "O_ptions"
+msgstr "&ምርጫዎች"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr ""
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "አሻሽል"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "ኤፕረል"
@@ -6709,10 +7115,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr ""
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6743,7 +7145,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
@@ -6771,7 +7173,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d አጠቃላይ"
 msgstr[1] "%d አጠቃላይ"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6792,35 +7194,30 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 #, fuzzy
 msgid "_Task"
 msgstr "የማይፈለግ"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
-msgstr ""
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
+msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "አዲስ ዶሴ ፍጠር"
@@ -8486,69 +8883,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8570,42 +8967,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr ""
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "ማስጠንቀቂያ"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr ""
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8645,7 +9006,43 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "ማስጠንቀቂያ"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8653,43 +9050,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8697,103 +9094,103 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9028,7 +9425,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9107,55 +9504,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9233,7 +9630,7 @@ msgstr ""
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr ""
@@ -9320,8 +9717,11 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/camel-smime-context.c:651
 #, c-format
@@ -9334,49 +9734,53 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+msgid "Cannot attach CMS data object"
 msgstr ""
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "አዲስ ዶሴ ፍጠር"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
@@ -9425,7 +9829,8 @@ msgstr ""
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
@@ -9434,8 +9839,8 @@ msgstr ""
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ጁን"
@@ -9556,7 +9961,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9565,11 +9970,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9586,7 +9991,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9596,35 +10001,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9648,7 +10053,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9667,8 +10072,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9699,8 +10104,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9719,170 +10124,222 @@ msgstr ""
 msgid "Checklist"
 msgstr "ዝርዝር"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3190
+msgid "Operation cancelled"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3193
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "ያልታወቀ ስህተት"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
+#, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
 "%s"
+msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-command.c:389
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
+#: camel/providers/imap/camel-imap-command.c:649
+#, c-format
+msgid "IMAP server response did not contain %s information"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-command.c:685
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
+#: camel/providers/imap/camel-imap-folder.c:226
+#, c-format
+msgid "Could not create directory %s: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-folder.c:245
+#, c-format
+msgid "Could not load summary for %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
+#: camel/providers/imap/camel-imap-folder.c:1940
+#, c-format
+msgid "Unable to retrieve message: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-folder.c:1977
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
+msgid "No such message"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
+msgid "Fetching summary information for new messages"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-folder.c:866
+#: camel/providers/imap/camel-imap-folder.c:2463
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, c-format
+msgid "Failed to cache %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "ሴኔጋል"
+
+#: camel/providers/imap/camel-imap-provider.c:48
+msgid "Connection to Server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Use custom command to connect to server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Command:"
+msgstr "የሼሉን ትእዛዝ"
+
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "ዶሴዎች"
 
-#: camel/providers/imap4/camel-imap4-provider.c:42
 #: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:44
 #: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:46
 #: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
+#: camel/providers/imap/camel-imap-provider.c:64
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
+msgid "IMAP"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:78
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9892,16 +10349,16 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:206
 #: camel/providers/nntp/camel-nntp-store.c:224
@@ -9909,382 +10366,363 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:261
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
+msgid "SSL/TLS extension not supported."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
+msgid "SSL negotiations failed"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:844
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "ያልታወቀ ስህተት"
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:486
+#, c-format
+msgid "No support for authentication type %s"
+msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:373
+#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "ሚስጢራዊ ቃል አስገቡ"
+#: camel/providers/imap/camel-imap-store.c:1315
+msgid "You didn't enter a password."
+msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:492
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
+#, c-format
+msgid "No such folder %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
+msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
+#: camel/providers/imap/camel-imap-store.c:2270
+#, c-format
+msgid "Unknown parent folder: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap4/camel-imap4-engine.c:232
 #, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid "Unexpected greeting from IMAP server %s."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "የሼሉን ትእዛዝ"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1105
+#: camel/providers/imap4/camel-imap4-engine.c:422
 #, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
+msgid "Cannot select folder `%s': Bad command"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1154
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
 #, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
 msgstr ""
-
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
-msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:389
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:399
-#, c-format
-msgid "IMAP command failed: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:649
-#, c-format
-msgid "IMAP server response did not contain %s information"
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-command.c:685
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-folder.c:226
-#, c-format
-msgid "Could not create directory %s: %s"
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-folder.c:245
+#: camel/providers/imap4/camel-imap4-folder.c:947
 #, c-format
-msgid "Could not load summary for %s"
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1940
-#, c-format
-msgid "Unable to retrieve message: %s"
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
-#, c-format
+#: camel/providers/imap4/camel-imap4-provider.c:72
 msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
-msgid "No such message"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2285
-#: camel/providers/imap/camel-imap-folder.c:2355
-msgid "Fetching summary information for new messages"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2463
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2471
+#: camel/providers/imap4/camel-imap4-store.c:271
 #, c-format
-msgid "Incomplete server response: no UID provided for message %d"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2484
+#: camel/providers/imap4/camel-imap4-store.c:383
 #, c-format
 msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2660
-msgid "Could not find message body in FETCH response."
-msgstr ""
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap4/camel-imap4-store.c:502
 #, c-format
-msgid "Could not open cache directory: %s"
+msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
-#, c-format
-msgid "Failed to cache message %s: %s"
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
-#, c-format
-msgid "Failed to cache %s: %s"
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:43
-#, fuzzy
-msgid "Checking for New Mail"
-msgstr "ሴኔጋል"
-
-#: camel/providers/imap/camel-imap-provider.c:48
-msgid "Connection to Server"
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:52
-#, fuzzy
-msgid "Command:"
-msgstr "የሼሉን ትእዛዝ"
-
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:76
-msgid "IMAP"
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-provider.c:78
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
-msgid "SSL/TLS extension not supported."
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
-msgid "SSL negotiations failed"
-msgstr ""
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "የሼሉን ትእዛዝ"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap4/camel-imap4-store.c:1331
 #, fuzzy, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: camel/providers/imap/camel-imap-store.c:1272
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
-#: camel/providers/smtp/camel-smtp-transport.c:486
-#, c-format
-msgid "No support for authentication type %s"
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap4/camel-imap4-store.c:1396
 #, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1319
-msgid "You didn't enter a password."
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap4/camel-imap4-utils.c:250
 #, c-format
-msgid "No such folder %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
-msgid "The parent folder is not allowed to contain subfolders"
+msgid "Unexpected token in response from IMAP server %s: "
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': folder exists."
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap4/camel-imap4-utils.c:456
 #, c-format
-msgid "Unknown parent folder: %s"
+msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr ""
 
 #: camel/providers/imapp/camel-imapp-provider.c:39
@@ -10449,18 +10887,26 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10475,11 +10921,11 @@ msgid ""
 msgstr ""
 
 #
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
@@ -10488,14 +10934,14 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
@@ -10504,23 +10950,23 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11100,55 +11546,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -11355,93 +11813,93 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr ""
@@ -11449,26 +11907,26 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr ""
 
@@ -11532,89 +11990,6 @@ msgstr "የmime ዓይነት"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "ፋይል ክፈት"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11693,16 +12068,87 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "ፋይል ክፈት"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "መልዕክቶች"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
+msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11720,75 +12166,87 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "አስወግድ"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "አስወግድ"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "በሌላ ስም አስቀምጥ..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr ""
@@ -11796,32 +12254,48 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -12109,11 +12583,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "አጣራዎች"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12139,167 +12608,42 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "ዶሴን አስወግድ"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr ""
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "ተመርጠዋል"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr ""
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>ሁኔታ፦</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "ዶሴ ምረጡ"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>ሁኔታ፦</b>"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>ሁኔታ፦</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr ""
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr ""
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "ወር"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "ሴኮንዶች"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr ""
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr ""
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr ""
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "ዓመታት"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "አስፈላጊ"
 
@@ -12366,6 +12710,65 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "ወር"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "ሴኮንዶች"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "ዓመታት"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12378,61 +12781,70 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "ሲሼልስ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "ነጥብ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr ""
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
 msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "ዶሴ (_F)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "ጨምር"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "ፖስታ"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
+#: 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:99
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "ፖስታ"
+
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
 msgid "[Default]"
@@ -12463,49 +12875,338 @@ msgstr ""
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: mail/em-folder-browser.c:129
-msgid "Create _Virtual Folder From Search..."
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "አጣራዎች"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "ዶሴ ምረጡ"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
-#: mail/em-folder-properties.c:120
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr ""
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:5
 #, fuzzy
-msgid "Folder properties"
+msgid "Attachments"
 msgstr "ምርጫዎች"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "ምርጫዎች"
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "ቤሊዘ"
 
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "ቦታ፦"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "ወደ ዶሴን ሂዱ..."
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "አጥፉ"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "የቀን መቁጠሪያ ኩነቶች"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "የጠፋ"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "ቦታ፦"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "አድራሻ"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "ንድፍ"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "ውጣ (_X)"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "ምዕራብ"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "መግለጫ የለም"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "ነው"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "በኋላ"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "ቀድሞ"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "አይደለም"
+
+#: mail/em-filter-i18n.h:34
 #, fuzzy
-msgid "Folder Name"
-msgstr "የዶሴ ስም፦ (_F)"
+msgid "is not Flagged"
+msgstr "አይደለም"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-filter-i18n.h:36
 #, fuzzy
-msgid "Total messages"
+msgid "Junk Test"
+msgstr "ጁን"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "መለያ"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "ኢሜያል አድራሻ"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "መልዕክት"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "መልዕክት"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
 msgstr "መልዕክቶች"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-filter-i18n.h:42
 #, fuzzy
-msgid "Unread messages"
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+msgid "Message is not Junk"
+msgstr "መልዕክት"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "ወደ ዶሴን ሂዱ..."
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "ከፕሮግራሙ ውጣ"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "ድምፅ አጫውት"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "አንብብ"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "ደቂቃዎች"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "ደቂቃዎች"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "ፕሮግራምን አስኪድ፦"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "ነጥብ"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "ላክ"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "ሁኔታ"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "መጠን kb"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "ምንጭ"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr ""
+
+#: mail/em-filter-i18n.h:61
+#, fuzzy
+msgid "starts with"
+msgstr "አድራሻ"
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "መግለጫ የለም"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "ጉዳዩ"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "አሜሪካ"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
+
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "ምርጫዎች"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "መልዕክቶች"
+msgstr[1] "መልዕክቶች"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
+msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12515,408 +13216,421 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "በመጫን ላይ..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "ዶሴን አስወግድ"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "ዶሴ"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "መልዕክቶች"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "መንቀሳቅስ"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "ተወው"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "ቅጂ"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "ተመልከት (_V)"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "ቅጂ... (_C)"
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "መንቀሳቅስ... (_M)"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "እንደገና ሰይም"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "እንደገና ሰይም... (_R)"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
 msgstr "ምርጫዎች"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "በመጫን ላይ..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "ፖስታ"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "መለያ"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "አጣራዎች"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "የነበረው"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "ከ"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "ያልተሰየመ"
+
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "ወደ"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "ጉዳዩ"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "ቀን"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651
+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.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "ያልታወቀ ስህተት፦ %s"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "ያልታወቀ ስህተት፦ %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
-#, fuzzy
-msgid "Unsigned"
-msgstr "ያልተሰየመ"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr ""
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1086
+#, fuzzy
+msgid "_Hide"
+msgstr "ደብቅ"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12952,9 +13666,35 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "ከ"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr ""
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "ወደ"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr ""
 
@@ -12968,100 +13708,45 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "ቀን"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr ""
+msgid "Error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "ደብቅ"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr ""
+msgid "Unknown error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13179,7 +13864,7 @@ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13192,7 +13877,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "ዶሴ"
 
@@ -13229,11 +13914,24 @@ msgid "Add address"
 msgstr "አድራሻ"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "መልዕክቶች"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "ዶሴ (_F)"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "ጨምር"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13687,63 +14385,34 @@ msgstr ""
 msgid "spamd port"
 msgstr "ከውጭ አስገባ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "ፖስታ"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
@@ -13802,34 +14471,6 @@ msgstr "ከውጭ አስገባ"
 msgid "Importing mailbox"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13972,82 +14613,88 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d ተመርጠዋል"
+msgid_plural "%d deleted"
+msgstr[0] "%d ተመርጠዋል"
+msgstr[1] "%d ተመርጠዋል"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d አዲስ"
+msgid_plural "%d junk"
+msgstr[0] "%d አዲስ"
+msgstr[1] "%d አዲስ"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d ቀን"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d ቀን"
+msgstr[1] "%d ቀን"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d ተልኳል"
+msgid_plural "%d sent"
+msgstr[0] "%d ተልኳል"
+msgstr[1] "%d ተልኳል"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d ተልኳል"
+msgid_plural "%d unsent"
+msgstr[0] "%d ተልኳል"
+msgstr[1] "%d ተልኳል"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d አጠቃላይ"
+msgid_plural "%d total"
+msgstr[0] "%d አጠቃላይ"
+msgstr[1] "%d አጠቃላይ"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Message"
 msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "_Mail Message"
 msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "ዶሴ (_F)"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -14098,15 +14745,22 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "ቅድመ ዕይታ"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14359,7 +15013,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "ጨርሷል"
 
@@ -14696,6 +15350,117 @@ msgstr "ቀለም"
 msgid "description"
 msgstr "መግለጫ"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+msgid "Accept License"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "ፈልግ"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "መግለጫ"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "ተመርጠዋል"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "_የሰርቨር ስም፦"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "መረጃ"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "ባንዲራ"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -14882,14 +15647,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -14898,8 +15655,9 @@ msgstr "ሚስጢራዊ ቃል አስገቡ"
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
+#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
+msgstr "አድራሻ"
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:90
@@ -14993,8 +15751,11 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15008,8 +15769,11 @@ msgstr ""
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #. mail:no-move-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
@@ -15025,8 +15789,11 @@ msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
@@ -15044,8 +15811,9 @@ msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "አዲስ ዶሴ ፍጠር"
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15074,8 +15842,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "አታጥፋ (_U)"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15090,8 +15859,11 @@ msgstr ""
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
+#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #. mail:signature-notscript secondary
 #: mail/mail-errors.xml.h:177
@@ -15134,8 +15906,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15167,13 +15942,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "ዶሴን አስወግድ"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "ተመርጠዋል"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15181,16 +15986,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "በላዩ ላይ ይጻፍ"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "ላክ"
@@ -15346,53 +16151,28 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "ፈልግ"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "መረጃ"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr ""
@@ -15429,24 +16209,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15503,15 +16283,15 @@ msgstr "አዲስ ዶሴ ፍጠር"
 msgid "Updating vFolders for '%s'"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
@@ -15575,7 +16355,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15631,10 +16411,6 @@ msgstr "ወደፊት"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "አንብብ"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15647,49 +16423,48 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "ባንዲራ"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "መግለጫ"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "ተመርጠዋል"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-#, fuzzy
-msgid "S_erver:"
-msgstr "_የሰርቨር ስም፦"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
@@ -15755,32 +16530,19 @@ msgstr ""
 msgid "mail"
 msgstr "ኢሜይል"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "ያልታወቀ ስህተት"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
+msgid "<b>Active Connections</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "አጠቃላይ ስህተት"
-
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(ያልተሰየመ)"
@@ -15947,23 +16709,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -15981,117 +16726,87 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "የውይይት መድረክ"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "አዲስ"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "ፈተና"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "ፈተና"
-
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "<b>ሁኔታ፦</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "ቀን መቁጠሪያ፦ (_A)"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "ወር"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "ፖስታ፦ (_M)"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Tasks:"
-msgstr "የማይፈለግ"
+msgid "Uknown system error."
+msgstr "ያልታወቀ ስህተት"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "የዶሴ ዓይነት፦"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "ዶሴን እንደገና ሰይም"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "የመድረክ ስም"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "የዶሴ ስም፦ (_F)"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "አጠቃላይ ስህተት"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "ተጠቃሚ፦ (_U)"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "አዲስ"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16100,7 +16815,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16108,17 +16823,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "ፈተና"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr ""
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "ፈተና"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr ""
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "አዲስ ዶሴ ፍጠር"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16181,7 +16899,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16201,45 +16919,45 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16278,18 +16996,21 @@ msgid ""
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
+#, fuzzy
 msgid "Continue"
-msgstr ""
+msgstr "ቦታ፦"
 
 #. shell:noshell title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
 msgid "Cannot start Evolution"
-msgstr ""
+msgstr "አውቶማቲክ"
 
 #. shell:noshell primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
 msgid "Evolution can not start."
-msgstr ""
+msgstr "የኩነቶች መረጃ"
 
 #. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
@@ -16309,6 +17030,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16554,6 +17297,11 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -16765,11 +17513,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16909,8 +17652,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
@@ -17395,16 +18138,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "ይሄንን መስኮት ዝጋ"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "ዝጋ (_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17810,6 +18543,16 @@ msgstr "መሣሪያዎች (_T)"
 msgid "_Undelete"
 msgstr "አታጥፋ (_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "ይሄንን መስኮት ዝጋ"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "ዝጋ (_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17892,10 +18635,6 @@ msgstr "የአሁኑን ፋይል በተለየ ስም አስቀምጥ"
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "ላክ"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18467,7 +19206,7 @@ msgid "Evolution Query"
 msgstr ""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18620,6 +19359,144 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "የፋይል ስም"
+
+#~ msgid "URL:"
+#~ msgstr "url"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "የውይይት መድረክ"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "ቀን መቁጠሪያ፦ (_A)"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "መልዕክት"
+
+#~ msgid "Play sound:"
+#~ msgstr "ድምፅ አጫውት፦"
+
+#~ msgid "Run program:"
+#~ msgstr "ፕሮግራምን አስኪድ፦"
+
+#, fuzzy
+#~ msgid "Basics"
+#~ msgstr "ቀላል"
+
+#~ msgid "Date/Time:"
+#~ msgstr "ቀን/ሰዓት፦"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "ደቂቃዎች"
+
+#~ msgid "_Options..."
+#~ msgstr "ምርጫዎች... (_O)"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "ሚስጢራዊ"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "ቀን/ሰዓት፦"
+
+#~ msgid "F_ree"
+#~ msgstr "_ነፃ"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "አድራሻ"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "&ምርጫዎች"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "ቅድመ ዕይታ"
+
+#~ msgid "_Modify"
+#~ msgstr "ለውጡ"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "ይሻሻል"
+
+#~ msgid "Con_fidential"
+#~ msgstr "ሚስጢራዊ"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_ዶሴ፦"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>ምንም</i>"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "አድራሻ"
+
+#~ msgid "_Options"
+#~ msgstr "ምርጫዎች (_O)"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr ""
+#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "አዲስ ዶሴ ፍጠር"
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "ሲሼልስ"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "የዶሴ ስም፦ (_F)"
+
+#~ msgid "_Rename"
+#~ msgstr "እንደገና ሰይም"
+
+#~ msgid "_Properties..."
+#~ msgstr "ምርጫዎች"
+
+#~ msgid "C_alendar:"
+#~ msgstr "ቀን መቁጠሪያ፦ (_A)"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "ወር"
+
+#~ msgid "_Mail:"
+#~ msgstr "ፖስታ፦ (_M)"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "የማይፈለግ"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "የዶሴ ዓይነት፦"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "ዶሴን እንደገና ሰይም"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "የዶሴ ስም፦ (_F)"
+
+#~ msgid "_User:"
+#~ msgstr "ተጠቃሚ፦ (_U)"
+
+#, fuzzy
 #~ msgid "Email address:"
 #~ msgstr "ኢሜያል አድራሻ"
 
@@ -18657,16 +19534,6 @@ msgstr ""
 #~ msgstr "ምንጭ"
 
 #, fuzzy
-#~ msgid "Save Event"
-#~ msgstr "የቀን መቁጠሪያ ኩነቶች"
-
-#, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr ""
-#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-#~ "%s"
-
-#, fuzzy
 #~ msgid "Stream error"
 #~ msgstr "የውስጥ ብልሽት"
 
@@ -18680,44 +19547,6 @@ msgstr ""
 #~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 #~ "%s"
 
-#~ msgid "Deleted"
-#~ msgstr "የጠፋ"
-
-#~ msgid "Draft"
-#~ msgstr "ንድፍ"
-
-#~ msgid "is"
-#~ msgstr "ነው"
-
-#~ msgid "is not"
-#~ msgstr "አይደለም"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "ጁን"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "መልዕክቶች"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "መልዕክት"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "ከፕሮግራሙ ውጣ"
-
-#~ msgid "Play Sound"
-#~ msgstr "ድምፅ አጫውት"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "ፕሮግራምን አስኪድ፦"
-
-#~ msgid "Size (kB)"
-#~ msgstr "መጠን kb"
-
 #, fuzzy
 #~ msgid "_Filename:"
 #~ msgstr "የፋይል ስም፦"
@@ -18750,10 +19579,6 @@ msgstr ""
 #~ msgstr "ቀን መቁጠሪያ"
 
 #, fuzzy
-#~ msgid "task list"
-#~ msgstr "አድራሻ"
-
-#, fuzzy
 #~ msgid "VFolder on Thread"
 #~ msgstr "የዶሴ ስም፦"
 
@@ -18775,10 +19600,6 @@ msgstr ""
 #~ msgstr "ጨርሷል"
 
 #, fuzzy
-#~ msgid "Group:"
-#~ msgstr "የውይይት መድረክ"
-
-#, fuzzy
 #~ msgid "A_ddress..."
 #~ msgstr "አድራሻ..."
 
@@ -19062,18 +19883,6 @@ msgstr ""
 #~ msgstr "ዩጎዝላቪያ"
 
 #, fuzzy
-#~ msgid "<b>Classification</b>"
-#~ msgstr "<b>ሁኔታ፦</b>"
-
-#, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "ቀን እና ሰዓት"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "መግለጫ"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "ማጠቃለያ"
 
@@ -19258,9 +20067,6 @@ msgstr ""
 #~ msgid "South"
 #~ msgstr "ደቡብ"
 
-#~ msgid "West"
-#~ msgstr "ምዕራብ"
-
 #~ msgid "Rain"
 #~ msgstr "ዝናብ"
 
@@ -19272,21 +20078,12 @@ msgstr ""
 #~ msgid "_New Feed"
 #~ msgstr "_አዲስ ዶሴ (_N)"
 
-#~ msgid "_Copy..."
-#~ msgstr "ቅጂ... (_C)"
-
 #~ msgid "_Folder..."
 #~ msgstr "ዶሴ... (_F)"
 
 #~ msgid "_Go to Folder..."
 #~ msgstr "ወደ ዶሴን ሂዱ... (_G)"
 
-#~ msgid "_Move..."
-#~ msgstr "መንቀሳቅስ... (_M)"
-
-#~ msgid "_Rename..."
-#~ msgstr "እንደገና ሰይም... (_R)"
-
 #~ msgid "_Shortcut..."
 #~ msgstr "አቋራጭ... (_S)"
 
@@ -19329,8 +20126,5 @@ msgstr ""
 #~ msgid "Host"
 #~ msgstr "እንግዳ ተቀባይ"
 
-#~ msgid "Select"
-#~ msgstr "ምረጥ"
-
 #~ msgid "rd"
 #~ msgstr "rd$"
diff --git a/po/ar.po b/po/ar.po
index 7250bb8f45..39f8d3fbaa 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,793 +11,872 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-07 17:06-0500\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-20 13:25+0200\n"
 "Last-Translator: Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "دفتر عناوين إيفُليوشِن"
+
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "سرد مجلّدات دفتر العناوين المحلي"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "حفظ كـ"
+
+#: a11y/addressbook/ea-minicard-view.c:102
+msgid "has "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "بطاقات"
+
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "بطاقات"
+
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "المراسَلون: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "تنبيه إيفُليوشِن"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "لم يمكن إرسال العنصر!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "فشل التّوثيق مع نادل LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "إستجاب النّادل دون دعم لأي قواعد بحث"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "لا يدعم هذا النّادل معلومات مخطّط LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "لم يمكن جلب قائمة المجموعات من النّادل."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "لم يستجب النّادل بمعلومات مخطّط سليمة"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "لم يمكن تحميل دفتر العناوين"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "محرّر الفئات غير متوفّر."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "لم يمكن فتح دفتر العناوين"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "خطأ عند تحميل دفتر العناوين الإفتراضي."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "لم يمكن معالجة مجلّد البكرة"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "هل تريد حفظ التّغييرات؟"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_نبذ"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "و مراسَل آخر."
 
-#: addressbook/conduit/address-conduit.c:272
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "لم يمكن ترجمة محتويات الرّسالة"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "خطأ أثناء إضافة المراسَل"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "عارض عناوين دفتر عناوين إيفُليوشِن"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "عنوان التّزامن الإفتراضي:"
 
-#: addressbook/conduit/address-conduit.c:1150
-#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "لم يمكن تحميل دفتر العناوين"
 
-#: addressbook/conduit/address-conduit.c:1214
-#: addressbook/conduit/address-conduit.c:1217
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "لم يمكن قراءة قالب تطبيقات العناوين للحاسوب اليدوي"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "التّكملة التّلقائية"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "المراسَلون"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "الشّهادات"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete 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
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "المراسَلون"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "دفتر عناوين إيفُليوشِن"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "نافذة منبثقة لعناوين دفتر عناوين إيفُليوشِن"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "عارض عناوين دفتر عناوين إيفُليوشِن"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "عارض بطاقات دفتر عناوين إيفُليوشِن"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 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
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "قطعة إدارة شهادة S/MIME لإيفُليوشِن"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 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"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
 msgstr "أدر شهادات S/Mime هنا"
 
-#: addressbook/gui/component/addressbook-component.c:145
-#: addressbook/gui/component/ldap-config.glade.h:28
-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
+#: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
 msgstr "مراسَل جديد"
 
-#: addressbook/gui/component/addressbook-component.c:218
+#: addressbook/gui/component/addressbook-component.c:94
 msgid "_Contact"
 msgstr "_مراسَل"
 
-#: addressbook/gui/component/addressbook-component.c:219
+#: addressbook/gui/component/addressbook-component.c:95
 msgid "Create a new contact"
 msgstr "إنشاء مراسَل جديد"
 
-#: addressbook/gui/component/addressbook-component.c:224
+#: addressbook/gui/component/addressbook-component.c:101
 msgid "New Contact List"
 msgstr "قائمة مراسَلين جديدة"
 
-#: addressbook/gui/component/addressbook-component.c:225
+#: addressbook/gui/component/addressbook-component.c:102
 msgid "Contact _List"
 msgstr "_قائمة مراسَلين"
 
-#: addressbook/gui/component/addressbook-component.c:226
+#: addressbook/gui/component/addressbook-component.c:103
 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
+#: addressbook/gui/component/addressbook-component.c:109
+#, fuzzy
+msgid "New Contacts Group"
+msgstr "مراسَل جديد"
+
+#: addressbook/gui/component/addressbook-component.c:110
+#, fuzzy
+msgid "Contacts Grou_p"
+msgstr "المراسَلون: "
+
+#: addressbook/gui/component/addressbook-component.c:111
+#, fuzzy
+msgid "Create a new contacts group"
+msgstr "إنشاء مجموعة مختصرات جديدة"
+
+#: addressbook/gui/component/addressbook-component.c:184
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+msgid "Migrating..."
+msgstr "جاري التنزيح..."
+
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#, c-format
+msgid "Migrating `%s':"
+msgstr "جاري تنزيح `%s':"
+
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:489
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 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
+#. Create the default Person addressbook
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 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
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "على نوادل LDAP"
 
-#. FIXME: parent
-#: addressbook/gui/component/addressbook-config.c:244
-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 "فشل الإتّصال بنادل LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:440
-msgid "Failed to authenticate with LDAP server"
-msgstr "فشل التّوثيق مع نادل LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:468
-msgid "Could not perform query on Root DSE"
-msgstr "لم يمكن القيام ببحث على DSE الجذري"
-
-#: 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 "لا يدعم هذا النّادل معلومات مخطّط LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1225
-msgid "Error retrieving schema information"
-msgstr "حدث خطأ عند سحب معلومات المخطّط"
+#: addressbook/gui/component/addressbook-migrate.c:633
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "على نوادل LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:1233
-msgid "Server did not respond with valid schema information"
-msgstr "لم يستجب النّادل بمعلومات مخطّط سليمة"
+#: addressbook/gui/component/addressbook-migrate.c:753
+#, fuzzy
+msgid "Autocompletion Settings"
+msgstr "التّكملة التّلقائية"
 
-#: addressbook/gui/component/addressbook.c:500
+#: addressbook/gui/component/addressbook-migrate.c:1129
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. الرجاءً التأكّد من وجود\n"
-"المسار و التراخيص الكافية للنفاذ إليه."
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook-migrate.c:1143
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك\n"
-"أنّك أدخلت عنواناً خاطأ، أو أنّه لا يمكن الوصول إلى نادل LDAP."
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook-migrate.c:1152
+#, fuzzy
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"لم يُجمع دعم LDAP في الإصدارة الحاليّة لإيفُليوشِن\n"
-"إذا كنت تريد استخدام LDAP في إيفُليوشِن قم بتجميع البرنامج\n"
-"من مصادر الـ CVS بعد جلب OpenLDAP من الوصلة أدناه.\n"
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: addressbook/gui/component/addressbook.c:521
+#: addressbook/gui/component/addressbook-migrate.c:1162
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك\n"
-"أنّك أدخلت عنواناً غير سليم، أو أنّه لم يمكن الوصول للنّادل."
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: addressbook/gui/component/addressbook.c:539
-msgid "Unable to open addressbook"
-msgstr "لم يمكن فتح دفتر العناوين"
+#: addressbook/gui/component/addressbook-view.c:633
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "ستحذف الرُّزنامة '%s'. هل تريد الإستمرار؟"
+
+#: addressbook/gui/component/addressbook-view.c:714
+#, fuzzy
+msgid "New Address Book"
+msgstr "دفتر عناوين جديد"
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "حذف"
+
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+msgid "Properties..."
+msgstr "خصائص..."
+
+#: addressbook/gui/component/addressbook.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr "النّفاذ إلى نادل LDAP كشخص مجهول"
 
-#: addressbook/gui/component/addressbook.c:670
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "فشل التّوثيق.\n"
 
-#: addressbook/gui/component/addressbook.c:676
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
 
-#: addressbook/gui/component/addressbook.c:802
-msgid "Name begins with"
-msgstr "يبدأ الإسم بـ"
-
-#: addressbook/gui/component/addressbook.c:803
-msgid "Email begins with"
-msgstr "يبدأ البريد الإلكتروني بـ"
-
-#: 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:805
-#: calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "أي حقل يحوي"
-
-#: addressbook/gui/component/addressbook.c:806
-msgid "Advanced..."
-msgstr "متقدّم..."
-
-#: 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"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"طابَق هذا الاستعلام بطاقات أكثر ممّا هو معدّ للنّادل إرجاعه\n"
-"أو لإيفُليوشِن إظهاره. الرجاءً جعل بحثك أكثر دقّة\n"
-"أو رفع قيمة الحدّ الأقصى للنتائج في تفضيلات نادل الدّليل\n"
-"لدفتر العناوين هذا."
-
-#: 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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"لقد تخطّى وقت تنفيذ هذا الإستعلام حدّ النّادل أو الحدّ المعدّ لدفتر\n"
-"العناوين هذا. الرجاءً جعل بحثك أكثر دقّة أو رفع قيمة الحدّ الأقصى لزمن الإستعلام\n"
-"في تفضيلات نادل الدّليل لدفتر العناوين هذا."
-
-#: addressbook/gui/component/addressbook.c:939
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "لم تتمكن خلفيّة دفتر العناوين هذا من ترجمة هذا البحث."
-
-#: addressbook/gui/component/addressbook.c:942
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "رفضت خلفيّة دفتر العناوين القيام بهذا البحث."
-
-#: addressbook/gui/component/addressbook.c:945
-msgid "This query did not complete successfully."
-msgstr "لم يتمّ البحث بنجاح."
-
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:982
-#: calendar/gui/cal-search-bar.c:353
-msgid "Any Category"
-msgstr "أيّ صنف"
-
-#: addressbook/gui/component/addressbook.c:1063
-msgid "UID of the contacts source that the view will display"
-msgstr "هوية المستخدم لمصدر المراسَلين الذي سيظهره المشهد"
-
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "EFolderList·xml لقائمة عنواين التكملة الآليّة"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#, fuzzy
+msgid "Position of the vertical pane in main view"
+msgstr "موقع اللّوح العمودي في مشهد الشّهر"
+
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 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
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 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
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "  S_how Supported Bases "
-msgstr "  عرض ال_قواعد المدعومة "
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.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/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "3268"
+msgstr "3268"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "389"
+msgstr "389"
+
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
-msgstr "1:00"
+msgid "5"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr "2:30"
+msgid "636"
+msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
-msgstr "3268"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "التّوثّق"
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "389"
-msgstr "389"
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "ال_معرض"
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "5:00"
-msgstr "5:00"
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "636"
-msgstr "636"
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "جاري البحث"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Addressbook Creation Assistant"
-msgstr "مساعد إنشاء دفاتر العناوين"
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "الخطوة الثّانية: معلومات عن النّادل"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Sources"
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>مستحَق:</b> "
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "إضافة للمراسَلين"
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "مصادر دفاتر العناوين"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "دائماً"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "كشخص مجهول"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid ""
-"Congratulations, you are finished setting up this addressbook.\n"
-"\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
-msgstr ""
-"تهانينا، انهيت ضبط دفتر العناوين هذا.\n"
-"\n"
-"رجاءً أُنقر زر \"إنهاء\" لحفظ التّعيينات التي أدخلتها هنا."
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Basic"
+msgstr "أساسي"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Connecting"
-msgstr "جاري الإتّصال"
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "تفاصيل"
 
 #: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Distinguished _name:"
+#, fuzzy
+msgid "Distinguished name"
 msgstr "إ_سم مميّز:"
 
 #: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Edit LDAP Server"
-msgstr "تحرير نادل LDAP"
+#, fuzzy
+msgid "Download limit:"
+msgstr "حدّ الإ_نزال:"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Email address:"
+#, fuzzy
+msgid "Email address"
 msgstr "عنوان البريد الإلكتروني:"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "سيستخدم إيفُليوشِن الإسم المميّز هذا لتوثيقك مع النّادل"
+#, fuzzy
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr "سوف يستخدم إيفُليوشِن عنوان البريد الإلكتروني هذا لتوثيقك مع النّادل"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "سوف يستخدم إيفُليوشِن عنوان البريد الإلكتروني هذا لتوثيقك مع النّادل"
+#, fuzzy
+msgid "Find Possible Search Bases"
+msgstr "قواعد البحث المدعومة"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Finished"
-msgstr "إنتهى"
-
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: smime/gui/smime-ui.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "عام"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-msgid "Group:"
-msgstr "مجموعة:"
-
-#: addressbook/gui/component/ldap-config.glade.h:27 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "أبداً"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Only locations within starting point"
 msgstr ""
-"يجب أن تحدّد الآن الكيفيّة التي تريد بها الإتّصال بنادل LDAP.تستخدم بروتوكولات الـ"
-"SSL و الـ TLS من قبل بعض النّوادل لحماية إتّصالك كريبتوغرافيا\n"
-"إسأل مدير نظامك إذا كان نادل LDAP يستخدم هذه البروتوكولات."
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-msgid "One"
-msgstr "واحد"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "قاعدة ال_بحث:"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "S_earch scope: "
-msgstr "نطاق ال_بحث: "
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Search base only"
+msgstr "قاعدة ال_بحث:"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-list-view.c:396 calendar/gui/e-cal-view.c:589
-#: calendar/gui/gnome-cal.c:585
-msgid "Searching"
-msgstr "جاري البحث"
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Search base:"
+msgstr "قاعدة ال_بحث:"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "Selected:"
-msgstr "مُنتقى:"
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search scope:"
+msgstr "نطاق ال_بحث: "
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "إنتقاء هذا الخيار يعني أن إيفُليوشِن لن يتصل بنادل LDAP إلّا\n"
 "إذا كان النادل يدعم SSL أو TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "إنتقاء هذا الخيار يعني أن إيفُليوشِن سوف يحاول إستخدام SSL/TLS فقط إن كنت في\n"
 "بيئة غير آمنة. مثلاً، إذا كان جهازك ونادل LDAP خلف جدار ناري\n"
 "عند العمل، فإن إيفُليوشِن لن يحتاج لاستخدام SSL/TLS لأن إتّصالك آمن أصلاً."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "إنتقاء هذا الخيار يعني أن نادلك لا يدعم SSL أو TLS.\n"
 "هذا يعني أن إتّصالك لن يكون آمناً، وأنّك ستكون معرّضاً \n"
 "لمخاطر أمنيَّة."
 
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "Starting point and locations within it"
 msgstr ""
-"إنتقاء هذا الخيار سوف يسمح لك بتغيير إعدادات إيفُليوشِن الإفتراضيّة\n"
-"لبحث نوادل LDAP كما إنشاء وتعديل المراسَلين."
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"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: Folder Characteristics"
-msgstr "الخطوة الأولى: صفات المجلّد"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Server Information"
-msgstr "الخطوة الثّانية: معلومات عن النّادل"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Connecting to Server"
-msgstr "الخطوة الثّالثة: الإتّصال بالنّادل"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Searching the Directory"
-msgstr "الخطوة الرّابعة: البحث في الدّليل"
-
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid "Sub"
-msgstr "فرعي"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "قواعد البحث المدعومة"
 
-#. I SUGGEST: replacing "مدخلات" with "بنود"
-#: addressbook/gui/component/ldap-config.glade.h:54
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-"تتحكم الخيارات على هذه الصّفحة بعدد المدخلات التي يجب أن تُضم في\n"
-"بحوثك، والوقت الذي يستغرقه كل بحث. إسأل مدير نظامك إن كنت\n"
-"تحتاج أن تغيّر هذه الخيارات."
-
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "قاعدة البحث هي الإسم المميّز (DN) للمدخل الذي تبدأ عنده بحوثك.\n"
 "إن تركت هذا فارغاً، سيبدأ البحث عند جذر شجرة الدّليل."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
-#. I SUGGEST: actually I don't. I changed the first line
-#. (added a couple of words. Tell me what you think).
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "نطاق البحث يحدد مدى التوغل في شجرة الدّليل.\n"
 "يشمل نطاق البحث \"الفرعي\" كل المدخلات تحت قاعدة بحثك.\n"
 "لن يشمل نطاق البحث \"واحد\" إلا المدخلات الواقعة تحت قاعدتك بمستوىً واحد.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
-msgid ""
-"This assistant will help you create a new addressbook. \n"
-"\n"
-"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"
-"\n"
-"بناءً على نوع دفتر العناوين الذي ستنشئه، قد يتطلب هذا مُعاملات إضافية.\n"
-"الرجاءً الإتّصل بمدير نظامك إن احتجت مساعدة في إيجاد هذه المعلومات."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
-msgstr ""
-"هذا هو الإسم الكامل لنادل ldap. مثلا، \"ldap.mycompany.com\"."
+msgstr "هذا هو الإسم الكامل لنادل ldap. مثلا، \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
-"too large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr ""
 "هذا هو العدد الأقصى للمدخلات لتنزيلها. تحديد هذا العدد برقم\n"
 "كبير جداً سوف يبطئ دفتر عناوينك."
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:40
 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 ""
-"هذه هي الطّريقة التي سيستخدمها إيفُليوشِن لتوثيقك.  لاحظ أنّ "
-"ضبط هذا لـ\"عنوان بريد الكتروني\" يتطلب نفاذا كشخص مجهول لنادل ldap."
+"هذه هي الطّريقة التي سيستخدمها إيفُليوشِن لتوثيقك.  لاحظ أنّ ضبط هذا لـ\"عنوان "
+"بريد الكتروني\" يتطلب نفاذا كشخص مجهول لنادل ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "هذا هو الإسم لهذا النّادل الذي سيظهر على لائحتك لمجلّدات إيفُليوشِن.\n"
 "إنّه لغرض العرض فقط. "
 
-#: 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
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "هذا هو المنفذ على نادل LDAP الذي سيحاول إيفُليوشِن الإتّصال به. \n"
 "تم تجهيز قائمة من المنافذ الإعتيادية. اسأل مدير نظامك\n"
 "عن المنفذ الذي يجب أن تحدّده."
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-msgid "This option controls how long a search will be run."
-msgstr "يتحكّم هذا الخيار في مدّة القيام ببحث."
-
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "U_se SSL/TLS:"
-msgstr "إ_ستخدام SSL/TLS:"
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "Timeout:"
+msgstr "صيغة الوقت:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "بإستخدام الإسم المُميّز (DN)"
 
-#. I SUGGEST: comparing this with the previous entry.
-#. We really have to do more about consistency :(
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "سيستخدم عنوان البريد الإلكتروني"
 
-#. I SUGGEST: replacing "حالما" with "أينما" simply because
-#. the first one means "immediately when". And besides
-#. I have never in my life seen this sort of usage. The second
-#. one is very widely used and makes more sense, and it does
-#. not cause any loss in meaning.
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "كلّما كان ممكناً"
 
-#. I SUGGEST: Losing the "في هذا" in the first line.
-#: 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 ""
-"لقد قرّرتَ إعداد نادل LDAP. الخطوة الأولى في هذا "
-"هي تزويد إسمه\n"
-"ومعلومات دخولك. رجاء اسأل مدير نظامك إن كنت غير متأكد "
-"من هذه المعلومات."
-
-#: addressbook/gui/component/ldap-config.glade.h:85
-msgid "_Display name:"
-msgstr "إسم ال_عرض:"
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "_Add Contacts Group"
+msgstr "إضافة للمراسَلين"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "حدّ الإ_نزال:"
 
-#: 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
-#: ui/evolution-tasks.xml.h:19
-msgid "_Edit"
-msgstr "_تحرير"
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "_Email address:"
+msgstr "عنوان البريد الإلكتروني:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "قواعد البحث المدعومة"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "طريقة التّس_جيل:"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
-msgid "_Port number:"
-msgstr "رقم ال_منفذ:"
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "إسم التسجيل"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "_Search base:"
-msgstr "قاعدة ال_بحث:"
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
+msgstr "الإ_سم:"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
-msgid "_Server name:"
-msgstr "إسم ال_نّادل:"
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
+msgid "_Port:"
+msgstr "الأ_ولويّة:"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
-msgid "_Timeout (minutes):"
-msgstr "ال_مهلة (دقائق):"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "نطاق ال_بحث: "
 
-#: addressbook/gui/component/ldap-config.glade.h:93
-msgid "cards"
-msgstr "بطاقات"
+#: addressbook/gui/component/ldap-config.glade.h:56
+#, fuzzy
+msgid "_Server:"
+msgstr "النّا_دل:"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
-msgid "connecting-tab"
-msgstr "لسان-الإتّصال"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "صيغة الوقت:"
 
-#: addressbook/gui/component/ldap-config.glade.h:95
-msgid "general-tab"
-msgstr "اللّسان-العام"
+#: addressbook/gui/component/ldap-config.glade.h:58
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "إ_ستعمال إتصال آمن (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:96
-msgid "searching-tab"
-msgstr "لسان-البحث"
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid "cards"
+msgstr "بطاقات"
+
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: mail/mail-config.glade.h:183
+msgid "minutes"
+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
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
 msgid "Remove All"
 msgstr "حذف الكل"
 
-#: 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:444
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "حذف"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "عرض قائمة المراسَلين"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:219
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact Info"
 msgstr "عرض معلومات المراسَل"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:226
-#: addressbook/gui/component/select-names/e-select-names-popup.c:336
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:328
-#: addressbook/gui/widgets/eab-popup-control.c:1002
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "إضافة للمراسَلين"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:354
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr "مراسَل غير مسمّى"
 
@@ -809,472 +888,545 @@ 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
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "المصدر"
 
-#: addressbook/gui/component/select-names/e-select-names.c:518
-msgid "Select Contacts from Addressbook"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
 msgstr "إنتقاء مراسَلين من دفتر العناوين"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Find"
-msgstr "بحث"
+#, fuzzy
+msgid "<b>Contacts</b>"
+msgstr "<b>الحالة:</b>"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "إنتقاء الأسماء"
+#, fuzzy
+msgid "<b>Show Contacts</b>"
+msgstr "عرض المراسَلين"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Selected Contacts:"
-msgstr "المراسَلون المنتقون:"
+#, fuzzy
+msgid "Address _Book:"
+msgstr "العنوان ال_ثّاني:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show Contacts"
-msgstr "عرض المراسَلين"
+#, fuzzy
+msgid "C_ategory:"
+msgstr "ال_صّنف:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-"أُكتب اسماً في الخانة، أو\n"
-"إختر واحداً من القائمة أدناه:"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Find"
+msgstr "بحث"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Category:"
-msgstr "ال_صّنف:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "_Folder:"
-msgstr "ال_مجلّد:"
+#, fuzzy
+msgid "_Search:"
+msgstr "_بحث"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid " B_usiness:"
-msgstr " _عمل:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "<b>Email</b>"
+msgstr "<b>جاري إرسال البريد الإلكتروني:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "A_ddress..."
-msgstr "ال_عنوان..."
+#, fuzzy
+msgid "<b>Home</b>"
+msgstr "<b>مستحَق:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "A_ssistant's name:"
-msgstr "إسم ال_مساعد:"
+msgid "<b>Instant Messaging</b>"
+msgstr ""
 
-#. I SUGGEST: replaicng this with "الذكرى السنوية"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Anni_versary:"
-msgstr "الذكرى ال_سنويّة:"
+#, fuzzy
+msgid "<b>Job</b>"
+msgstr "<b>مستحَق:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Birthda_y:"
-msgstr "عيد ال_ميلاد:"
+#, fuzzy
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>قيمة الحقل</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Blog address:"
-msgstr "عنوان البلوغ:"
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>مستحَق:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "Business fa_x:"
-msgstr "فا_كس العمل:"
+#, fuzzy
+msgid "<b>Telephone</b>"
+msgstr "<b>خيارات الرُّزنامة</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "Collaboration"
-msgstr "التّعاون"
+msgid "<b>Web Addresses</b>"
+msgstr ""
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1343
-msgid "Contact Editor"
-msgstr "محرّر المراسَلين"
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "<b>يبدء:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-msgid "D_epartment:"
-msgstr "ال_قِسْم:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "AIM"
+msgstr ""
 
 #: 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 "تفاصيل"
+#, fuzzy
+msgid "Address:"
+msgstr "ال_عنوان:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "F_ree/Busy URL:"
-msgstr "عنوان _حرّ/مشغول:"
+#, fuzzy
+msgid "Anniversary:"
+msgstr "الذكرى ال_سنويّة:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "File a_s:"
-msgstr "الملف _كـ:"
+#, fuzzy
+msgid "Assistant:"
+msgstr "المساعد"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Full _Name..."
-msgstr "الإ_سم الكامل..."
+#, fuzzy
+msgid "Birthday:"
+msgstr "عيد ال_ميلاد:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#, fuzzy
+msgid "Calendar:"
+msgstr "الر_زنامة:"
 
 #: 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"
-"of that information here."
-msgstr ""
-"إذا نشر هذا الشّخص معلومات حرّ/مشغول أو أي معلومات رُزنامة أُخرى على الإنترنت، أدخل عنوان\n"
-"تلك المعلومات هنا."
+#, fuzzy
+msgid "City:"
+msgstr "ال_مدينة:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#, fuzzy
+msgid "Company:"
+msgstr "الأمر:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "New phone type"
-msgstr "نوع هاتف جديد"
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
+msgid "Contact"
+msgstr "المراسَل"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "No_tes:"
-msgstr "م_لاحظات:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
+msgid "Contact Editor"
+msgstr "محرّر المراسَلين"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "Organi_zation:"
-msgstr "الم_ؤسّسة:"
+#, fuzzy
+msgid "Country:"
+msgstr "ال_دّولة:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "P_rofession:"
-msgstr "الم_هنة:"
+#, fuzzy
+msgid "Department:"
+msgstr "ال_قِسْم:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Primary _email:"
-msgstr "عنوان البريد الإل_كتروني الأساسي:"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "عنوان _حرّ/مشغول:"
 
-#. I SUGGEST: "الزوج/الزوجة". I see nothing wrong with this construct.
-#. Its used in English all the time.
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "S_pouse:"
-msgstr "ال_زّوج:"
+msgid "Full _Name..."
+msgstr "الإ_سم الكامل..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Wants to receive _HTML mail"
-msgstr "يريد تلقّي _بريد HTML"
+#, fuzzy
+msgid "Home Page:"
+msgstr "صفحة الإنترنت الشخصية"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Add"
-msgstr "إ_ضافة"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#, fuzzy
+msgid "MSN Messenger"
+msgstr "_رسالة بريديّة"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Business:"
-msgstr "ال_عمل:"
+#, fuzzy
+msgid "Mailing Address"
+msgstr "عنوان البريد الالكتروني"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "أ_صناف..."
+#, fuzzy
+msgid "Manager:"
+msgstr "المدير"
 
 #: 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 "_حذف"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "الإسم ال_مستعار:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Home:"
-msgstr "ال_منزل:"
+#, fuzzy
+msgid "Notes:"
+msgstr "م_لاحظات:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Job title:"
-msgstr "المسمّى ال_وظيفي:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Manager's name:"
-msgstr "إسم ال_مدير:"
+#, fuzzy
+msgid "Office:"
+msgstr "ال_مكتب:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Mobile:"
-msgstr "الهاتف ال_جوّال:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Nickname:"
-msgstr "الإسم ال_مستعار:"
+#, fuzzy
+msgid "PO Box:"
+msgstr "_صندوق البريد:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Office:"
-msgstr "ال_مكتب:"
+#, fuzzy
+msgid "Personal Information"
+msgstr "معلومات خياريّة"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Public Calendar URL:"
-msgstr "عنوان الرُّزنامة ال_عامّة:"
+#, fuzzy
+msgid "Profession:"
+msgstr "الم_هنة:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_This is the mailing address"
-msgstr "_هذا هو عنوان التراسل"
+#, fuzzy
+msgid "Spouse:"
+msgstr "ال_زّوج:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Web page address:"
-msgstr "عنوان صفحة الإ_نترنت:"
+#, fuzzy
+msgid "State/Province:"
+msgstr "ال_ولاية/المحافظة:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "اللّ_قب:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#, fuzzy
+msgid "Wants to receive HTML mail"
+msgstr "يريد تلقّي _بريد HTML"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+#, fuzzy
+msgid "Web Log:"
+msgstr "صفحة الإنترنت:"
+
+#. red
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
+msgid "Work"
+msgstr "عمل"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr "ال_رّمز البريدي:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "الفئات"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "إسم الملف:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#, fuzzy
+msgid "_Where:"
+msgstr "النّا_دل:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "العنوان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
-#: addressbook/gui/widgets/e-addressbook-model.c:312
+#: addressbook/gui/widgets/e-addressbook-model.c:309
 #: 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:119
-#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:182
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "قابل للتّحرير"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "الولايات المتحدة الأمريكية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "أفغانستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "ألبانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "الجزائر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "صامُوَا الأمريكية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "أندورا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "أنغولا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "أنكويّا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "القارة المتجمّدة الجنوبيّة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "أنتيغا و بربودا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "الأرجنتين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "أرمينيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "اروبا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "أستراليا"
 
-#. I SUGGEST: This used to be "المجر".. Changed it.
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "النّمسا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "آذربيجان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "جزر البهاما"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "البحرين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "بنغلادش"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "بربدوس"
 
-#. I SUGGEST: Changing to "روسيا البيضاء". Its pretty common.
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "بلاروسيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "البلجيك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "بيليز"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "البنين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "جزر البرمودا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "بوتان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "بوليفيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "البوسنة و الهرسك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "بتسوانا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "جزيرة بوفي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "البرازيل"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "إقليم المحيط الهندي البريطاني"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "بروناي دار السّلام"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "بلغاريا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "بوركينا فاصو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "بوروندي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "كمبوديا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "الكامرون"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "كندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "كاب فيردا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "جزر الكيمان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "جمهورية إفريقيا الوسطى"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "التّشاد"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "الشيلي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "الصّين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "جزيرة عيد الميلاد"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "جزر الكوكوس (كيلنك)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "كولومبيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "جزر القمر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "الكنغو"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+msgid "Congo, The Democratic Republic Of The"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "جزر كوك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "كوستا ريكا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "ساحل العاج"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "كرواتيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "كوبا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "قبرص"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "الجمهورية التّشيكية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "الدّنمارك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "جيبوتي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "الدّومينيكا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "جمهورية الدّومينيك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "East Timor"
-msgstr "تيمور الشّرقية"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "الإكوادور"
@@ -1384,673 +1536,780 @@ msgid "Guatemala"
 msgstr "غواتيمالا"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#, fuzzy
+msgid "Guernsey"
+msgstr "ألمانيا"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "غينيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "غينيا بيساو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "غوَيانة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "هايتي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "هيرد و جزر ماكدونالد"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "البحر المقدّس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "هندوراس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "هونغ كونغ"
 
-#. I SUGGEST: Changing THIS to "المجر"
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "المجر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "إيسلاندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "الهند"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "إندونيسيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
+msgid "Iran"
+msgstr "إيرلندا"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Iraq"
+msgstr "إسرائيل"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "إيرلندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "إسرائيل"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "إيطاليا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "الجمائيك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "اليابان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Jersey"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "الأردن"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "كزاخستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "كينيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "كيريباتي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Korea, Democratic People's Republic Of"
+msgstr "كوريا، جمهورية"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "كوريا، جمهورية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "الكويت"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "كرغيزستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "لاوص"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "لاتفيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "لبنان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "لزوتو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "ليبيريا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#, fuzzy
+msgid "Libya"
+msgstr "ليبيريا"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "ليشتنشتاين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "لتوانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "لكسمبورغ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Macao"
 msgstr "ماكاو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "مقدونيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "مدغشقر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "ملاوي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "مليزيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "المالديف"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "مالي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "مالطا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "جزر المارشل"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "مارتينيك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "موريطانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "موريشيوس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "مايوتا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "المكسيك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "مكرونيسيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "مولدوفا، جمهورية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "موناكو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "منغوليا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "مونسيرات"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "المغرب"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "الموزمبيق"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "مينمار"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "ناميبيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "ناورو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "نيبال"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "هولندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "أنتيل هولندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "نيو قلدونيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "نيو زيلندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "نيكاراغوا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "النّيجر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "نيجيريا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "نيوي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "جزيرة نورفولك"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "جزر ماريانا الشّمالية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "النّرويج"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "عمان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "باكستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "بالاو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "فلسطين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "باناما"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "غينيا الجديدة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "البراغواي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "بيرو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "الفلبّين"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "بتكيرن"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "بولندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "البرتغال"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "بوارتو ريكو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "قطر"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "ريونيون"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "رومانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "الإتّحاد الروسي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "روَندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "سان كتس و نيفس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "سينت لوسيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
 msgstr "سينت فنسنت و الغرنادينز"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "صاموا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "سان مارينو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "صاو تومي و برنسيب"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "العربيّة السّعودية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "السّينغال"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "السّيشال"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "سييرا ليون"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "سنغفورة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "سلوفاكيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "سلوفينيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "جزر سليمان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "الصّومال"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "جنوب إفريقيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "جنوب جورجيا و جزر ساندويتش الجنوبيّة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "إسبانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "سري لانكا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "سان هيلانة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "سان بيير و مِكويلون"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "السّودان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "سورينام"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "سفالبارد و جزر جان مايِن"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "السّوازيلاند"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "السّويد"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "سويسرا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "Syria"
+msgstr "سورينام"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "تايوان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "طاجيكستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "جمهورية تنزانيا المتّحدة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "تايلندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Timor-Leste"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "طوغو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "توكيلاو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "تونغا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "ترنداد و طوباغو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "تونس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "تركيّا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "تركمانستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "جزر تُركس و كيْكوس"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "توفالو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "أوغندا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "أُكرانيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "الإمارات العربيّة المتّحدة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "المملكة المتّحدة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "جزر الولايات المتّحدة الصّغرى النّائية"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "الأوروغواي"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "أوزباكستان"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "فانواتو"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "فينزويلّا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "الفيتنام"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "جزر فيرجن البريطانيّة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "جزر فيرجن الأمريكيّة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "جزر والس و فوتونا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "الصّحراء الغربيّة"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "اليمن"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Yugoslavia"
-msgstr "يوغوسلافيا"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "زمبيا"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "زمبابوي"
 
-#: 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 "كتاب"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
 
-#: 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 "المراسَل"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "الخدمة جاهزة"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "الموقع:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "إ_سم المستخدم:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
+msgid "Home"
+msgstr "المنزل"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
+msgid "Other"
+msgstr "أُخرى"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "مجموعة"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:198
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#, fuzzy
+msgid "Source Book"
+msgstr "المصدر"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
+msgid "Target Book"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "مراسَل جديد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:205
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "حقول قابلة للكتابة"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:219
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "غُيِّر"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:855
-msgid "Category editor not available."
-msgstr "محرّر الفئات غير متوفّر."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:863
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "ينتمي هذا المراسَل إلى هذه الفئات:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1034
-msgid "Save Contact as VCard"
-msgstr "حفظ المراسَل كـVCard"
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "الرجاء الانتقاء من الخيارات التالية"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1074
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"هل أنت متأكّد أنّك تريد\n"
-"حذف هؤلاء المراسَلين؟"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#, fuzzy
+msgid "No image"
+msgstr "النّيجر"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1077
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#, fuzzy
 msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"هل أنت متأكّد أنّك تريد\n"
-"حذف هذا المراسَل؟"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1780
-msgid "Business"
-msgstr "العمل"
+"The contact data is invalid:\n"
+"\n"
+msgstr "تاريخ التّكرار غير صحيح"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
-msgid "Home"
-msgstr "المنزل"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#, fuzzy
+msgid "Invalid contact."
+msgstr "توقيع غير سليم"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
-msgid "Other"
-msgstr "أُخرى"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2284
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "لم يمكن إيجاد قطعة لحقل: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "إضافة سريعة لمراسَل"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "ت_حرير كامل"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "الإسم ال_كامل:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "البريد الإل_كتروني:"
 
-#. I SUGGEST: losing the "thani" and just typing "2"
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"هل أنت متأكّد أنّك تريد\n"
+"حذف هؤلاء المراسَلين؟"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"هل أنت متأكّد أنّك تريد\n"
+"حذف هذا المراسَل؟"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "العنوان ال_ثّاني:"
@@ -2152,39 +2411,93 @@ msgstr "ال_لّاحقة:"
 msgid "_Title:"
 msgstr "اللّ_قب:"
 
+#: addressbook/gui/contact-editor/im.glade.h:2
+#, fuzzy
+msgid "Add IM Account"
+msgstr "حسابات البريد"
+
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "إسم الحساب"
+
+#: addressbook/gui/contact-editor/im.glade.h:4
+#, fuzzy
+msgid "_IM Service:"
+msgstr "ال_ولاية/المحافظة:"
+
+#: addressbook/gui/contact-editor/im.glade.h:5
+#, fuzzy
+msgid "_Location:"
+msgstr "الموقع:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "الأعضاء"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "حذف العناصر المنتقاة من قائمة المُرفقات"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "مُنتقى"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "إ_خفاء العناوين عند إرسال رسالة لهذه القائمة"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "إسم ال_قائمة:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "أدخِل  عنواناً بريدياً أو إسحب مراسَلاً إلى اللّائحة أدناه:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "contact-list-editor"
-msgstr "محرّر قائمة المراسَلين"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "حوار1"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:295
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
+msgid "Book"
+msgstr "كتاب"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "هي قائمة جديدة"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "المشاركون الإلزاميّون"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "محرّر قائمة المراسَلين"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:502
-msgid "Save List as VCard"
-msgstr "حفظ القائمة كـ VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "المراسَل المغيَّر:"
@@ -2223,8 +2536,8 @@ msgstr ""
 "في هذا الدّليل.  هل تودّ إضافته على كل حال؟"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:148
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "بحث متقدّم"
 
@@ -2233,23 +2546,21 @@ msgid "No contacts"
 msgstr "لا مراسَلين"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
-msgid "1 contact"
-msgstr "مراسَل واحد"
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d مراسَلين"
+msgstr[1] "%d مراسَلين"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:154
-#, c-format
-msgid "%d contacts"
-msgstr "%d مراسَلين"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:305
+#: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:184
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "بحث"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:448
+#: addressbook/gui/widgets/e-addressbook-model.c:445
 msgid "Error getting book view"
 msgstr "خطأ عند تلقّي المشهد الكتابي"
 
@@ -2257,120 +2568,141 @@ msgstr "خطأ عند تلقّي المشهد الكتابي"
 msgid "Model"
 msgstr "النّموذج"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "خطأ عند تعديل البطاقة"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:191
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "يبدأ الإسم بـ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "يبدأ البريد الإلكتروني بـ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "الصّنف هو"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "أي حقل يحوي"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "متقدّم..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "النّوع"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:399
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
 msgstr "دفتر العناوين"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
-#: addressbook/gui/widgets/e-addressbook-view.c:894
-#: addressbook/gui/widgets/e-addressbook-view.c:1653
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "حفظ كـ VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "مراسَل جديد..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "قائمة مراسَلين جديدة..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "إذهب إلى المجلّد..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "إستيراد..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "بحث عن المراسَلين..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:889
-msgid "Addressbook Sources..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
 msgstr "مصادر دفتر العناوين..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "إعدادات الحاسوب اليدوي..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "تمرير المراسَل"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "إرسال رسالة للمراسَل"
 
-#: 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:78
-#: ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "طبع"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "طبع الغلاف"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
-msgid "Copy to folder..."
-msgstr "نسخ إلى مجلّد..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "دفتر العناوين..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
-msgid "Move to folder..."
-msgstr "نقل إلى مجلّد..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "دفتر العناوين..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:907
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "قص"
 
-#. 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
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "نسخ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "لصق"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: calendar/gui/e-cal-view.c:1192
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "المشهد الحالي"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"خلفيّة دفتر العناوين ل\n"
-"%s\n"
-"قد إنهارت. ستضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "أيّ صنف"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 msgid "Assistant"
@@ -2402,7 +2734,7 @@ msgstr "هاتف السّيارة"
 
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "الفئات"
 
@@ -2411,22 +2743,17 @@ msgid "Company Phone"
 msgstr "هاتف الشّركة"
 
 #: 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
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#. I SUGGEST: replacing "thani" with just a "2"
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:460
+#: addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "البريد الإلكتروني الثّاني"
 
-#. I SUGGEST: replacing "thalith" with just a "3"
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:470
+#: addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "البريد الإلكتروني الثّالث"
 
@@ -2467,6 +2794,7 @@ msgid "Manager"
 msgstr "المدير"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Mobile Phone"
 msgstr "الهاتف الجوال"
 
@@ -2475,6 +2803,7 @@ msgid "Nickname"
 msgstr "الإسم المستعار"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -2483,6 +2812,7 @@ msgid "Office"
 msgstr "مكتب"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
 msgid "Organization"
 msgstr "المنظّمة"
 
@@ -2508,12 +2838,11 @@ 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-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "الدّور"
 
-#. I SUGGEST: "الزوج/الزوجة"
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Spouse"
 msgstr "الزّوج"
@@ -2539,17 +2868,17 @@ msgid "Web Site"
 msgstr "موقع الإنترنت"
 
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:145
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "العرض"
 
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "الإرتفاع"
 
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:160
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "له تركيز"
 
@@ -2573,7 +2902,7 @@ msgstr "الطّول الأقصى لإسم الحقل"
 msgid "Column Width"
 msgstr "عرض العمود"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -2587,7 +2916,7 @@ msgstr ""
 "\n"
 "إنقر نقرا مزدوجاً لإنشاء مراسَل جديد."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -2597,163 +2926,285 @@ msgstr ""
 "\n"
 "لا توجد أيّة عناصر لعرضها في هذا المشهد."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "محوّل"
 
-#: addressbook/gui/widgets/e-minicard.c:168
+#: addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "مُنتقى"
 
-#: addressbook/gui/widgets/e-minicard.c:175
+#: addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "له مؤشّر"
 
-#: addressbook/gui/widgets/eab-contact-display.c:93
-#: addressbook/gui/widgets/eab-contact-display.c:114
-msgid "Map It"
-msgstr "خطِّطه"
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:198
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
 msgid "List Members"
 msgstr "أعضاء القائمة"
 
-#: addressbook/gui/widgets/eab-contact-display.c:214
-#: addressbook/gui/widgets/eab-contact-display.c:344
-msgid "Job Title"
-msgstr "المسمّى الوظيفي"
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "البريد الإلكتروني"
 
-#: addressbook/gui/widgets/eab-contact-display.c:221
-msgid "Home Address"
-msgstr "عنوان المنزل"
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "الوصف"
 
-#: addressbook/gui/widgets/eab-contact-display.c:222
-msgid "Work Address"
-msgstr "عنوان العمل"
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:223
-msgid "Other Address"
-msgstr "عنوان آخر"
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "هاتف السّيارة"
 
-#: addressbook/gui/widgets/eab-contact-display.c:227
-#: addressbook/gui/widgets/eab-contact-display.c:375
-msgid "Home page"
-msgstr "صفحة الإنترنت الشخصية"
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "عمل"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:228
-#: addressbook/gui/widgets/eab-contact-display.c:383
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Blog"
 msgstr "البلوغ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:43
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "شخصي"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "المسمّى الوظيفي"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "صفحة الإنترنت الشخصية"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "نجاح"
 
-#: 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 "خطأ مجهول"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:45
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "المستودع غير متّصل"
 
-#: addressbook/gui/widgets/eab-gui-util.c:46
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "دفتر العناوين غير موجود"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "قائمة مراسَلين جديدة"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "رُفض التّصريح"
 
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "لم يوجد المراسَل"
 
-#. I SUGGEST: replacing "موجودة" with "معرّفة". Even though
-#. It doesn't mean EXACTLY the same thing, it's more natural
-#. and makes more sense.
-#checked, typed but the nchanged: you add a new ID and the other exists
-#the meaning of this dialog is more" you can't add a newone cz another one exists"
-#: addressbook/gui/widgets/eab-gui-util.c:48
+# checked, typed but the nchanged: you add a new ID and the other exists
+# the meaning of this dialog is more" you can't add a newone cz another one exists"
 # 
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "هويّة المراسَل موجودة مسبقاً"
 
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "البروتوكول غير مدعوم"
 
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: 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
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "ألغي"
 
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "لم يمكن إنشاء الأنبوب: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "فشل التّوثيق"
 
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "التّوثيق مطلوب"
 
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS غير متوفر"
 
-#: addressbook/gui/widgets/eab-gui-util.c:54
-msgid "Addressbook does not exist"
-msgstr "دفتر العناوين غير موجود"
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "لا رسالة بهذا الإسم"
 
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "خطأ آخر"
 
-#: addressbook/gui/widgets/eab-gui-util.c:82
-msgid "Do you want to save changes?"
-msgstr "هل تريد حفظ التّغييرات؟"
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"لم نتمكّن من فتح دفتر العناوين هذا. الرجاءً التأكّد من وجود\n"
+"المسار و التراخيص الكافية للنفاذ إليه."
 
-#: addressbook/gui/widgets/eab-gui-util.c:84
-msgid "_Discard"
-msgstr "_نبذ"
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"لم نتمكّن من فتح دفتر العناوين هذا. يعني ذلك\n"
+"أنّك أدخلت عنواناً خاطأ، أو أنّه لا يمكن الوصول إلى نادل LDAP."
 
 #: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"لم يُجمع دعم LDAP في الإصدارة الحاليّة لإيفُليوشِن\n"
+"إذا كنت تريد استخدام LDAP في إيفُليوشِن قم بتجميع البرنامج\n"
+"من مصادر الـ CVS بعد جلب OpenLDAP من الوصلة أدناه.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"لم نتمكّن من فتح دفتر العناوين هذا. قد يعني ذلك\n"
+"أنّك أدخلت عنواناً غير سليم، أو أنّه لم يمكن الوصول للنّادل."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"طابَق هذا الاستعلام بطاقات أكثر ممّا هو معدّ للنّادل إرجاعه\n"
+"أو لإيفُليوشِن إظهاره. الرجاءً جعل بحثك أكثر دقّة\n"
+"أو رفع قيمة الحدّ الأقصى للنتائج في تفضيلات نادل الدّليل\n"
+"لدفتر العناوين هذا."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"لقد تخطّى وقت تنفيذ هذا الإستعلام حدّ النّادل أو الحدّ المعدّ لدفتر\n"
+"العناوين هذا. الرجاءً جعل بحثك أكثر دقّة أو رفع قيمة الحدّ الأقصى لزمن "
+"الإستعلام\n"
+"في تفضيلات نادل الدّليل لدفتر العناوين هذا."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "لم تتمكن خلفيّة دفتر العناوين هذا من ترجمة هذا البحث."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "رفضت خلفيّة دفتر العناوين القيام بهذا البحث."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "لم يتمّ البحث بنجاح."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "خطأ أثناء إضافة القائمة"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
-#: addressbook/gui/widgets/eab-gui-util.c:457
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Error adding contact"
 msgstr "خطأ أثناء إضافة المراسَل"
 
-#: addressbook/gui/widgets/eab-gui-util.c:112
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "خطأ أثناء تغيير اللّائحة"
 
-#: addressbook/gui/widgets/eab-gui-util.c:112
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying contact"
 msgstr "خطأ أثناء تغيير المراسَل"
 
-#: addressbook/gui/widgets/eab-gui-util.c:122
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "خطأ أثناء إزالة القائمة"
 
-#: addressbook/gui/widgets/eab-gui-util.c:122
-#: addressbook/gui/widgets/eab-gui-util.c:415
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 msgid "Error removing contact"
 msgstr "خطأ أثناء إزالة المراسَل"
 
-#. I SUGGEST: adding 'من' after all the c-format numbers. Its more
-#. generic that way. Here's what I mean:
-#. "فتح %d من المراسلين..."
-#. It works whether %d is 1, 2, 3, 10, 100, 101 etc...
-#: addressbook/gui/widgets/eab-gui-util.c:204
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2762,7 +3213,7 @@ msgstr ""
 "فتح %d مراسَلين سيفتح أيضاً %d نوافذ جديدة.\n"
 "هل تريد فعلاً إظهار كل هؤلاء المراسَلين؟"
 
-#: addressbook/gui/widgets/eab-gui-util.c:230
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2771,45 +3222,45 @@ msgstr ""
 "%s موجود\n"
 "هل تريد تنميقه؟"
 
-#: addressbook/gui/widgets/eab-gui-util.c:234
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "تنميق"
 
-#: 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:307
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:376
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "سرد"
 
-#: addressbook/gui/widgets/eab-gui-util.c:513
+#: addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Move contact to"
 msgstr "نقل المراسَل إلى"
 
-#: addressbook/gui/widgets/eab-gui-util.c:515
+#: addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Copy contact to"
 msgstr "نسخ المراسَل إلى"
 
-#: addressbook/gui/widgets/eab-gui-util.c:518
+#: addressbook/gui/widgets/eab-gui-util.c:640
 msgid "Move contacts to"
 msgstr "نقل المراسَلين إلى"
 
-#: addressbook/gui/widgets/eab-gui-util.c:520
+#: addressbook/gui/widgets/eab-gui-util.c:642
 msgid "Copy contacts to"
 msgstr "نسخ المراسَلين إلى"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "إنتقاء مراسَلين من دفتر العناوين"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "VCards عديدة"
 
-#: addressbook/gui/widgets/eab-gui-util.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "بطاقة VCard لـ%s"
@@ -2819,59 +3270,58 @@ msgstr "بطاقة VCard لـ%s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:188
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(لاشيء)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:450
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "البريد الإلكتروني الأساسي"
 
-#: addressbook/gui/widgets/eab-popup-control.c:586
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "إختيار عمل"
 
-#: addressbook/gui/widgets/eab-popup-control.c:594
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "إنشاء مراسَل جديد \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:610
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "إضافة عنوان إلى المراسَل \"%s\" الموجود مسبقاً"
 
-#: addressbook/gui/widgets/eab-popup-control.c:888
-msgid "Querying Addressbook..."
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
 msgstr "جاري البحث في دفتر العناوين..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:972
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "تحرير معلومات المراسَل"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1027
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "دمج عنوان البريد الإلكتروني"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:140
-#, c-format
-msgid "and %d other contacts."
-msgstr "و %d مراسَلين آخرين."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:142
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
 msgid "and one other contact."
-msgstr "و مراسَل آخر."
+msgid_plural "and %d other contacts."
+msgstr[0] "و مراسَل آخر."
+msgstr[1] "و مراسَل آخر."
 
-#: addressbook/gui/widgets/eab-vcard-control.c:225
-#: addressbook/gui/widgets/eab-vcard-control.c:275
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
 msgid "Show Full VCard"
 msgstr "إظهار الـ VCard بالكامل"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:229
+#: addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "إظهار VCard مختصرة"
 
-#: addressbook/gui/widgets/eab-vcard-control.c:280
+#: addressbook/gui/widgets/eab-vcard-control.c:278
 msgid "Save in addressbook"
 msgstr "حفظ في دفتر العناوين"
 
@@ -2897,17 +3347,40 @@ msgstr "جمسع الحقوق محفوظة (C) 2000، شركة زيميان."
 msgid "This should test the reflow canvas item"
 msgstr ""
 
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "مستورد elm لإيفُليوشِن"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "مستورد آي-كلندر لإيفُليوشِن"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "مستورد في-كلندر لإيفُليوشِن"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/printing/e-contact-print-envelope.c:212
 #: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr "طبع الغلاف"
 
-#: addressbook/printing/e-contact-print.c:1003
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "طبع المراسَلين"
 
-#: addressbook/printing/e-contact-print.c:1069
-#: addressbook/printing/e-contact-print.c:1096
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "طبع المراسَل"
 
@@ -2999,7 +3472,7 @@ msgstr "الحواشي"
 msgid "Number of columns:"
 msgstr "عدد الأعمدة:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "خيارات"
 
@@ -3095,15 +3568,21 @@ msgstr "إختبار طباعة المراسَل"
 msgid "This should test the contact print code"
 msgstr "سيختبر هذا رمز طباعة المراسَل"
 
-#: 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
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "لا يمكن فتح الملف"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "لا يمكن تحميل العنوان URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "لم يمكن تحميل دفتر العناوين"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "لم يمكن فتح دفتر العناوين"
 
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
@@ -3130,7 +3609,8 @@ msgid "Export in asynchronous mode "
 msgstr "تصدير بنسق غير متزامن"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr "عدد البطاقات كل ملف إخراج واحد بنسق لاتزامني، الحجم الإفتراضي 100."
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3138,8 +3618,11 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "خطأ في متغيّرات سطر الأوامر، الرجاء إستخدام الخيار --help لمراجعة كيفيّة الإستعمال."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"خطأ في متغيّرات سطر الأوامر، الرجاء إستخدام الخيار --help لمراجعة كيفيّة "
+"الإستعمال."
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
@@ -3169,74 +3652,337 @@ msgstr "ملف الإدخال"
 msgid "No filename provided."
 msgstr "لم يحدّد إسم ملف."
 
-#: addressbook/util/eab-destination.c:675
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "قائمة غير مسمّاة"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "عدم الحذف"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "إرسال إلى:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "هل تريد فعلاً إلغاء و حذف هذا الإجتماع؟"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "هل تريد فعلاً حذف %d من المهام؟"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "هل تريد فعلاً حذف الموعد `%s'؟"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "هل تريد فعلاً حذف المهمّة `%s'؟"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "هل تريد فعلاً حذف الموعد `%s'؟"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "هل تريد فعلاً حذف المهمّة `%s'؟"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "هل تريد فعلاً حذف `%d' من خانات السّجل؟"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "موعد"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "تجا_هل التّغييرات"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "تجا_هل التّغييرات"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "إرسال"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "مستورد في-كلندر لإيفُليوشِن"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
+#, fuzzy
+msgid "Enter password"
+msgstr "أدخل كلمة السّر"
+
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "تجزأة أحداث متعدّدة في اليوم الواحد:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1320
-#: calendar/conduits/todo/todo-conduit.c:857
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "لم يمكن تشغيل نادل وُمْبَت"
 
-#: 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:1436
 #: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "لم يمكن قراءة قالب تطبيقات الرُّزنامة للحاسوب اليدوي"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "الأولويّة الإفتراضيّة:"
 
-#: calendar/conduits/todo/todo-conduit.c:945
-#: calendar/conduits/todo/todo-conduit.c:948
+#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "لم يمكن قراءة قالب تطبيقات المهام للحاسوب اليدوي"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "الرُّزنامة و المهام"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
 msgid "Calendars"
 msgstr "الرزنامات"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "أعدّ منطقتك الزمنيّة و الرُّزنامة و لائحة المهام هنا "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "رُزنامة و مهامّ إيفُليوشِن"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "قطعة إعداد رُزنامة إيفُليوشِن"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 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
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 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 "مكوّن رُزنامة إيفُليوشِن"
@@ -3246,58 +3992,76 @@ 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
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "المهام"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "الرزنامات"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "بدءا من:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "انتهاءا عند:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "تنبيه إيفُليوشِن"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "ت_نبيه عند %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_غلق"
+#, fuzzy
+msgid "Snooze _time (minutes):"
+msgstr "مدّة الغفوة (دقائق)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "غ_فوة"
+msgid "_Edit appointment"
+msgstr "_تحرير الموعد"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "مدّة الغفوة (دقائق)"
+#, fuzzy
+msgid "_Snooze"
+msgstr "غ_فوة"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr "_تحرير الموعد"
+#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "فتح"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
+msgid "Dismiss"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+msgid "Dismiss All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "لا وجود لوصف."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:893
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3310,12 +4074,12 @@ msgstr ""
 "بدءا من %s\n"
 "انتهاءا عند %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:980
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "تحذير"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:984
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3327,7 +4091,7 @@ msgstr ""
 "عُدّة لإرسال بريد إلكتروني. سيعرض\n"
 "إيفُليوشِن صندوق حوار مذكّرة عادي عوضا عن ذلك."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1010
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3337,29 +4101,26 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"هناك علامة تذكير لرُزنامة ايفُليوشِن على وشك أن تحفَّز. علامة التّذكير هذه معدّة لتشغيل البرنامج التّالي:\n"
+"هناك علامة تذكير لرُزنامة ايفُليوشِن على وشك أن تحفَّز. علامة التّذكير هذه معدّة "
+"لتشغيل البرنامج التّالي:\n"
 "\n"
 "        %s\n"
 "\n"
 "هل تريد فعلاً تشغيل هذا البرنامج؟"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1024
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "لا تسألني عن هذا البرنامج ثانيةً."
 
-#: calendar/gui/alarm-notify/notify-main.c:157
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "لم يمكن تشغيل بونوبو"
 
-#: calendar/gui/alarm-notify/notify-main.c:160
-msgid "Could not initialize gnome-vfs"
-msgstr "لم يمكن تشغيل gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:169
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "لم يمكن إنشاء مصنع خدمة تبليغ التنبيهات"
 
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37
 msgid "invalid time"
 msgstr "وقت غير سليم"
 
@@ -3400,53 +4161,53 @@ msgid "Intervals shown in Day and Work Week views"
 msgstr "الفواصل الزمنيّة معروضة كمشاهد يوم و أسبوع عمل"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "List of urls for free/busy publishing"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Minute the workday ends on"
 msgstr "دقيقة إنتهاء يوم العمل"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Minute the workday starts on"
 msgstr "دقيقة بدء يوم العمل"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
 msgid "Number of units for default reminder"
 msgstr "عدد وحدات علامة التّذكير الإفتراضيّة"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Number of units for determining when to hide tasks"
 msgstr "عدد الوحدات التي تحدّد متى تُخفى المهام"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Position of the horizontal pane"
 msgstr "موقع اللّوح الأفقي"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
 msgstr "موقع اللّوح الأفقي في مشهد الشّهر"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
 msgstr "موقع اللّوح العمودي"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
 msgstr "موقع اللّوح العمودي في مشهد الشّهر"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Position of the vertical pane in the task view"
 msgstr "موقع اللّوح العمودي في مشهد المهام"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
 msgstr "البرامج التي يمكنها العمل كجزء من المنبّهات"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 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 "وقت إطلاق آخر منبّه"
@@ -3464,162 +4225,193 @@ msgid "Weekday the week starts on"
 msgstr "اليوم الذي يبدء منه الأسبوع"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "ما إذا كان سيُسْأل عن تّأكيد لحذف موعد ما"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "ما إذا كان سيُسْأل عن تأكيد عند مَحْوِ مجلّد"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "ما إذا ستخفى المهام المنجزة"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "ما إذا كان سيُحدّد مُذكّر افتراضي للأحداث"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "ما إذا سيعرض الوقت بتهيئة  24ساعة بدلاً من استخدام صباحاً/مساءً (ص/م)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "ما إذا كانت ستعرض أرقام الأسابيع في متصفّح التّاريخ"
 
-#: calendar/gui/cal-search-bar.c:49
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "الملخّص يحتوي على"
 
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "الوصف يحتوي على"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "التّعليق يحتوي على"
 
-#: calendar/gui/cal-search-bar.c:357 mail/mail-ops.c:1134
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "الوصف يحتوي على"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "دون مطابق"
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
+msgid "Calendar"
+msgstr "الرُّزنامة"
+
+#: calendar/gui/calendar-commands.c:352
 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:376
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "تنطيف الأحداث الأقدم من"
 
-#: calendar/gui/calendar-commands.c:381
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "الأيّام"
 
-#: calendar/gui/calendar-commands.c:450
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 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: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
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:460
-#: calendar/gui/calendar-commands.c:462
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:479 calendar/gui/calendar-commands.c:485
-#: calendar/gui/calendar-commands.c:491 calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 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:483
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1517
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-component.c:368
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "ستحذف الرُّزنامة '%s'. هل تريد الإستمرار؟"
 
-#. I SUGGEST: that we don't need an equivalent of "to" in Arabic.
-#: calendar/gui/calendar-component.c:408
-msgid "Rename this calendar to"
-msgstr "إعادة تسمية هذه الرُّزنامة لـ"
-
-#: calendar/gui/calendar-component.c:428
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "رُزنامة جديدة"
 
-#: calendar/gui/calendar-component.c:632
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "جاري تحميل الرُّزنامة..."
+
+#: calendar/gui/calendar-component.c:917
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: calendar/gui/calendar-component.c:929
+msgid "There is no calendar available for creating events and meetings"
+msgstr "لا توجد رُزنامة متوفّرة لإنشاء الأحداث و الإجتماعات"
+
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "موعد جديد"
 
-#: calendar/gui/calendar-component.c:633
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_موعد"
 
-#: calendar/gui/calendar-component.c:634
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "إنشاء موعد جديد"
 
-#: calendar/gui/calendar-component.c:639
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "إجتماع جديد"
 
-#: calendar/gui/calendar-component.c:640
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "إ_جتماع"
 
-#: calendar/gui/calendar-component.c:641
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "إنشاء طلب إجتماع جديد"
 
-#: calendar/gui/calendar-component.c:646
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "موعد جديد يستغرق يوماً بكامله"
 
-#: calendar/gui/calendar-component.c:647
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "موعد _يستغرق يوماً بكامله"
 
-#: calendar/gui/calendar-component.c:648
+#: calendar/gui/calendar-component.c:1242
 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 "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+#: calendar/gui/calendar-component.c:1248
+#, fuzzy
+msgid "New calendar"
+msgstr "رُزنامة جديدة"
 
-#: calendar/gui/calendar-component.c:727
-msgid "There is no calendar available for creating events and meetings"
-msgstr "لا توجد رُزنامة متوفّرة لإنشاء الأحداث و الإجتماعات"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "الرُّزنامة"
 
-#. create the remote source group
-#: calendar/gui/calendar-component.c:858
-msgid "On The Web"
-msgstr "على الإنترنت"
+#: calendar/gui/calendar-component.c:1250
+msgid "Create a new calendar"
+msgstr "إنشاء رزنامة جديدة"
 
-#: calendar/gui/calendar-offline-handler.c:190
+#: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
 msgstr "backend_go_offline(): %s"
 
-#: calendar/gui/calendar-offline-handler.c:212
+#: calendar/gui/calendar-offline-handler.c:215
 #, c-format
 msgid "backend_go_online(): %s"
 msgstr "backend_go_online(): %s"
@@ -3640,182 +4432,185 @@ msgstr "مشهد الأسبوع"
 msgid "Month View"
 msgstr "مشهد الشّهر"
 
-#: calendar/gui/calendar-view-factory.c:130
-msgid "List View"
-msgstr "مشهد اللائحة"
-
-#: calendar/gui/comp-editor-factory.c:451
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "خطأ أثناء فتح الرُّزنامة"
 
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "الطريقة غير مدعومة عند فتح الرزنامة"
 
-#: calendar/gui/comp-editor-factory.c:468
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "رُفض التّصريح بفتح الرُّزنامة"
 
-#: calendar/gui/comp-editor-factory.c:516
+#: calendar/gui/comp-editor-factory.c:474
 #, c-format
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:133
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "لم يمكن فتح المجلّد في '%s'"
-
-#: calendar/gui/control-factory.c:179
-msgid "The URI that the calendar will display"
-msgstr "العنوان الذي ستعرضه الرُّزنامة"
-
-#: calendar/gui/control-factory.c:186
-msgid "The type of view to show"
-msgstr "نوع المشهد الذي سيُعرض"
-
-#: calendar/gui/dialogs/alarm-options.c:466
-msgid "Audio Alarm Options"
-msgstr "خيارات المنبّه الصّوتي"
-
-#: calendar/gui/dialogs/alarm-options.c:475
-msgid "Message Alarm Options"
-msgstr "خيارات منبّه الرّسائل"
-
-#: calendar/gui/dialogs/alarm-options.c:484
-msgid "Email Alarm Options"
-msgstr "خيارات منبّه البريد الإلكتروني"
-
-#: calendar/gui/dialogs/alarm-options.c:493
-msgid "Program Alarm Options"
-msgstr "خيارات منبّه البرامج"
-
-#: calendar/gui/dialogs/alarm-options.c:509
-msgid "Unknown Alarm Options"
-msgstr "خيارات مُنبّه مجهول"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "تكرار التّنبيه"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "الرّسالة التي ستُعرض:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "الرّسالة التي ستُرسل"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "عزف صّوت:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "تكرار التّنبيه"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "تشغيل البرنامج:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "إرسال إلى:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "مع هذه المتغيّارات:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
-msgid "dialog1"
-msgstr "حوار1"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "مرّات إضافيّة كل"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>يبدء:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
-msgid "hours"
-msgstr "ساعات"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>خيارات قائمة المهام</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
-msgid "minutes"
-msgstr "دقائق"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>الحالة:</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:798
-msgid "Action/Trigger"
-msgstr "الإجراء/المحفّز"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "المنبّهات"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "الأساسيّات"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "تأليف رسالة"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "التّاريخ/الوقت:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
-msgid "Display a message"
-msgstr "عرض رسالةً"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "ال_رسائل"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "عزف صوت"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Reminders"
-msgstr "علامات التّذكير"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "تشغيل برنامج"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
-msgid "Send an Email"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "إرسال إلى:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr "إرسال بريد إلكتروني"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:983 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:168
-msgid "Summary:"
-msgstr "الملخّص:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "ال_قِسْم:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "تشغيل البرنامج:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-msgid "_Options..."
-msgstr "ال_خيارات..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "تكرار التّنبيه"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "ال_حساب:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "بعد"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "قبل"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "أيّام"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "نهاية الموعد"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "مرّات إضافيّة كل"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ساعات"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ساعات"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "دقائق"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "بداية الموعد"
 
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "الإجراء/المحفّز"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "إ_ضافة"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "المنبّهات"
+
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+msgid "Enabled"
+msgstr "مفعّل"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#, fuzzy
+msgid "Are you sure you want to remove this URL?"
+msgstr "هل تريد فعلاً حذف هذا الحساب؟"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#, fuzzy
+msgid "Don't Remove"
+msgstr "لا تستورد"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Disable"
+msgstr "تعطيل"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Enable"
+msgstr "تفعيل"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 دقائق"
@@ -3836,445 +4631,481 @@ msgstr "30 دقيقة"
 msgid "60 minutes"
 msgstr "60 دقيقة"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr "التّنبيهات"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>يبدء:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "عام"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>خيارات قائمة المهام</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>مستحَق:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "أسبوع عمل"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "تعيينات الرُّزنامة و المهام"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "لون المهام التي فات موعدها"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "لون المهام المستحقّة اليوم"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "اليوم _ينتهي:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "أيّام"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "ال_معرض"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:76
+msgid "E_nable"
+msgstr "_تفعيل"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "طلب متوفّر/مشغول"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "الجمعة"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "ساعات"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "دقائق"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "الإثنين"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "الأ_حد"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "السّبت"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "إ_ظهار علامة تذكير"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "إظهار أر_قام الأسابيع في متصفّح التّواريخ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "الأحد"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "ال_مهام المستحقّة اليوم:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "ال_خميس"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Task List"
-msgstr "قائمة المهام"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:606
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "الخميس"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Time"
-msgstr "الوقت"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "المنطقة ال_زّمنيّة:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "صيغة الوقت:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "الثّلاثاء"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "يبدأ الأ_سبوع:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:605
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "الأربعاء"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:33
-msgid "Work Week"
-msgstr "أسبوع عمل"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "أيّام العمل:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ساعة (صباحاً/مساءً)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 ساعة"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "_Add URL"
+msgstr "إ_ضافة"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_طلب التّأكيد عند حذف العناصر"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_ضغط نهايات الأسابيع في مشهد الشّهر"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "ال_يوم يبدء:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "_Display"
-msgstr "ال_معرض"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 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:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_تحرير"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "ال_جمعة"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:151
-msgid "_General"
-msgstr "_عام"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "إ_خفاء المهام المُنجزة بعد"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "الإ_ثنين"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "المهام ال_فائت موعدها:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "ال_سّبت"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_عرض أوقات نهاية المواعيد في مشاهد الأسبوع و الشّهر"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_أجزاء الوقت:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "الثُّ_لاثاء"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "الأ_ربعاء"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "قبل كل موعد"
 
-#: 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/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "المجموعة '%s' موجودة عن بعد. يجب أن تحدّد موقعاً لجلب الرُّزنامة منه"
 
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "هل تريد فعلاً إلغاء و حذف هذا الإجتماع؟"
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "موقع المصدر '%s' ليس مشكلا بشكل سليم."
 
-#: 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/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "موقع المصدر '%s' ليس مصدر وبكال."
 
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "هل تريد فعلاً إلغاء و حذف هذه المهمّة؟"
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "مصدر بإسم '%s' موجود مسبقاً في المجموعة المنتقاة"
 
-#: calendar/gui/dialogs/cancel-comp.c:75
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
 msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"خانة السجل الجاري حذفها منشورة، هل تود إرسال تبليغ بالإلغاء؟"
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "المجموعة '%s' موجودة عن بعد. يجب أن تحدّد موقعاً لجلب الرُّزنامة منه"
 
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "هل تريد فعلاً إلغاء و حذف خانة السّجل هذه؟"
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "إضافة رزنامةً جديدة"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "مجموعة قائمة المهام"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "الأ_لوان"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "إنتقي لوناً"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "إضافة رزنامةً جديدة"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "إ_ضافة مجموعة..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "إعادة التّحميل"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "النّوع:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "العنوان"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "أسابيع"
+
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "تم حذف هذا الحدث."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "تم حذف هذه المهمّة."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "تم حذف خانة السّجل هذه."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و غلق المحرّر؟"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، هل تريد غلق المحرّر؟"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "تمّ تغيير هذا الحدث."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "تم تغيير هذه المهمّة."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "تم تغيير خانة السّجل هذه."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  لقد قمت بتغييرات. هل تريد تجاهل هذه التّغييرات و تحديث المحرّر؟"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  لم تقم بأيّة تغييرات، هل تريد تحديث المحرّر؟"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
+#: calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "خطأ في التّصديق: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2229
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr " إلى "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2233
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (مُنجز "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2235
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "مُنجز "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2240
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (مُستحق "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2242
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "مُستحق "
 
-#: calendar/gui/dialogs/comp-editor.c:335
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "لم يمكن تحديث الجسم"
 
-#: calendar/gui/dialogs/comp-editor.c:786
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "تحرير الموعد"
 
-#: calendar/gui/dialogs/comp-editor.c:791
-#: calendar/gui/dialogs/comp-editor.c:828
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "الموعد - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:794
-#: calendar/gui/dialogs/comp-editor.c:831
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "المهمّة - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:797
-#: calendar/gui/dialogs/comp-editor.c:834
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "خانة السّجل - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:808
-#: calendar/gui/dialogs/comp-editor.c:844
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "دون ملخّص"
 
-#: 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:1377
-#: calendar/gui/dialogs/comp-editor.c:1401
-#: calendar/gui/dialogs/comp-editor.c:1427
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "قد تهمل التّغييرات التي أُجريت لهذا العنصر في حال وصول تحديث"
 
-#: calendar/gui/dialogs/comp-editor.c:1455
-#: calendar/gui/dialogs/comp-editor.c:1464
-msgid "Unable to obtain current version!"
+#: calendar/gui/dialogs/comp-editor.c:1387
+#, fuzzy
+msgid "Unable to use current version!"
 msgstr "لم يمكن الحصول على الإصدارة الحاليّة!"
 
-#: 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:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "هل تريد فعلاً حذف هذا الموعد الغير مسمّى؟"
-
-#: 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:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "هل تريد فعلاً حذف هذه المهمّة الغير مسمّاة؟"
-
-#: 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:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "هل تريد فعلاً حذف خانة السّجل الغير مسمّاة هذه؟"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "هل تريد فعلاً حذف %d من المواعيد؟"
+#: calendar/gui/dialogs/copy-source-dialog.c:57
+#, fuzzy
+msgid "Could not open source"
+msgstr "لم يمكن تحديث الجسم"
 
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "هل تريد فعلاً حذف %d من المهام؟"
+#: calendar/gui/dialogs/copy-source-dialog.c:65
+#, fuzzy
+msgid "Could not open destination"
+msgstr "وجهة النشر"
 
-#: 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/copy-source-dialog.c:74
+msgid "Destination is read only"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "لم يمكن حذف الحَدث بسبب خطأ كوربا"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "لم يمكن حذف المهمّة بسبب خطأ كوربا"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "لم يمكن حذف خانة السّجل بسبب خطأ كوربا"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "لم يمكن حذف العنصر بسبب خطأ كوربا"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "لم يمكن حذف الحَدث لأن التّصريح رُفض"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "لم يمكن حذف المهمّة لأن التّصريح رُفض"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "لم يمكن حذف بند السّجل اليومي لأن التّصريح رُفض"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "لم يمكن حذف العنصر لأن التّصريح رُفض"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "لم يمكن حذف الحَدث بسبب خطأ ما"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "لم يمكن حذف المهمّة بسبب خطأ ما"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "لم يمكن حذف بند السّجل اليومي بسبب خطأ ما"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "لم يمكن حذف العنصر بسبب خطأ ما"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "دفتر العناوين..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "المراسَلون"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4284,141 +5115,225 @@ msgstr "تفويض لـ:"
 msgid "Enter Delegate"
 msgstr "إدراج المفوَّض"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2266
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "موعد"
 
-#: calendar/gui/dialogs/event-editor.c:207
-msgid "Reminder"
-msgstr "علامة تذكير"
-
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "التّكرار"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "الجدولة"
 
-#: 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
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "الإتّجاه"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "إجتماع"
 
-#: calendar/gui/dialogs/event-page.c:599 calendar/gui/dialogs/task-page.c:503
+#: calendar/gui/dialogs/event-page.c:692
+#, fuzzy
+msgid "Event with no start date"
+msgstr "تاريخ الإستحقاق يقع قبل تاريخ البدء!"
+
+#: calendar/gui/dialogs/event-page.c:695
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "تاريخ البدء خاطئ"
 
-#: calendar/gui/dialogs/event-page.c:609
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "تاريخ الإنتهاء خاطئ"
 
-#: calendar/gui/dialogs/event-page.c:632
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "زمن البدء خاطئ"
 
-#: calendar/gui/dialogs/event-page.c:639
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "زمن الإنتهاء خاطئ"
 
+#: calendar/gui/dialogs/event-page.c:1605
+#, fuzzy, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "لم يمكن فتح الرُّزنامة '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "قبل كل موعد"
+msgstr[1] "قبل كل موعد"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "نهاية الموعد"
+msgstr[1] "نهاية الموعد"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "قبل كل موعد"
+msgstr[1] "قبل كل موعد"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "حدث يستغرق _يوماً كاملاً"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "قبل كل موعد"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_مشغول"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "قبل كل موعد"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "ال_فئات..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "قبل كل موعد"
 
 #: 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 "التّصنيف"
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>الحالة:</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-msgid "Co_nfidential"
-msgstr "_سرّي"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "التاريخ و الوقت"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "التاريخ و الوقت"
+msgid "A_ll day event"
+msgstr "حدث يستغرق _يوماً كاملاً"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-msgid "F_ree"
-msgstr "م_توفّر"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "حفظ المشهد المخصّص..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "L_ocation:"
-msgstr "الم_كان:"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "ال_فئات..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Pri_vate"
-msgstr "_خاص"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "الر_زنامة:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pu_blic"
-msgstr "_عام"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "التّصنيف"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-msgid "Show Time As"
-msgstr "عرض الوقت كـ"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "سرّي"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "L_ocation:"
+msgstr "الم_كان:"
+
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "خاص"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "عام"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "عرض الوقت كـ"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "م_لخّص:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "المنبّهات"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "الوصف:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "زمن الإ_نتهاء:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "زمن ال_بدء"
 
 #. 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
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "لا شيء"
 
-#: calendar/gui/dialogs/meeting-page.c:415
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "المنظّم المنتقى لم يعد يمتلك حساباً."
 
-#: calendar/gui/dialogs/meeting-page.c:421
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "مطلوب منظّم."
 
-#: calendar/gui/dialogs/meeting-page.c:436
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "تحتاج إلى حاضرٍ واحد على الأقل."
 
-#: calendar/gui/dialogs/meeting-page.c:629
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_تفويض إلى..."
 
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "إ_زالة"
+
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "الحاضر"
@@ -4454,69 +5369,45 @@ msgid "Member"
 msgstr "عضو"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "تأكيد الحضور"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:37
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "الحالة"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>ينتهي:</b> "
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#, fuzzy
+msgid "<b>Organizer</b>"
 msgstr "المنظّم:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-msgid "_Change Organizer"
+#, fuzzy
+msgid "Change Or_ganizer"
 msgstr "_تغيير المنظّم"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:417
-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 "مصدر بإسم '%s' موجود مسبقاً في المجموعة المنتقاة"
-
-#: 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 ""
-"المجموعة '%s' موجودة عن بعد. يجب أن تحدّد موقعاً لجلب الرُّزنامة منه"
-
-#: calendar/gui/dialogs/new-calendar.c:125
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "موقع المصدر '%s' ليس مشكلا بشكل سليم."
-
-#: calendar/gui/dialogs/new-calendar.c:138
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "موقع المصدر '%s' ليس مصدر وبكال."
-
-#: calendar/gui/dialogs/new-calendar.c:155
-msgid "Could not create cache for new calendar"
-msgstr "لم يمكن إنشاء ذاكرة مخبّأة للرزنامة الجديدة"
-
-#: calendar/gui/dialogs/new-calendar.c:174
-msgid "Could not create directory for new calendar"
-msgstr "لم يمكن إنشاء دليل للرُّزنامة الجديدة"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "المراسَلون"
 
-#: calendar/gui/dialogs/new-calendar.c:254
-#: calendar/gui/dialogs/new-task-list.c:131
-msgid "A group must be selected"
-msgstr "يجب إنتقاء مجموعة"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "المنظّم:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4538,10 +5429,6 @@ msgstr "موقع الرُّزنامة"
 msgid "Calendar Name"
 msgstr "إسم الرُّزنامة"
 
-#: calendar/gui/dialogs/new-task-list.c:56
-msgid "Could not create directory for new task list"
-msgstr "لم يمكن إنشاء دليل لقائمة المهام الجديدة"
-
 #: calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "<b>Task List Options</b>"
 msgstr "<b>خيارات قائمة المهام</b>"
@@ -4567,7 +5454,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "إنّك·بصدد·تعديل·مهمّة·متكرّرة،·ما·الذي·تود·تعديله؟"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr "إنّك·بصدد·تعديل·خانة سجلّ·متكرّرة،·ما·الذي·تود·تعديله؟"
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4586,217 +5474,189 @@ msgstr "هذا النموذج و الأنمذجة القادمة"
 msgid "All Instances"
 msgstr "كل الأنمذجة"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "يحتوي هذا الموعد متكرّرات لا يستطيع إيفُليوشِن أن يعدّلها."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "تاريخ التّكرار غير صحيح"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "يعمل"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "الأوّل"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "الثّاني"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "الثّالث"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "الرّابع"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "الأخير"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "تاريخ آخر"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "اليوم"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "عند"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "حادثات"
 
-#: calendar/gui/dialogs/recurrence-page.c:2334
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "التّاريخ/الوقت"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "إ_ضافة"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "كل"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "الإستثنائات"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "لمحة"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "قاعدة التّكرار"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "تكرار _مخصّص"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "ت_عديل"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_دون تكرار"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "التّكرار"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-msgid "_Remove"
-msgstr "إ_زالة"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "كل"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "تكرار _بسيط"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_تحرير الموعد"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "لـ"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "إلى الأبد"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "شهور"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "حتّى"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "أسابيع"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "سنين"
 
-#: 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 ""
-"لقد غيّر هذا الحدث، و لكنّه لم يحفظ.\n"
-"\n"
-"هل تود حفظ تغييراتك؟"
-
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1555
-msgid "_Discard Changes"
-msgstr "تجا_هل التّغييرات"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "حفظ الحدث"
-
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "تم إنشاء معلومات الإجتماع. هل أُرسلها؟"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "وقع تغيير معلومات الإجتماع. هل أُرسل نسخةً محدّثة؟"
+#: calendar/gui/dialogs/select-source-dialog.c:84
+#, fuzzy
+msgid "Select destination"
+msgstr "إنتقاء مصدر الوجهة"
 
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "تم إنشاء معلومات التّكليف بالمهام. هل أُرسلها؟"
+#: calendar/gui/dialogs/select-source-dialog.c:106
+#, fuzzy
+msgid "_Destination"
+msgstr "الوصف"
 
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "وقع تغييرت معلومات المهام. هل أُرسل نسخةً محدّثة؟"
+#: calendar/gui/dialogs/select-source-dialog.c:108
+msgid "Task List"
+msgstr "قائمة المهام"
 
-#: calendar/gui/dialogs/task-details-page.c:404
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "التاريخ المكمُّل خاطئ"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "_مُنجز %"
+msgid "<span weight=\"bold\">Status</span>"
+msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: 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
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "مُنجز"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:402 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:916
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 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: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
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "جاري العمل"
 
 #: 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
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 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:403
-#: calendar/gui/e-tasks.c:233 mail/message-list.c:915
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 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:594
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/e-tasks.c:217
-#: calendar/gui/print.c:2311
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "لم يباشَر"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "التقدّم"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "النّسبة المكتملة: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/e-calendar-table.c:377
 msgid "Undefined"
 msgstr "غير معرّف"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "_Date Completed:"
+#, fuzzy
+msgid "_Date completed:"
 msgstr "_تاريخ الإنتهاء:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:13
@@ -4811,200 +5671,260 @@ msgstr "ال_حالة:"
 msgid "_Web Page:"
 msgstr "_صفحة الإنترنت:"
 
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "أساسي"
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "مهمَّة"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "مهمّة"
 
-#: calendar/gui/dialogs/task-page.c:476
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "تاريخ الإستحقاق خاطئ"
 
-#: calendar/gui/dialogs/task-page.c:536
-msgid "Due date is before start date!"
-msgstr "تاريخ الإستحقاق يقع قبل تاريخ البدء!"
+#: calendar/gui/dialogs/task-page.c:831
+#, fuzzy, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr "لم يمكن فتح دفتر العناوين"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_سرّي"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
 
-#: 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
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "الوصف:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-page.glade.h:10
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "تاريخ ال_بدء:"
 
-#: calendar/gui/dialogs/task-page.glade.h:11
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:12
+#, fuzzy
+msgid "_Due date:"
 msgstr "تاريخ الإ_ستحقاق:"
 
-#: calendar/gui/e-alarm-list.c:397
-#, c-format
-msgid "%d days"
-msgstr "%d يوم"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "مجموعة:"
 
-#: calendar/gui/e-alarm-list.c:400
-msgid "1 day"
-msgstr "يوم واحد"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>خيارات الرُّزنامة</b>"
 
-#: calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d weeks"
-msgstr "%d أسابيع"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
-#: calendar/gui/e-alarm-list.c:408
-msgid "1 week"
-msgstr "أسبوع واحد"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "معلومات متوفّر/مشغول"
 
-#: calendar/gui/e-alarm-list.c:413
-#, c-format
-msgid "%d hours"
-msgstr "%d ساعات"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#, fuzzy
+msgid "Free/Busy Editor"
+msgstr "معلومات متوفّر/مشغول"
 
-#: calendar/gui/e-alarm-list.c:416
-msgid "1 hour"
-msgstr "ساعة واحدة"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
+msgid "_Daily"
+msgstr "اليوم"
 
-#: calendar/gui/e-alarm-list.c:421
-#, c-format
-msgid "%d minutes"
-msgstr "%d دقائق"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#, fuzzy
+msgid "_Manual"
+msgstr "_بريد:"
 
-#: calendar/gui/e-alarm-list.c:424
-msgid "1 minute"
-msgstr "دقيقة واحدة"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#, fuzzy
+msgid "_Password:"
+msgstr "كلمة السّر"
 
-#: calendar/gui/e-alarm-list.c:429
-#, c-format
-msgid "%d seconds"
-msgstr "%d ثواني"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#, fuzzy
+msgid "_Remember password"
+msgstr "تذكر كلمة السّر هذه"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#, fuzzy
+msgid "_Username:"
+msgstr "إ_سم المستخدم:"
 
-#: calendar/gui/e-alarm-list.c:432
-msgid "1 second"
-msgstr "ثانية واحدة"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#, fuzzy
+msgid "_Weekly"
+msgstr "الأسبوع"
 
-#: calendar/gui/e-alarm-list.c:469
-msgid "Send an email"
-msgstr "إرسال بريد إلكتروني"
+#: calendar/gui/e-alarm-list.c:395
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d يوم"
+msgstr[1] "%d يوم"
+
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d أسابيع"
+msgstr[1] "%d أسابيع"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ساعات"
+msgstr[1] "%d ساعات"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d دقائق"
+msgstr[1] "%d دقائق"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ثواني"
+msgstr[1] "%d ثواني"
+
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "العمليّة المطلوب إجراؤها مجهولة"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s قبل إبتداء الموعد"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s بعد إبتداء الموعد"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s عند إبتداء الموعد"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s قبل إنتهاء الموعد"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s بعد إنتهاء الموعد"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s عند إنتهاء الموعد"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s عند %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s لنوعيّة إطلاق مجهولة"
 
-#: 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-component-preview.c:71 mail/em-folder-view.c:2382
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "نقر لإضافة مهمّة"
 
-#: 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-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "بدون عنوان"
 
-#: 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-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "الملخّص:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Description"
-msgstr "الوصف"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "تاريخ البدء:"
+
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "تاريخ الإستحقاق:"
+
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:956
+msgid "Status:"
+msgstr "الحالة:"
+
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
+msgstr "الأولويّة:"
+
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
+msgstr "صفحة الإنترنت:"
+
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "التّاريخ"
 
 #: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
 #: 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
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
 msgid "Summary"
 msgstr "الملخّص"
 
-#: 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
-msgid "component"
-msgstr "المكوِّن"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
 msgid "Free"
 msgstr "متوفّر"
 
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "مشغول"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "شمال"
 
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "جنوب"
 
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:624
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "شرق"
 
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "غرب"
 
-#: calendar/gui/e-cal-model-tasks.c:546
+#: calendar/gui/e-cal-model-tasks.c:601
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5014,217 +5934,185 @@ msgstr ""
 "\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-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "نعم"
 
-#: 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
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 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: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
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
 #: 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
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "مجهول"
 
-#: calendar/gui/e-cal-model.c:837
+#: calendar/gui/e-cal-model.c:911
 msgid "Recurring"
 msgstr "متكرّر"
 
-#: calendar/gui/e-cal-model.c:839
+#: calendar/gui/e-cal-model.c:913
 msgid "Assigned"
 msgstr "مكلّف"
 
-#: 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-cal-view.c:1177 calendar/gui/e-cal-view.c:1262
-msgid "New _Appointment..."
-msgstr "_موعد جديد..."
-
-#: 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:1179 calendar/gui/e-cal-view.c:1266
-msgid "New Meeting"
-msgstr "إجتماع جديد"
-
-#: calendar/gui/e-cal-view.c:1180 calendar/gui/e-cal-view.c:1268
-msgid "New Task"
-msgstr "مهمّة جديدة"
-
-#: 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: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: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:1195 calendar/gui/e-cal-view.c:1260
-msgid "_Go to Date..."
-msgstr "إذهب إلى ال_تّاريخ..."
-
-#: 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: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: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: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: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:1218
-msgid "_Schedule Meeting..."
-msgstr "_جدوِلة الأجتماع"
-
-#: calendar/gui/e-cal-view.c:1219
-msgid "_Forward as iCalendar..."
-msgstr "ت_مرير كآيكلَندر..."
-
-#: 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:1225 calendar/gui/e-cal-view.c:1256
-msgid "Delete _All Occurrences"
-msgstr "حذف _كل الأحداث"
-
-#: calendar/gui/e-cal-view.c:1278 ui/evolution.xml.h:30
-msgid "_Settings..."
-msgstr "الإ_عدادات..."
-
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:397
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:398
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:399
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:400
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:406
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:990
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
+msgid "Deleting selected objects"
+msgstr "جاري حذف الأجسام المنتقاة"
+
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
+msgid "Updating objects"
+msgstr "جاري تحديث الأجسام"
+
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
+msgid "_Open"
+msgstr "_فتح"
+
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "فتح _صفحة الإنترنت"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "_حفظ كـ..."
+
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_طبع..."
+
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "_قص"
+
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
+msgid "_Copy"
+msgstr "_نسخ"
+
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
+msgid "_Paste"
+msgstr "_لصق"
+
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "ت_كليف بالمهمّة"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "ت_مرير كآيكلَندر"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_تعليم كمكتمل"
 
-#: calendar/gui/e-calendar-table.c:1005
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_تعليم المهام المنتقاة كمكتملة"
 
-#: calendar/gui/e-calendar-table.c:1010 calendar/gui/e-calendar-table.c:1028
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_حذف"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_حذف المهام المنتقاة"
 
-#: calendar/gui/e-calendar-table.c:1430
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "حفظ كـ..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "نقر لإضافة مهمّة"
 
@@ -5233,38 +6121,111 @@ msgstr "نقر لإضافة مهمّة"
 msgid "% Complete"
 msgstr "% تمة"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "المنبّهات"
-
-#: 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
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "تام"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Completion date"
 msgstr "تاريخ الإتمام"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:7
+#, fuzzy
+msgid "Due date"
 msgstr "تاريخ الإستحقاق"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "الموقع الجغرافي"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "الأولويّة"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:9
+#, fuzzy
+msgid "Start date"
+msgstr "تاريخ البدء"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "ترتيب المهام"
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "العنوان"
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "جاري نقل الرّسائل"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "جاري نسخ الرّسائل"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
+msgid "New _Appointment..."
+msgstr "_موعد جديد..."
+
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
+msgid "New All Day _Event"
+msgstr "_حدث جديد يستغرق يوماً كاملاً"
+
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
+msgid "New Meeting"
+msgstr "إجتماع جديد"
+
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
+msgid "New Task"
+msgstr "مهمّة جديدة"
+
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "إختيار ال_شّعبة"
+
+#: calendar/gui/e-calendar-view.c:1330
+#, fuzzy
+msgid "_Select Date..."
+msgstr "إ_نتقاء..."
+
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_نشر معلومات متوفّر/مشغول"
+
+#: calendar/gui/e-calendar-view.c:1353
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "نسخ إلى مجلّد..."
+
+#: calendar/gui/e-calendar-view.c:1354
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "_نقل للمجلّد..."
+
+#: calendar/gui/e-calendar-view.c:1355
+msgid "_Schedule Meeting..."
+msgstr "_جدوِلة الأجتماع"
+
+#: calendar/gui/e-calendar-view.c:1356
+msgid "_Forward as iCalendar..."
+msgstr "ت_مرير كآيكلَندر..."
+
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
+msgid "Delete this _Occurrence"
+msgstr "حذف هذا ال_حدث"
+
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
+msgid "Delete _All Occurrences"
+msgstr "حذف _كل الأحداث"
+
+#: calendar/gui/e-calendar-view.c:1396
+msgid "Go to _Today"
+msgstr "إذهب إلى ال_يوم"
+
+#: calendar/gui/e-calendar-view.c:1398
+msgid "_Go to Date..."
+msgstr "إذهب إلى ال_تّاريخ..."
+
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
+msgid "_Settings..."
+msgstr "الإ_عدادات..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
@@ -5296,467 +6257,411 @@ 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:1533
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 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:696 calendar/gui/e-day-view.c:1375
-#: calendar/gui/e-week-view-main-item.c:339
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-week-view-main-item.c:343
 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:596 calendar/gui/e-week-view.c:325
-#: calendar/gui/print.c:818
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
 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:820
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
 msgid "pm"
 msgstr "م"
 
-#: 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:636
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "نعم (تكرار مركّب)"
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:596
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "كل يوم"
-
-#: calendar/gui/e-itip-control.c:650
-#, c-format
-msgid "Every %d days"
-msgstr "كل %d أيام"
+msgid_plural "Every %d days"
+msgstr[0] "كل يوم"
+msgstr[1] "كل يوم"
 
-#: calendar/gui/e-itip-control.c:656
+#: calendar/gui/e-itip-control.c:601
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "كل أسبوع"
-
-#: calendar/gui/e-itip-control.c:658
-#, c-format
-msgid "Every %d weeks"
-msgstr "كل %d أسابيع"
+msgid_plural "Every %d weeks"
+msgstr[0] "كل أسبوع"
+msgstr[1] "كل أسبوع"
 
-#: calendar/gui/e-itip-control.c:661
+#: calendar/gui/e-itip-control.c:603
+#, fuzzy, c-format
 msgid "Every week on "
-msgstr "أسبوعيّاً يوم"
-
-#: calendar/gui/e-itip-control.c:663
-#, c-format
-msgid "Every %d weeks on "
-msgstr "كل %d أسابيع يوم"
+msgid_plural "Every %d weeks on "
+msgstr[0] "أسبوعيّاً يوم"
+msgstr[1] "أسبوعيّاً يوم"
 
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " و "
 
-#: calendar/gui/e-itip-control.c:678
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "اليوم %s من "
 
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "ال %s %s من "
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy, c-format
 msgid "every month"
-msgstr "كل شهر"
-
-#: calendar/gui/e-itip-control.c:701
-#, c-format
-msgid "every %d months"
-msgstr "كل %d أشهر"
+msgid_plural "every %d months"
+msgstr[0] "كل شهر"
+msgstr[1] "كل شهر"
 
-#: calendar/gui/e-itip-control.c:707
+#: calendar/gui/e-itip-control.c:642
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "كل سنة"
-
-#: calendar/gui/e-itip-control.c:709
-#, c-format
-msgid "Every %d years"
-msgstr "كل %d سنين"
-
-#: calendar/gui/e-itip-control.c:721
-#, c-format
-msgid " a total of %d times"
-msgstr "إجمالي %d مرّات"
-
-#: calendar/gui/e-itip-control.c:730
+msgid_plural "Every %d years"
+msgstr[0] "كل سنة"
+msgstr[1] "كل سنة"
+
+#: calendar/gui/e-itip-control.c:653
+#, fuzzy, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] "إجمالي %d مرّات"
+msgstr[1] "إجمالي %d مرّات"
+
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr "، إنتهاءً عند"
 
-#: calendar/gui/e-itip-control.c:754
-msgid "<b>Starts:</b> "
-msgstr "<b>يبدء:</b> "
-
-#: calendar/gui/e-itip-control.c:764
-msgid "<b>Ends:</b> "
-msgstr "<b>ينتهي:</b> "
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Starts"
+msgstr "الحالة"
 
-#: calendar/gui/e-itip-control.c:784
-msgid "<b>Completed:</b> "
-msgstr "<b>تم:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:794
-msgid "<b>Due:</b> "
-msgstr "<b>مستحَق:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "مُستحق "
 
-#: calendar/gui/e-itip-control.c:831 calendar/gui/e-itip-control.c:884
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "معلومات آي-كلَندر"
 
 #. Title
-#: calendar/gui/e-itip-control.c:846
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "خطأ آي-كلَندر"
 
-#: 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
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "شخص مجهول"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:966
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
-msgstr ""
-"<br> الرجاء مراجعة المعلومات التّالية ثم إختيار إجراءً من القائمة أدناه."
+msgstr "<br> الرجاء مراجعة المعلومات التّالية ثم إختيار إجراءً من القائمة أدناه."
 
-#: calendar/gui/e-itip-control.c:981
-msgid "<i>None</i>"
-msgstr "<i> لا شيء</i>"
-
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "الموقع:"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-tasks.c:203
-msgid "Status:"
-msgstr "الحالة:"
-
-#: 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
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "مقبول"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/itip-utils.c:421
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "مقبول مبدئيّاً"
 
-#: 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
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "مرفوض"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "إختيار إجراءً:"
 
-#: calendar/gui/e-itip-control.c:1079
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "تحديث"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "موافق"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "تقبّل"
 
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "تقبّل مبدئيّاً"
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "رفض"
 
-#: calendar/gui/e-itip-control.c:1133
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "إرسال معلومات متوفّر/مشغول"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "تحديث حالة المستجيب"
 
-#: calendar/gui/e-itip-control.c:1159
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "إرسال آخر المعلومات"
 
-#: 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
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "نشر <b>%s</b> معلومات الإجتماع."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "معلومات الإجتماع"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1269
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "يطلب <b>%s</b> حضورك إلى إجتماع."
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "إقتراح إجتماع"
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "يود <b>%s</b> إضافته إلى إجتماع موجود."
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "تحديث إجتماع"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "يود <b>%s</b> إستلام آخر معلومات الإجتماع."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "طلب تحديث إجتماع"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "ردّ <b>%s</b> على طلب إجتماع."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "رد اجتماع"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "ألغى <b>%s</b>· إجتماعاً."
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "إلغاء إجتماع"
 
-#: calendar/gui/e-itip-control.c:1303 calendar/gui/e-itip-control.c:1370
-#: calendar/gui/e-itip-control.c:1405
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "أرسل <b>%s</b> رسالة غير مفهومة."
 
-#: calendar/gui/e-itip-control.c:1304
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "رسالة إجتماع رديئة"
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "نشر <b>%s</b> معلومات مَهمّة."
 
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "معلومات المهمّة"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "يطلب <b>%s</b> من %s أن يؤدّي مهمّة."
 
-#: calendar/gui/e-itip-control.c:1336
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "يطلب <b>%s</b> منك أن تؤدّي مهمّة."
 
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "إقتراح مهمّة"
 
-#: calendar/gui/e-itip-control.c:1341
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "يود·<b>%s</b> أن يضيف إلى مهمّة."
 
-#: calendar/gui/e-itip-control.c:1342
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "تحديث المهمّة"
 
-#: calendar/gui/e-itip-control.c:1346
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "يود <b>%s</b> أن يستلم آخر معلومات المهمّة."
 
-#: calendar/gui/e-itip-control.c:1347
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "طلب تحديث المهمّة"
 
-#: calendar/gui/e-itip-control.c:1354
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "ردّ على <b>%s</b> تكليفٍ بمهمّة."
 
-#: calendar/gui/e-itip-control.c:1355
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "رد مهمّة"
 
-#: calendar/gui/e-itip-control.c:1362
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "ألغى <b>%s</b> مهمّة."
 
-#: calendar/gui/e-itip-control.c:1363
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "إلغاء مهمّة"
 
-#: calendar/gui/e-itip-control.c:1371
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "رسالة مهمّة رديئة"
 
-#: calendar/gui/e-itip-control.c:1390
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "نشر <b>%s</b> معلومات متوفّر/مشغول."
 
-#: calendar/gui/e-itip-control.c:1391
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "معلومات متوفّر/مشغول"
 
-#: calendar/gui/e-itip-control.c:1395
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "يطلب <b>%s</b>·معلومات متوفّر/مشغول الخاصّة بك."
 
-#: calendar/gui/e-itip-control.c:1396
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "طلب متوفّر/مشغول"
 
-#: calendar/gui/e-itip-control.c:1400
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ردّ <b>%s</b>·على طلب متوفّر/مشغول."
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "رد متفرّغ/مشغول"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "رسالة متوفّر/مشغول رديئة"
 
-#: calendar/gui/e-itip-control.c:1482
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "لا تبدو الرّسالة مبنيّة بشكل صحيح"
 
-#: calendar/gui/e-itip-control.c:1550
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "هذه الرّسالة تحتوي فقط طلبات غير مدعومة."
 
-#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1587
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "لا يحتوي هذا الملحق على رسالة رُزنامة صحيحة"
 
-#: calendar/gui/e-itip-control.c:1612
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "الملحق لا يحتوي أيّة عناصر رُزنامة قابلة للعرض"
 
-#: calendar/gui/e-itip-control.c:1851
-msgid "Calendar file could not be updated!\n"
-msgstr "لم يمكن تحديث ملف الرُزنامة!\n"
-
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "تمَّ التّحديث\n"
 
-#: 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:1899 calendar/gui/e-itip-control.c:1937
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "الكائن غير صالح و لا يمكن تحديثه\n"
 
-#: calendar/gui/e-itip-control.c:1909
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "هذه الإستجابه ليست من حاضرٍٍ حالي.  هل يضاف كحاضر؟"
 
-#: calendar/gui/e-itip-control.c:1921
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "حالة الحاضر لم يمكن تحديثها بسبب حالة غير صالحة!\n"
 
-#: calendar/gui/e-itip-control.c:1940
-msgid "There was an error on the CORBA system\n"
-msgstr "ثمّة خطأ على نظام كوربا\n"
-
-#: calendar/gui/e-itip-control.c:1943
-msgid "Object could not be found\n"
-msgstr "لم يعثر على الجسم\n"
-
-#: 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:1949
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "تم تحديث حالة الحاضر\n"
 
-#: calendar/gui/e-itip-control.c:1952
-msgid "Attendee status could not be updated!\n"
-msgstr "لم يمكن تحديث حالة الحاضر!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "لا يمكن تحديث حالة الحاضر لأنّ العنصر لم يعد موجوداً"
 
-#: calendar/gui/e-itip-control.c:1990
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "تمَّ الحذف"
 
-#: calendar/gui/e-itip-control.c:2024 calendar/gui/e-itip-control.c:2072
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "تم إرسال العنصر!\n"
 
-#: calendar/gui/e-itip-control.c:2026 calendar/gui/e-itip-control.c:2076
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "لم يمكن إرسال العنصر!\n"
 
-#: calendar/gui/e-itip-control.c:2170
-msgid "Select Calendar Folder"
-msgstr "إنتقاء مجلّد الرُّزنامة"
-
-#: calendar/gui/e-itip-control.c:2176
-msgid "Select Tasks Folder"
-msgstr "إنتقاء مجلّد المهام"
-
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5782,6 +6687,10 @@ msgstr "جاري تحميل الرُّزنامة"
 msgid "Loading calendar..."
 msgstr "جاري تحميل الرُّزنامة..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "المنظّم:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "رسالة النّادل:"
@@ -5794,95 +6703,73 @@ msgstr "تاريخ الإنتهاء"
 msgid "date-start"
 msgstr "تاريخ البدء"
 
-#: calendar/gui/e-meeting-list-view.c:62 calendar/gui/e-meeting-model.c:77
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "رؤساء الجلسة"
 
-#: 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 "المشاركون الإلزاميّون"
-
-#: calendar/gui/e-meeting-list-view.c:64 calendar/gui/e-meeting-model.c:79
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "المشاركون الإختياريّون"
 
-#: calendar/gui/e-meeting-list-view.c:65 calendar/gui/e-meeting-model.c:80
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "الموارد"
 
-#: 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-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "فرد"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "مجموعة"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "المورد"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "الغرفة"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "الكرسي"
 
-#: 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-list-view.c:133 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 "مشارك إلزامي"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "مشارك إختياري"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "غير مشارك"
 
-#: 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-list-view.c:157 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 "يتطلّب إجراء"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:160 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 "مبدئي"
 
-#: 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
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "مفوّض"
 
-#: 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 "قيد العمل"
@@ -5890,14 +6777,14 @@ msgstr "قيد العمل"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel.c:2053
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel.c:2086 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"
@@ -5905,7 +6792,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:1606
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -5917,92 +6804,64 @@ msgstr "خارج المكتب"
 msgid "No Information"
 msgstr "لا معلومات"
 
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_خيارات"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "خيارات"
 
-#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:449
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "عرض ساعات العمل _فقط"
 
-#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:459
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "عرض _مصغّرا"
 
-#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:474
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_تحديث متوفّر/مشغول"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "إ_ختيار تلقائي"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:539
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_كل الأشخاص و الموارد"
 
-#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:548
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "كل الأ_شخاص و مورد واحد"
 
-#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:557
+#, fuzzy
+msgid "_Required people"
 msgstr "الأشخاص الإ_لزاميّون"
 
-#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:566
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "الأشخاص الإلزاميّون و _مورد واحد"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "وقت _بدء الإجتماع:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "وقت إ_نتهاء الإجتماع:"
-
-#: calendar/gui/e-tasks.c:181
-msgid "Start Date:"
-msgstr "تاريخ البدء:"
-
-#: calendar/gui/e-tasks.c:197
-msgid "Due Date:"
-msgstr "تاريخ الإستحقاق:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:225
-msgid "Priority:"
-msgstr "الأولويّة:"
-
-#. URL
-#: calendar/gui/e-tasks.c:281
-msgid "Web Page:"
-msgstr "صفحة الإنترنت:"
-
-#: 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:725
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "الطريقة المطلوبة لتحميل `%s' غير مدعومة"
-
-#: 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "ادخل كلمة السر لـ %s"
 
-#: calendar/gui/e-tasks.c:800 calendar/gui/gnome-cal.c:1979
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6011,61 +6870,49 @@ msgstr ""
 "خطأ على %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:958
+#: calendar/gui/e-tasks.c:755
+#, fuzzy
+msgid "Loading tasks"
+msgstr "جاري تحميل الصّور"
+
+#: calendar/gui/e-tasks.c:846
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "جاري فتح المخزن %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "جاري إتمام المهام..."
 
-#: calendar/gui/e-tasks.c:981
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "جاري حذف الأجسام المنتقاة..."
 
-#: calendar/gui/e-tasks.c:1006
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "جاري الشطب"
 
-#: 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:1737
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "لم يمكن فتح المجلّد في `%s'"
-
-#: 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:704
+#, fuzzy
+msgid "Updating query"
+msgstr "جاري تحديث الأجسام"
 
-#: calendar/gui/gnome-cal.c:1808
-#, c-format
-msgid "Adding alarms for %s"
-msgstr "جاري إضافة المنبّهات لـ %s"
+#: calendar/gui/gnome-cal.c:2006
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "الموعد - %s"
 
-#: calendar/gui/gnome-cal.c:2000
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"خلفيّة المهام لـ\n"
-"%s\n"
-"قد إنهارت. سوف تضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+#: calendar/gui/gnome-cal.c:2025
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "جاري تحميل الصّور"
 
-#: calendar/gui/gnome-cal.c:2008
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"خلفيّة الرُّزنامة لـ\n"
-"%s\n"
-"قد إنهارت. سوف تضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+#: calendar/gui/gnome-cal.c:2048
+#, fuzzy, c-format
+msgid "Opening %s"
+msgstr "فتح في %s..."
 
-#: calendar/gui/gnome-cal.c:2848
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "التّنقية"
 
@@ -6086,389 +6933,462 @@ msgid "February"
 msgstr "فبراير"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "إذهب إلى التّاريخ"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "إذهب إلى اليوم"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "يناير"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "يوليو"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "يونيو"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "مارس"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "مايو"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "نوفمبر"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "أكتوبر"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "إنتقاء الأسماء"
+
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "سبتمبر"
 
-#: calendar/gui/itip-utils.c:267 calendar/gui/itip-utils.c:315
-#: calendar/gui/itip-utils.c:347
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Select Today"
+msgstr "إنتقاء مجلّد"
+
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "يجب تعيين منظّم."
 
-#: calendar/gui/itip-utils.c:302
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "حاضرٌ واحد على الأقل ضروري"
 
-#: calendar/gui/itip-utils.c:390 calendar/gui/itip-utils.c:499
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "معلومات الحدث"
 
-#: calendar/gui/itip-utils.c:392 calendar/gui/itip-utils.c:501
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "معلومات المهمّة"
 
-#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "معلومات السّجل"
 
-#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:521
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "معلومات متوفّر/مشغول"
 
-#: calendar/gui/itip-utils.c:398
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "معلومات الرُّزنامة"
 
-#: calendar/gui/itip-utils.c:434
+#: calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "حُدّث"
 
-#: calendar/gui/itip-utils.c:442
+#: calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "إعادة التّحميل"
 
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr "إقتراح معاكس"
 
-#: calendar/gui/itip-utils.c:517
+#: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "معلومات متوفّر/مشغول (%s إلى %s)"
 
-#: calendar/gui/itip-utils.c:527
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "معلومات آي-كلندر"
 
-#: calendar/gui/itip-utils.c:667
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "يجب أن تكون حاضراً للحدث."
 
-#: calendar/gui/print.c:476
+#: calendar/gui/migration.c:146
+#, fuzzy
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
+
+#: calendar/gui/migration.c:150
+#, fuzzy
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"لقد تغيرت مواقع و هرميّة مجلّدات صندوق بريد إيفُليوشِن منذ إيفُليوشِن 1.x.\n"
+"\n"
+"الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
+
+#: calendar/gui/migration.c:376
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the Webcal source group
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+msgid "On The Web"
+msgstr "على الإنترنت"
+
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "فشل تنزيح `%s': %s"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:889
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "فشل تنزيح `%s': %s"
+
+#: calendar/gui/print.c:489
 msgid "1st"
 msgstr "الأوّل"
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:489
 msgid "2nd"
 msgstr "الثّاني"
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:489
 msgid "3rd"
 msgstr "الثّالث"
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:489
 msgid "4th"
 msgstr "الرّابع"
 
-#: calendar/gui/print.c:476
+#: calendar/gui/print.c:489
 msgid "5th"
 msgstr "الخامس"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:490
 msgid "6th"
 msgstr "السّادس"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:490
 msgid "7th"
 msgstr "السّابع"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:490
 msgid "8th"
 msgstr "الثّامن"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:490
 msgid "9th"
 msgstr "التّاسع"
 
-#: calendar/gui/print.c:477
+#: calendar/gui/print.c:490
 msgid "10th"
 msgstr "العاشر"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:491
 msgid "11th"
 msgstr "الحادي عشر"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:491
 msgid "12th"
 msgstr "الثّاني عشر"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:491
 msgid "13th"
 msgstr "الثّالث عشر"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:491
 msgid "14th"
 msgstr "الرّابع عشر"
 
-#: calendar/gui/print.c:478
+#: calendar/gui/print.c:491
 msgid "15th"
 msgstr "الخامس عشر"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:492
 msgid "16th"
 msgstr "السّادس عشر"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:492
 msgid "17th"
 msgstr "السّابع عشر"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:492
 msgid "18th"
 msgstr "الثّامن عشر"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:492
 msgid "19th"
 msgstr "التّاسع عشر"
 
-#: calendar/gui/print.c:479
+#: calendar/gui/print.c:492
 msgid "20th"
 msgstr "العشرين"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:493
 msgid "21st"
 msgstr "الحادي و العشرون"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:493
 msgid "22nd"
 msgstr "الثّاني و العشرون"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:493
 msgid "23rd"
 msgstr "الثّالث و العشرون"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:493
 msgid "24th"
 msgstr "الرّابع و العشرون"
 
-#: calendar/gui/print.c:480
+#: calendar/gui/print.c:493
 msgid "25th"
 msgstr "الخامس و العشرون"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:494
 msgid "26th"
 msgstr "السّادس و العشرون"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:494
 msgid "27th"
 msgstr "السّابع و العشرون"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:494
 msgid "28th"
 msgstr "الثّامن و العشرون"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:494
 msgid "29th"
 msgstr "التّاسع و العشرون"
 
-#: calendar/gui/print.c:481
+#: calendar/gui/print.c:494
 msgid "30th"
 msgstr "الثّلاثين"
 
-#: calendar/gui/print.c:482
+#: calendar/gui/print.c:495
 msgid "31st"
 msgstr "الحادي و الثّلاثون"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:570
 msgid "Su"
 msgstr "الأحد"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:570
 msgid "Mo"
 msgstr "الإثنين"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:570
 msgid "Tu"
 msgstr "الثلاثاء"
 
-#: calendar/gui/print.c:556
+#: calendar/gui/print.c:570
 msgid "We"
 msgstr "الأربعاء"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:571
 msgid "Th"
 msgstr "الخميس"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:571
 msgid "Fr"
 msgstr "الجمعة"
 
-#: calendar/gui/print.c:557
+#: calendar/gui/print.c:571
 msgid "Sa"
 msgstr "السّبت"
 
 #. Day
-#: calendar/gui/print.c:1891
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "اليوم المنتقى (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1916 calendar/gui/print.c:1920
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1917
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1921 calendar/gui/print.c:1923
-#: calendar/gui/print.c:1924
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1928
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "الأسبوع المنتقى (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1936
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "الشّهر المنتقى (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "السّنة المنتقاة (%Y)"
 
-#: calendar/gui/print.c:2268
-msgid "Task"
-msgstr "مهمَّة"
-
-#: calendar/gui/print.c:2327
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: calendar/gui/print.c:2344
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "الأولوية: %s"
 
-#: calendar/gui/print.c:2356
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "النّسبة المكتملة: %i"
 
-#: calendar/gui/print.c:2368
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "العنوان: %s"
 
-#: calendar/gui/print.c:2382
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "الأصناف: %s"
 
-#: calendar/gui/print.c:2393
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "المراسَلون: "
 
-#: calendar/gui/print.c:2531 calendar/gui/print.c:2617
-#: calendar/gui/tasks-control.c:563 mail/em-format-html-print.c:147
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "معاينة للطّباعة"
 
-#: calendar/gui/print.c:2565
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "طبع العنصر"
 
-#: calendar/gui/print.c:2638
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "تعيينات الطّباعة"
 
-#: calendar/gui/tasks-component.c:338
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "ستحذف قائمة المهام '%s'. هل تريد فعلاً الإستمرار؟"
 
-#: calendar/gui/tasks-component.c:378
-msgid "Rename this task list to"
-msgstr "إعادة تسمية قائمة المهام هذه لـ"
-
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "قائمة مهام جديدة"
 
-#: calendar/gui/tasks-component.c:590
+#: calendar/gui/tasks-component.c:408
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d يوم"
+msgstr[1] "%d يوم"
+
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "مُنتقى"
+msgstr[1] "مُنتقى"
+
+#: calendar/gui/tasks-component.c:457
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:749
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
+
+#: calendar/gui/tasks-component.c:761
+msgid "There is no calendar available for creating tasks"
+msgstr "لا تتوفّر رُزنامة لإنشاء المهام"
+
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "مهمّة جديدة"
 
-#: calendar/gui/tasks-component.c:591
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_مهمّة"
 
-#: calendar/gui/tasks-component.c:592
+#: calendar/gui/tasks-component.c:1032
 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 "لم يمكن فتح قائمة المهام '%s' لإنشاء الأحداث و الإجتماعات"
+#: calendar/gui/tasks-component.c:1038
+#, fuzzy
+msgid "New tasks group"
+msgstr "مهمّة جديدة"
 
-#: calendar/gui/tasks-component.c:671
-msgid "There is no calendar available for creating tasks"
-msgstr "لا تتوفّر رُزنامة لإنشاء المهام"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
+msgstr "مجموعة قائمة المهام"
 
-#: calendar/gui/tasks-control.c:148
-msgid "The URI of the tasks folder to display"
-msgstr "عنوان مجلّد المهام الذي سيُعرض"
+#: calendar/gui/tasks-component.c:1040
+#, fuzzy
+msgid "Create a new tasks group"
+msgstr "إنشاء مهمّةً جديدة"
 
-#: calendar/gui/tasks-control.c:447
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"هذه العمليّة ستمحو بشكل دائم كل المهام المعلّمة على أنّها منجزة. "
-"إذا تابعت، لن تتمكّن من إستعادة هذه المهام.\n"
+"هذه العمليّة ستمحو بشكل دائم كل المهام المعلّمة على أنّها منجزة. إذا تابعت، لن "
+"تتمكّن من إستعادة هذه المهام.\n"
 "\n"
 "هل تريد فعلاً حذف هذه المهام؟"
 
-#: calendar/gui/tasks-control.c:450
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "لا تسألني ثانيةً."
 
-#: calendar/gui/tasks-control.c:592
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "طبع المهام"
 
-#: calendar/gui/weekday-picker.c:268
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr ""
 
@@ -6492,15 +7412,20 @@ msgstr "ملفّات آي-كلندر (.ics)"
 msgid "vCalendar files (.vcf)"
 msgstr "ملفّات في-كلندر (.vcf)"
 
-#: calendar/importers/icalendar-importer.c:469
+#: calendar/importers/icalendar-importer.c:78
+#, fuzzy
+msgid "Appointments and Meetings"
+msgstr "تنظيف المواعيد و الاجتماعات القديمة"
+
+#: calendar/importers/icalendar-importer.c:490
 msgid "Reminder!!"
 msgstr "علامة تذكير!!"
 
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/importers/icalendar-importer.c:698
 msgid "Calendar Events"
 msgstr "أحداث الرُّزنامة"
 
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:723
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6508,7 +7433,7 @@ msgstr ""
 "عثر إيفُليوشِن على ملفّات رزنامة جنوم.\n"
 "هل تريد استيرادها إلى إيفُليوشِن؟"
 
-#: calendar/importers/icalendar-importer.c:741
+#: calendar/importers/icalendar-importer.c:730
 msgid "Gnome Calendar"
 msgstr "رزنامة جنوم"
 
@@ -8069,12 +8994,12 @@ msgstr "ليس لك أن تصدّر مفاتيحاً بهذه الشّيفرة"
 msgid "Unable to create cache path"
 msgstr "لم يمكن إنشاء مسار الذّاكرة المخبّأة"
 
-#: camel/camel-data-cache.c:370
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "لم يمكن إزالة مدخل الذّاكرة المخبّأة: %s: %s"
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8085,7 +9010,7 @@ msgstr ""
 "أيّة عمليّات إضافيّة على هذا النّادل لن تكرّر عندما\n"
 "تعيد الإتّصال بالشّبكة."
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8096,86 +9021,90 @@ msgstr ""
 "%s\n"
 "لن تعاد مزامنة التّغييرات التي أُجريت على هذا الدّليل."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "جاري المزامنة مع النّادل"
 
-#: camel/camel-disco-folder.c:90
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
 msgstr "جاري تنزيل رسائل جديدة لنسق عدم الإتّصال"
 
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "جاري تحضير المجلّد '%s' لنسق عدم الإتّصال"
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr "يجب أن تكون متّصلاً لإتمام هذه العمليّة"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "تيّار رسائل غير صالح تلقّي من %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "جاري مزامنة المجلّدات"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "خطأ أثناء ترجمة المصفات: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "خطأ أثناء تنفيذ المصفات: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "لم يمكن فتح مجلّد البكرة"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "لم يمكن معالجة مجلّد البكرة"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "جاري سحب الرّسالة %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "لا يمكن فتح الرّسالة"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "فشل عند الرّسالة %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1257
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "جاري مزامنة المجلّد"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "جاري جلب الرّسالة %d من أصل %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "فشل عند الرّسالة %d من أصل %d"
@@ -8197,7 +9126,7 @@ msgstr "متغيّرات غير سليمة لـ (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "خطأ أثناء تنفيذ بحث المصفات: %s: %s"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8206,7 +9135,7 @@ msgstr ""
 "لا يمكن ترجمة تعبير البحث: %s: \n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8215,43 +9144,70 @@ msgstr ""
 "خطأ أثناء تنفيذ تعبير البحث: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) تحتاج ناتجاً منطقيّاً واحداً"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:784
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) تحتاج ناتجاً منطقيّاً واحداً"
+
+#: camel/camel-folder-search.c:790
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) تحتاج ناتجاً منطقيّاً واحداً"
+
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "جاري تنفيذ البحث على التّرويسة المجهولة: %s"
 
-#: camel/camel-folder.c:586
+#: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "عمليّة غير مدعومة: إضافة الرّسالة: لـ %s"
 
-#: camel/camel-folder.c:1164
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "عمليّة غير مدعومة: بحث بواسطة التّعبير: عن %s"
 
-#: camel/camel-folder.c:1204
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "عمليّة غير مدعومة: بحث بواسطة هويّات المستخدمين: عن %s"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1416
 msgid "Moving messages"
 msgstr "جاري نقل الرّسائل"
 
-#: camel/camel-folder.c:1322
+#: camel/camel-folder.c:1416
 msgid "Copying messages"
 msgstr "جاري نسخ الرّسائل"
 
-#: camel/camel-folder.c:1572
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "جاري تغيير حالة النفاية"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "جاري تصفية الرّسائل الجديدة"
 
-#: camel/camel-gpg-context.c:703
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8262,15 +9218,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:717
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "فشل إعراب تلميحة هويّة مستخدم gpg."
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "فشت ترجمة طلب جملة سرّ gpg."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8279,30 +9235,28 @@ msgstr ""
 "تحتاج إلى جملة سرّ حتى تزيل القفل عن مفتاح\n"
 "المستخدم: \"%s\""
 
-#: 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
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "ألغي."
 
-#: camel/camel-gpg-context.c:788
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "فشل فك قفل المفتاح السّري: أُعطيت 3 كلمات مرور غير سليمة."
 
-#: camel/camel-gpg-context.c:794
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "إستجابة غير متوقّعة من GnuPG: %s"
 
-#: camel/camel-gpg-context.c:806
-msgid "No data provided"
-msgstr "لم توفّر أيّة معلومات"
-
-#: camel/camel-gpg-context.c:844
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "فشل التّشفير: لم يحدّد أيّة مستلمين سليمين."
 
-#: camel/camel-gpg-context.c:1121
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8313,58 +9267,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1126
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "فشل القيام بـ GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1239 camel/camel-smime-context.c:406
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "لم يمكن توليد بيانات التّوقيع: %s"
 
-#: camel/camel-gpg-context.c:1253 camel/camel-gpg-context.c:1653
-#: camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "فشل تنفيذ gpg: %s"
 
-#: 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
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "فشل تنفيذ gpg."
 
-#: camel/camel-gpg-context.c:1296
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "هذا جزء من رسالة موقّع رقميّاً"
 
-#: 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
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "لا يمكن التّوثّق من توقيع الرّسالة: تهيئة الرّسالة غير سليمة"
 
-#: camel/camel-gpg-context.c:1392
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "لا يمكن التّحقّق من توقيع الرّسالة: لم يمكن إنشاء الملفّ المؤقّت: %s"
 
-#: camel/camel-gpg-context.c:1473
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "لم يمكن توليد بيانات التّشفير: %s"
 
-#: camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "هذا جزء من رسالة مشفّر رقميّاً"
 
-#: camel/camel-gpg-context.c:1628 camel/camel-smime-context.c:974
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "محتويات مشفّرة"
 
-#: camel/camel-gpg-context.c:1632
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "لم يمكن ترجمة محتويات الرّسالة"
 
@@ -8396,7 +9350,9 @@ msgstr "لم يمكن إنشاء ملف الإقفال لـ %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "نفدت الفرصة الزّمنيّة أثناء محاولة الحصول على ملف القفل على %s. حاول مرّةً أُخرى لاحقاً."
+msgstr ""
+"نفدت الفرصة الزّمنيّة أثناء محاولة الحصول على ملف القفل على %s. حاول مرّةً أُخرى "
+"لاحقاً."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -8474,21 +9430,34 @@ msgstr "فشل فك تشفير جزء MIME: بنية غير صالحة"
 msgid "parse error"
 msgstr "خطأ ترجمة"
 
-#: camel/camel-provider.c:132
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
+msgstr "مزود مجلدات إعتباطية للبريد الإلكتروني"
+
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
+msgstr "لقراءة البريد كاستعلام عن مجموعة أُخرى من المجلّدات"
+
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "لم يمكن تحميل %s: تحميل الوحدات غير مدعوم على هذا النّظام."
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "لم يمكن تحميل %s: %s"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "لم يمكن تحميل %s: لا يوجد كود تهيئة في الوحدة."
 
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "لا مُقدّم متوفّر للبرتوكول `%s'"
+
 #: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "مجهول"
@@ -8537,7 +9506,8 @@ msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
 msgstr ""
-"سيتصّل هذا الخيار بالنّادل بإستخدام كلمة سر CRAM-MD5 آمنة، إن كان النّادل يدعمها."
+"سيتصّل هذا الخيار بالنّادل بإستخدام كلمة سر CRAM-MD5 آمنة، إن كان النّادل "
+"يدعمها."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
@@ -8548,7 +9518,8 @@ msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
-"سيتصل هذا الخيار بالنّادل بإستخدام كلمة سر DIGEST-MD5 آمنة، إن كان النّادل يدعمها."
+"سيتصل هذا الخيار بالنّادل بإستخدام كلمة سر DIGEST-MD5 آمنة، إن كان النّادل "
+"يدعمها."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -8587,7 +9558,8 @@ msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
 msgstr ""
-"الآليّة المشار إليها غير مدعومة من قبل المؤهّل المعطى، أو غير معترف بها من قبل التّجسيد."
+"الآليّة المشار إليها غير مدعومة من قبل المؤهّل المعطى، أو غير معترف بها من قبل "
+"التّجسيد."
 
 #: camel/camel-sasl-gssapi.c:153
 msgid "The provided target_name parameter was ill-formed."
@@ -8597,29 +9569,29 @@ msgstr "معطى target_name الموفّر مشوّه."
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
-msgstr ""
-"متغيّر target_name المزوّد يحتوي فئة اسم غير سليمة أو غير مدعومة."
+msgstr "متغيّر target_name المزوّد يحتوي فئة اسم غير سليمة أو غير مدعومة."
 
 #: camel/camel-sasl-gssapi.c:160
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
 msgstr ""
-"يحتوي input_token على تقييدات قنوات مختلفة عن تلك المحدّدة في معطى input_chan_bindings."
+"يحتوي input_token على تقييدات قنوات مختلفة عن تلك المحدّدة في معطى "
+"input_chan_bindings."
 
 #: camel/camel-sasl-gssapi.c:165
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
-msgstr ""
-"يحتوي input_token على توقيع غير سليم، أو توقيع تعذّر التّحقّق منه."
+msgstr "يحتوي input_token على توقيع غير سليم، أو توقيع تعذّر التّحقّق منه."
 
 #: camel/camel-sasl-gssapi.c:169
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"المؤهّلات المعطاة ليست سليمة لتجهيز السّياق، أو أن مقبض المؤهّل لم يشر لأيّة مؤهّلات."
+"المؤهّلات المعطاة ليست سليمة لتجهيز السّياق، أو أن مقبض المؤهّل لم يشر لأيّة "
+"مؤهّلات."
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
@@ -8640,7 +9612,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:1217
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "إستجابة توثيق رديئة من النّادل."
 
@@ -8690,16 +9662,12 @@ msgstr "NTLM / SPA"
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
-msgstr ""
-"سيتصل هذا الخيار بنادل ويندوز باستخدام NTLM/توثيق كلمات السّر الآمن."
+msgstr "سيتصل هذا الخيار بنادل ويندوز باستخدام NTLM/توثيق كلمات السّر الآمن."
 
 #: camel/camel-sasl-plain.c:32
 msgid "PLAIN"
 msgstr "بسيط"
 
-#. I SUGGEST: that if this is how it will actually appear on screen,
-#. my suggestion would be that we _Do Something About It!_
-#. And quick!!
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP قبل SMTP"
@@ -8712,11 +9680,11 @@ msgstr "سيسمح هذا الخيار بإتّصال POP قبل تجربة SMTP
 msgid "POP Source URI"
 msgstr "عنوان مصدر POP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:106
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "توثيق POP قبل SMTP باستخدام نقلٍ مجهول"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "توثيق POP قبل SMTP باستخدام مصدر غير pop."
 
@@ -8725,72 +9693,59 @@ msgstr "توثيق POP قبل SMTP باستخدام مصدر غير pop."
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "فشل تجميع التّعبير النّظامي: %s: %s"
 
-#: camel/camel-service.c:278
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "العنوان '%s' يحتاج مكوّن إسم مستخدم"
 
-#: camel/camel-service.c:286
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "العنوان '%s' يحتاج مكوّن مضيف"
 
-#: camel/camel-service.c:294
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "العنوان '%s' يحتاج مكوّن مسار"
 
-#: camel/camel-service.c:739
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "جاري حل: %s"
 
-#: camel/camel-service.c:770 camel/camel-service.c:894
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "فشل في البحث عن الإسم: %s"
 
-#: camel/camel-service.c:791 camel/camel-service.c:915
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "فشل البحث عن المضيف: لم يمكن إنشاء الخيط: %s"
 
-#: camel/camel-service.c:804
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "فشل البحث عن المضيف: %s: لم يعثر على المضيف"
 
-#: camel/camel-service.c:807
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "فشل البحث عن المضيف: %s: السّبب مجهول"
 
-#: camel/camel-service.c:861
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "جاري حل العنوان"
 
-#: camel/camel-service.c:930
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "فشل البحث عن المضيف: لم يعثر على المضيف"
 
-#: camel/camel-service.c:933
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "فشل البحث عن المضيف: السّبب مجهول"
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr "مزود مجلدات إعتباطية للبريد الإلكتروني"
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr "لقراءة البريد كاستعلام عن مجموعة أُخرى من المجلّدات"
-
-#: 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:525
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8799,71 +9754,270 @@ msgstr ""
 "لم يمكن إنشاء الدّليل %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:96
+#: camel/camel-smime-context.c:104
 #, c-format
 msgid "Enter security pass-phrase for `%s'"
 msgstr "أدخل جملة المرور الأمنيّة لـ`%s'"
 
-#: camel/camel-smime-context.c:501
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "لا يمكن فتح الرّسالة"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "لا يمكن إرفاق الملف %s: %s"
+
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "لا يمكن إرفاق الملف %s: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "الملف `%s' غير موجود."
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "شهادة الت_شفير:"
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "لا يمكن إنشاء قفل المجلّد على %s: %s"
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "فشل إرسال إسم المستخدم للنّادل"
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#, fuzzy
+msgid "Failed to encode data"
+msgstr "فشل التّوثيق.\n"
+
+#: camel/camel-smime-context.c:514
 msgid "Unverified"
 msgstr "لم يتم التّحقّق"
 
-#: camel/camel-smime-context.c:503
+#: camel/camel-smime-context.c:516
 msgid "Good signature"
 msgstr "توقيع جيّد"
 
-#: camel/camel-smime-context.c:505
+#: camel/camel-smime-context.c:518
 msgid "Bad signature"
 msgstr "توقيع سيّئ"
 
-#: camel/camel-smime-context.c:507
+#: camel/camel-smime-context.c:520
 msgid "Content tampered with or altered in transit"
 msgstr "حصل تلاعب أو تغيير بالمحتويات أثناء نقلها"
 
-#: camel/camel-smime-context.c:509
+#: camel/camel-smime-context.c:522
 msgid "Signing certificate not found"
 msgstr "لم يعثر على شهادة التّوقيع"
 
-#: camel/camel-smime-context.c:511
+#: camel/camel-smime-context.c:524
 msgid "Signing certificate not trusted"
 msgstr "شهادة التّوقيع غير موثوق بها"
 
-#: camel/camel-smime-context.c:513
+#: camel/camel-smime-context.c:526
 msgid "Signature algorithm unknown"
 msgstr "لوغارذم الإمضاء غير معروف"
 
-#: camel/camel-smime-context.c:515
-msgid "Siganture algorithm unsupported"
+#: camel/camel-smime-context.c:528
+#, fuzzy
+msgid "Signature algorithm unsupported"
 msgstr "لوغارذم الإمضاء غير مدعوم"
 
-#: camel/camel-smime-context.c:517
+#: camel/camel-smime-context.c:530
 msgid "Malformed signature"
 msgstr "إمضاء مشوّه"
 
-#: camel/camel-smime-context.c:519
+#: camel/camel-smime-context.c:532
 msgid "Processing error"
 msgstr "خطأ معالجة"
 
-#: camel/camel-smime-context.c:634
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "إضافة توقيع المخطوط"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "لا يمكن جلب الرّسالة %s: %s"
+
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "فشل في توقيع الشّهادة"
+
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:635
+msgid "Cannot find signature digests"
+msgstr ""
+
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "المُوقّع: %s <%s>: %s\n"
 
-#: camel/camel-store.c:217
+#: camel/camel-smime-context.c:752
+msgid "Decoder failed"
+msgstr ""
+
+#: camel/camel-smime-context.c:804
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/camel-smime-context.c:811
+msgid "Cannot find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:820
+msgid "Cannot allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:831
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "لا يمكن فتح الرّسالة"
+
+#: camel/camel-smime-context.c:837
+msgid "Cannot create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:843
+msgid "Cannot attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:849
+msgid "Cannot attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:858
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr ""
+"لا يمكن إنشاء المجلّد المحدّد:\n"
+"%s"
+
+#: camel/camel-smime-context.c:863
+msgid "Cannot add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:888
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "فشل إرسال إسم المستخدم للنّادل"
+
+#: camel/camel-smime-context.c:974
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:981
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1008
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "الأمر غير مركّب"
+
+#: camel/camel-smime-context.c:1016
+msgid "export keys: unimplemented"
+msgstr ""
+
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "لا يمكن جلب المجلّد: عمليّة غير صحيحة على هذا المخزن"
 
-#: camel/camel-store.c:273
+#: camel/camel-store.c:243
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/camel-store.c:297
 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
+#: camel/camel-store.c:325
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "المهملات"
 
-#: camel/camel-store.c:793 mail/mail-ops.c:1125
-#: ui/evolution-mail-message.xml.h:46
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "نفاية"
 
@@ -8983,7 +10137,7 @@ msgstr "إستعمال المفتاح لا يدعم توقيع الشّهادا�
 msgid "Error in application verification"
 msgstr "خطأ في تحقّق التّطبيق"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8996,11 +10150,11 @@ msgstr ""
 "البصمة:       %s\n"
 "التّوقيع:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "جيّد"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "رديء"
 
@@ -9024,7 +10178,7 @@ msgstr ""
 "هل تريد قبولها على أيّ حال؟"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9039,7 +10193,7 @@ msgstr ""
 "\n"
 "هل تريد القبول؟"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9048,7 +10202,7 @@ msgstr ""
 "مشكلة توثيق: %s\n"
 "المُصدر: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9057,7 +10211,7 @@ msgstr ""
 "نطاق شهادة رديء: %s\n"
 "المُصدر: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9066,7 +10220,7 @@ msgstr ""
 "الشّهادة منتهية الصّلاحيّة: %s\n"
 "المُصدر: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9075,60 +10229,128 @@ msgstr ""
 "قائمة إبطال الشّهادات منتهية الصّلاحيّة: %s\n"
 "المُصدر: %s"
 
-#: camel/camel-url.c:290 mail/mail-tools.c:138
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "لم يمكن إعراب عنوان URL `%s'"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "خطأ في تخزين `%s': %s"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "ليس ثمّة رسالة %s في %s"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "لا يمكن نسخ أو نقل رسالة إلى مجلّد إعتباطي"
 
-#: camel/camel-vee-store.c:278
-#, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
-
-#: camel/camel-vee-store.c:299
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "لا يمكن حذف الدّليل: %s: لا مجلّد بهذا الإسم"
 
-#: camel/camel-vee-store.c:312
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
-
-#: camel/camel-vee-store.c:320
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "لا يمكن إعادة تسمية الدّليل: %s: لا مجلّد بهذا الإسم"
 
-#: 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:2816
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "لا يمكن نسخ أو نقل رسالة إلى مجلّد إعتباطي"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "لا يمكن نسخ أو نقل رسالة إلى مجلّد إعتباطي"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
+msgid "Checking for new mail"
+msgstr "جاري التّفقّد عن وصول بريد جديد"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
+msgid "Check for new messages in all folders"
+msgstr "جاري التّفقّد عن وصول رسائل جديدة في كل المجلّدات"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#, fuzzy
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "تطبيق المصفات على الرّسائل الجديدة في صندوق الوارد على هذا النّادل"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Automatically synchronize remote mail locally"
+msgstr "مزامنة البريد عن بعد تلقائيّا محلّيّاً"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#, fuzzy
+msgid "Address Book And Calendar"
+msgstr "إضافة رزنامةً جديدة"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
+msgid "Novell GroupWise"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
+msgid "For accessing Novell Groupwise servers"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+msgid "Password"
+msgstr "كلمة السّر"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/imap/camel-imap-provider.c:95
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "سيتّصل·هذا الخيار بنادل IMAP باستخدام كلمة سر نصٍّ بسيط."
+
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
+#, fuzzy
+msgid "Checklist"
+msgstr "سرد"
+
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "أُلغيت العملية"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2819
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "قطع النّادل الإتّصال بشكلٍ غير متوقّع: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "خطأ مجهول"
+
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
@@ -9137,62 +10359,55 @@ msgstr ""
 "تنبيه من نادل IMAP %s@%s:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "إستجابة غير متوقّعة من نادل IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "إستجابة النّادل انتهت مبكّراً."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "إستجابة نادل IMAP لم تحتوي معلومات %s"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "استجابة موافقة غير متوقّعة من نادل IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "لم يمكن إنشاء الدّليل %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "لم يمكن تحميل الملخّص لـ %s"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "تم تدمير المجلّد و إعادة إنشاءه على النّادل."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "جاري المسح عن رسائل مغيّرة"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "لم يمكن إستلام الرّسالة: %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9201,24 +10416,41 @@ msgstr ""
 "لا يمكن إحضار الرّسالة: %s\n"
 "  %s"
 
-#: 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
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "لا رسالة بهذا الإسم"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "هذه الرّسالة غير متوفّرة حاليّاً"
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "جاري إحضار معلومات التّلخيص للرّسائل الجديدة"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "لم يمكن إيجاد متن الرّسالة في استجابة FETCH."
 
@@ -9241,38 +10473,39 @@ msgid "Failed to cache %s: %s"
 msgstr "فشل وضع %s في الذّاكرة المخبّأة: %s"
 
 #: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for New Mail"
+msgstr "مراجعة عن بريد جديد"
+
+#: camel/providers/imap/camel-imap-provider.c:48
 msgid "Connection to Server"
 msgstr "الإتّصال بالنّادل"
 
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Use custom command to connect to server"
 msgstr "إستعمال أوامر مخصّصة للإتّصال بالنّادل"
 
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:52
 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:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "المجلّدات"
 
 #: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
 msgid "Show only subscribed folders"
 msgstr "إظهار المجلّدات المشترك بها فقط"
 
 #: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
 msgid "Override server-supplied folder namespace"
 msgstr "تنميق مجال المجلّد المجرّد المزوّد من النّادل"
 
 #: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
 msgid "Namespace"
 msgstr "المجال المجرّد"
 
@@ -9281,108 +10514,109 @@ msgid "Apply filters to new messages in INBOX on this server"
 msgstr "تطبيق المصفات على الرّسائل الجديدة في صندوق الوارد على هذا النّادل"
 
 #: camel/providers/imap/camel-imap-provider.c:66
-msgid "Automatically synchronize remote mail locally"
-msgstr "مزامنة البريد عن بعد تلقائيّا محلّيّاً"
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "جاري التّفقّد عن وصول رسائل جديدة في كل المجلّدات"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "جاري التّفقّد عن وصول رسائل جديدة في كل المجلّدات"
 
-#: camel/providers/imap/camel-imap-provider.c:72
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:74
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "لقراءة و تخزين البريد على نوادل IMAP."
 
-#: 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 "كلمة السّر"
-
-#: 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 باستخدام كلمة سر نصٍّ بسيط."
-
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
 #, c-format
 msgid "IMAP server %s"
 msgstr "نادل IMAP %s"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "خدمة IMAP لـ %s على %s"
 
-#: 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/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
 #: 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 (المنفذ %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
-#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL غير متوفّر"
 
-#: 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
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "تم إلغاء الإتّصال"
 
-#: camel/providers/imap/camel-imap-store.c:665
-#: camel/providers/imap/camel-imap-store.c:696
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "فشل الاتّصال بنادل IMAP %s بالنسق الآمن: %s"
 
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/pop3/camel-pop3-store.c:230
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "إمتداد SSL/TLS غير مدعوم."
 
-#: camel/providers/imap/camel-imap-store.c:697
-#: camel/providers/pop3/camel-pop3-store.c:271
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "فشلت مفاوضات SSL"
 
-#: camel/providers/imap/camel-imap-store.c:834
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "لم يمكن الاتّصال باستخدام الأمر \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "نادل IMAP %s لا يدعم نوع التّوثّق المطلوب %s"
 
-#: camel/providers/imap/camel-imap-store.c:1257
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "لا يوجد دعم لنوع التّوثّق %s"
 
-#: camel/providers/imap/camel-imap-store.c:1280
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s الرجاء إدخال كلمة سر IMAP لـ%s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1294
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "إنّك لم تُدخل كلمة سر."
 
-#: camel/providers/imap/camel-imap-store.c:1323
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9393,25 +10627,277 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1670
-#: camel/providers/imap/camel-imap-store.c:1812
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "لا مجلّد بهذا الإسم %s"
 
-#: camel/providers/imap/camel-imap-store.c:2013
-#, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "إسم المجلّد \"%s\" غير سليم لأنّه يحتوي الحرف \"%c\""
 
-#: camel/providers/imap/camel-imap-store.c:2025
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "لا يسمح للمجلّد الأب أن يحتوي مجلّدات فرعيّة"
+
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "مجلّد أب مجهول: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2061
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "لا يسمح للمجلّد الأب أن يحتوي مجلّدات فرعيّة"
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "فشل التّوثيق مع نادل POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "إستجابة غير متوقّعة من نادل IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "إستجابة غير متوقّعة من نادل IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "قطع النّادل الإتّصال بشكلٍ غير متوقّع: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "لم يمكن مزامنة مجلّد الحوض: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "لا يمكن جلب الدّليل: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "لا يمكن إلحاق الرّسالة بمجلّد mh: %s %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "لا يمكن إلحاق الرّسالة بمجلّد mh: %s %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4·"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "لقراءة و تخزين البريد على نوادل IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "سيتّصل·هذا الخيار بنادل IMAP باستخدام كلمة سر نصٍّ بسيط."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "فشل الاتّصال بنادل IMAP %s بالنسق الآمن: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "لا يمكن الإتّصال بنادل POP %s: لا دعم لآليّة التّوثيق المطلوبة"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s الرجاء إدخال كلمة سر IMAP لـ%s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "فشل التّوثيق مع نادل POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "لا يمكن جلب الدّليل: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "لا يمكن حذف الدّليل: %s: لا مجلّد بهذا الإسم"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: لا مجلّد بهذا الإسم"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "لم يمكن إعادة تسمية المجلّد %s إلى %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "الأمر:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "لا يمكن حذف المجلّد: %s: عمليّة غير صالحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: عمليّة غير صحيحة"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "إستجابة غير متوقّعة من نادل IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "لم توفّر أيّة معلومات"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "قطع النّادل الإتّصال بشكلٍ غير متوقّع: %s"
 
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
@@ -9430,11 +10916,12 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "عميل IMAP 4(،1) تجريبي\n"
-"هذه الشفرة غير مختبرة و غير مدعومة، يستحسن أن تستعمل IMAP الاعتيادي عوضاً عنها.\n"
+"هذه الشفرة غير مختبرة و غير مدعومة، يستحسن أن تستعمل IMAP الاعتيادي عوضاً "
+"عنها.\n"
 "\n"
 "!!!لا تستعملها للبريد الإلكتروني الإنتاجي!!!\n"
 
-#: camel/providers/imapp/camel-imapp-store.c:333
+#: camel/providers/imapp/camel-imapp-store.c:328
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "لم يمكن الإتّصال بنادل POP على %s"
@@ -9444,20 +10931,20 @@ msgid "Index message body data"
 msgstr "بيانات فهرسة متن الرّسالة"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:382
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:386
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "صندوق البريد:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:393
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -9483,8 +10970,8 @@ msgid ""
 "For retrieving (moving) local mail from standard mbox formated spools into "
 "folders managed by Evolution."
 msgstr ""
-"لسحب (نقل) البريد المحلّي من أحواض صناديق البريد mbox القياسيّة إلى مجلدات "
-"تحت إدارة إيفُليوشِن."
+"لسحب (نقل) البريد المحلّي من أحواض صناديق البريد mbox القياسيّة إلى مجلدات تحت "
+"إدارة إيفُليوشِن."
 
 #: camel/providers/local/camel-local-provider.c:77
 #: camel/providers/local/camel-local-provider.c:94
@@ -9515,152 +11002,173 @@ msgstr ""
 "لقراءة و تخزين البريد المحلّي في ملفّات أحواض صناديق بريد mbox قياسيّة خارجيّة.\n"
 "يمكن أيضاً استخدامه لقراءة شجرة مجلّدات بتهيئة Elm أو Pine أو Mutt."
 
-#: 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-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "جذر المخزن %s ليس مساراً مطلقاً"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "جذر المخزن %s ليس دليلاً اعتياديّاً"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "لا يمكن جلب الدّليل: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "المخازن المحلّيّة ليس لها صندوق وارد"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "ملف البريد المحلّي %s"
 
-#: camel/providers/local/camel-local-store.c:307
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 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:475
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "لم يمكن إعادة تسمية '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:423
+#: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "لم يمكن حذف ملف ملخّص المجلّد `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:433
+#: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "لم يمكن حذف ملف فهرس المجلّد `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-store.c:456
+#: camel/providers/local/camel-mbox-store.c:320
+#, fuzzy, c-format
+msgid "Could not delete folder meta file `%s': %s"
+msgstr "لم يمكن حذف ملف ملخّص المجلّد `%s': %s"
+
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "لم يمكن حفظ الملخّص: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "لم يمكن إضافة الرّسالة للملخّص: سبب مجهول"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "صندوق البريد الداخل"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "تم إلغاء إلحاق رسالة maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "لم يمكن إلحاق الرّسالة بدليل maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
-msgid "Invalid message contents"
-msgstr "محتويات الرسالة غير سليمة"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
 #, c-format
 msgid ""
-"Could not open folder `%s':\n"
-"%s"
+"Cannot get message: %s from folder %s\n"
+"  %s"
 msgstr ""
-"لم يمكن فتح المجلّد `%s':\n"
-"%s"
+"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
+"  %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: 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
-msgid "Folder `%s' does not exist."
+#: camel/providers/local/camel-maildir-folder.c:267
+msgid "Invalid message contents"
+msgstr "محتويات الرسالة غير سليمة"
+
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mh-store.c:204
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "لا يمكن جلب الدّليل: %s: %s"
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mh-store.c:211
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "الملف `%s' غير موجود."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"لم يمكن إنشاء المجلّد `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:121
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
+msgstr "لا يمكن إنشاء المجلّد `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:136
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ليس مجلّد maildir."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "لم يمكن حذف المجلّد `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ليس دليل maildir"
 
-#: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:355
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "لم يمكن مسح المجلّد `%s': %s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "لم يمكن فتح مسار دليل maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr "جاري تفقّد تجانس المجلّد"
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "جاري تفقّد رسائل جديدة"
 
-#: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-maildir-summary.c:735
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "جاري خزن المجلّد"
@@ -9685,170 +11193,144 @@ msgstr "ألغي إلحاق البريد"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "لا يمكن إلحاق الرّسالة بملف صندوق البريد: %s: %s"
 
-#: 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 ""
-"لا يمكن جلب الرّسالة: %s من المجلّد %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "يبدو هذا المجلّد فاسداً ز لن يمكن إسترجاعه."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "فشل بناء الرّسالة: قد يكون صندوق البريد تالفاً؟"
 
-#: camel/providers/local/camel-mbox-store.c:149
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"لم يمكن فتح الملف `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
+msgstr "لا يمكن إنشاء مجلّد بهذا الإسم."
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"لم يمكن إنشاء المجلّد `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
 
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"لم يمكن إنشاء الملف `%s':\n"
+"لم يمكن حذف المجلّد `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "%s ليس ملفّاً اعتياديّا"
 
-#: 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"
-"%s"
-msgstr ""
-"لم يمكن حذف المجلّد `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "المجلّد `%s' ليس فارغاً. لم يحذفه."
 
-#: camel/providers/local/camel-mbox-store.c:311
-msgid "Cannot create a folder by this name."
-msgstr "لا يمكن إنشاء مجلّد بهذا الإسم."
-
-#: camel/providers/local/camel-mbox-store.c:324
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "لا يمكن إنشاء الدّليل `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:338
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "لا يمكن إنشاء المجلّد `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:340
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "المجلّد موجود أصلاً"
 
-#: camel/providers/local/camel-mbox-store.c:409
-#, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "لم يمكن إعادة تسمية %s إلى %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:428
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "إسم المجلّد الجديد هذا غير قانوني."
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-store.c:485
+#, fuzzy, c-format
+msgid "Could not rename `%s': `%s': %s"
+msgstr "لم يمكن إعادة تسمية '%s': %s"
+
+#: camel/providers/local/camel-mbox-store.c:560
+#, fuzzy, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "لم يمكن إعادة تسمية %s إلى %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "لم يمكن فتح المجلّد %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "خطأ محلّل بريد قاتل قرب الموقع %ld في المجلّد %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "لا يمكن تفقّد المجلّد: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "لم يمكن فتح الملف %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "لا يمكن فتح صندوق البريد المؤقّت: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "لم يمكن إغلاق المجلّد المصدر %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "لم يمكن إغلاق المجلّد المؤقّت: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560 mail/em-folder-tree.c:1285
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "لم يمكن إعادة تسمية المجلّد: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "عدم تطابق بين الملخّص و المجلّد، حتّى بعد المزامنة"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "خطأ مجهول: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "لم يمكن خزن المجلّد: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "خطأ أثناء الكتابة لصندوق البريد المؤقّت: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "فشلت الكتابة  لصندوق البريد المؤقّت: %s: %s"
@@ -9862,10 +11344,17 @@ msgstr "ألغي إلحاق رسالة MH"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "لا يمكن إلحاق الرّسالة بمجلّد mh: %s %s"
 
-#: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' ليس دليلاً."
+#: camel/providers/local/camel-mh-store.c:219
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"لم يمكن إنشاء المجلّد `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mh-store.c:231
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "لا يمكن جلب الدّليل: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -9887,6 +11376,29 @@ msgstr "الحوض `%s' ليس ملفّاً أو دليلاً اعتياديّا
 msgid "Folder `%s/%s' does not exist."
 msgstr "الدّليل `%s/%s' غير موجود."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"لم يمكن فتح المجلّد `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "الملف `%s' غير موجود."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"لم يمكن إنشاء المجلّد `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -9938,6 +11450,7 @@ msgstr ""
 "قد يكون الملف معطوباً، حفظت النّسخة في `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "الرجاء إدخال كلمة سر NNTP لـ %s@%s"
@@ -9954,13 +11467,10 @@ msgstr "فشل إرسال إسم المستخدم للنّادل"
 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 "خطأ داخلي: هويّة المستخدم ذات تهيئة غير سليمة: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -9969,7 +11479,9 @@ msgstr "خطأ داخلي: هويّة المستخدم ذات تهيئة غير
 msgid "Cannot get message %s: %s"
 msgstr "لا يمكن جلب الرّسالة %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:159
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
 #: camel/providers/pop3/camel-pop3-folder.c:262
 #: camel/providers/pop3/camel-pop3-folder.c:430
 #: camel/providers/pop3/camel-pop3-folder.c:491
@@ -9977,82 +11489,167 @@ msgstr "لا يمكن جلب الرّسالة %s: %s"
 msgid "User cancelled"
 msgstr "ألغي المستخدم"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr "خطأ داخلي: هويّة المستخدم ذات تهيئة غير سليمة: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "فشلت العمليّة: %s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:393
+msgid "You cannot post NNTP messages while working offline!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:404
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "لم يمكن نسخ الرّسائل إلى مجلّد صندوق البريد المؤقّت: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "لم يمكن جلب قائمة المجموعات من النّادل."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "لا يمكن تحميل ملف قائمة المجموعة لـ %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "لا يمكن حفظ ملف قائمة المجموعة لـ %s: %s"
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
 msgstr "أخبار USENET"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr "هذا موفِّر للقراءة من و الكتابة إلى مجموعات أخبار USENET."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr "سيوثّق هذا الخيار مع نادل NNTP باستخدام كلمة سر نصٍّ بسيط."
+
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "فشل أمر NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "لم يمكن قراءة التّحيّة من %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "أرجع نادل NNTP %s رمز الخطأ %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "أخبار USENET عبر %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:777
+#, fuzzy, c-format
 msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
 msgstr ""
-"سيوثّق هذا الخيار مع نادل NNTP باستخدام كلمة سر نصٍّ بسيط."
+"خطأ أثناء قراءة الملف %s:\n"
+"%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
-#, c-format
-msgid "No such folder: %s"
-msgstr "لا مجلّد بهذا الإسم: %s"
+#: camel/providers/nntp/camel-nntp-store.c:872
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
-#, c-format
-msgid "Could not get group: %s"
-msgstr "لم يمكن جلب المجموعة: %s"
+#: camel/providers/nntp/camel-nntp-store.c:904
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:929
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:937
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "لم يمكن إعادة تسمية المجلّد %s إلى %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:945
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "مطلوبٌ التّوثيق"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "فشل التّوثيق مع نادل POP %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "لا مراسَلين"
+
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "فشل أمر NNTP: %s"
+msgid "No such folder: %s"
+msgstr "لا مجلّد بهذا الإسم: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: جاري مسح الرّسائل الجديدة"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "إستجابة نادل مجهولة: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "إستجابة غير متوقّعة من نادل IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "إستجابة غير متوقّعة من GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "إستعمال الإلغاء"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "فشلت العمليّة: %s"
@@ -10082,7 +11679,8 @@ msgstr "لا رسالة بهويّة المستخدم %s"
 msgid "Retrieving POP message %d"
 msgstr "جاري جلب رسالة POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
@@ -10099,7 +11697,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:84
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -10112,8 +11710,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 ""
-"سيتصل هذا الخيار بنادل POP بإستخدام كلمة سر بسيطة. "
-"هذا هو الخيار الوحيد المدعوم من قبل الكثير من نوادل POP."
+"سيتصل هذا الخيار بنادل POP بإستخدام كلمة سر بسيطة. هذا هو الخيار الوحيد "
+"المدعوم من قبل الكثير من نوادل POP."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
@@ -10121,57 +11719,61 @@ msgid ""
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
-"سيتصل هذا الخيار بنادل POP مستخدماً كلمة سر مشفّرة ببرتوكول APOP. "
-"قد لا يَصلح هذا لكل المستخدمين حتّى على النّوادل التي تزعم دعمه."
+"سيتصل هذا الخيار بنادل POP مستخدماً كلمة سر مشفّرة ببرتوكول APOP. قد لا يَصلح "
+"هذا لكل المستخدمين حتّى على النّوادل التي تزعم دعمه."
 
-#: camel/providers/pop3/camel-pop3-store.c:197
+#: camel/providers/pop3/camel-pop3-store.c:195
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "تعذّر الإتّصال بنادل POP %s (المنفذ %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:229
-#: camel/providers/pop3/camel-pop3-store.c:258
-#: camel/providers/pop3/camel-pop3-store.c:270
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "فشل التّوثيق مع نادل POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "فشل الإتّصال بنادل POP %s بالنّسق الآمن: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "لم يمكن الإتّصال بنادل POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
-msgstr ""
-"لا يمكن الإتّصال بنادل POP %s: لا دعم لآليّة التّوثيق المطلوبة"
+msgstr "لا يمكن الإتّصال بنادل POP %s: لا دعم لآليّة التّوثيق المطلوبة"
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "فشل تسجيل دخول SASL `%s' لنادل POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "لا يمكن تسجيل الدّخول لنادل POP %s: خطأ برتوكول SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "فشل التّوثيق مع نادل POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:478
-#, c-format
-msgid "%sPlease enter the POP password for %s@%s"
+#: camel/providers/pop3/camel-pop3-store.c:485
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s فضلاً أدخل كلمة سر POP ل%s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:533
 #: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -10180,13 +11782,22 @@ msgstr ""
 "تعذّر الإتّصال بنادل POP %s.\n"
 "خطأ أثناء إرسال كلمة السّر: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:639
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"تعذّر الإتّصال بنادل POP %s.\n"
+"خطأ أثناء إرسال كلمة السّر: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "لا مجلّد بهذا الإسم `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -10194,8 +11805,7 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr ""
-"لإيصال البريد بتمريره لبرنامج \"sendmail\" على النّظام المحلّي."
+msgstr "لإيصال البريد بتمريره لبرنامج \"sendmail\" على النّظام المحلّي."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -10239,12 +11849,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "إيصال البريد عبر برنامج sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "لإيصال البريد عن طريق الاتّصال بمحور بريدي بعيد باستخدام SMTP.\n"
 
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -10362,13 +11973,14 @@ msgid "server does not appear to support SSL"
 msgstr "يبدو أن النّادل لا يدعم SSL"
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr "انتهت مهلة طلب STARTTLS: %s"
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "فشل أمر IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr "خطأ في استجابة STARTTLS"
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "فشل أمر IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -10376,8 +11988,8 @@ msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "نادل SMTP %s لا يدعم فئة التّوثّق المطلوبة %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
-#, c-format
-msgid "%sPlease enter the SMTP password for %s@%s"
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%s الرجاء إدخال كلمة سر SMTP لـ%s@%s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
@@ -10391,44 +12003,50 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "نادل SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "ايصال بريد SMTP عبر %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "لا يمكن إرسال الرّسالة: لم يتم تعريف أيّة مستلِمين."
+
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "لا يمكن إرسال الرّسالة: عنوان المرسِل ليس سليماً."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:632
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "جاري إرسال الرّسالة"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "لا يمكن إرسال الرّسالة: لم يتم تعريف أيّة مستلِمين."
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "لا يمكن إرسال الرّسالة: مستلم أو أكثر غير سليمين"
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "ترحيب SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:929
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr "انتهت مهلة طلب HELO: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:934
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "فشل أمر IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:951
-msgid "HELO response error"
-msgstr "خطأ في استجابة HELO"
+#, fuzzy
+msgid "HELO command failed"
+msgstr "فشل أمر IMAP: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
@@ -10439,116 +12057,114 @@ msgid "Error creating SASL authentication object."
 msgstr "خطأ أثناء إنشاء جسم توثّق SASL."
 
 #: 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: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1051
+#, fuzzy, c-format
+msgid "AUTH command failed: %s"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1061
-msgid "AUTH request failed."
-msgstr "فشل طلب التّوثّق."
+#: camel/providers/smtp/camel-smtp-transport.c:1057
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1122
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "إستجابة رديئة من النّادل للتّوثيق.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1147
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1144
+#, fuzzy, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "انتهت مهلة طلب MAILFROM: %s: لم يرسل البريد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1167
-msgid "MAIL FROM response error"
-msgstr "خطأ في استجابة MAILFROM"
+#: camel/providers/smtp/camel-smtp-transport.c:1161
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1191
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1185
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "انتهت مهلة طلب RCPTTO: %s: لم يرسل البريد"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "فشل RCPTTO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
+#, fuzzy, c-format
+msgid "DATA command failed: %s: mail not sent"
 msgstr "انتهت مهلة طلب DATA: %s: لم يرسل البريد"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1272
-msgid "DATA response error"
-msgstr "خطأ في استجابة DATA"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1313
+#: camel/providers/smtp/camel-smtp-transport.c:1260
 #: camel/providers/smtp/camel-smtp-transport.c:1336
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr "انتهت مهلة إرسال DATA: نهاية الرّسالة: %s: لم يرسل البريد"
-
-#: camel/providers/smtp/camel-smtp-transport.c:1356
-msgid "DATA termination response error"
-msgstr "خطأ في استجابة نهاية DATA"
+#, fuzzy
+msgid "DATA command failed"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr "انتهت مهلة طلب RSET: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1359
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
-msgid "RSET response error"
-msgstr "خطأ في استجابة RSET"
+#: camel/providers/smtp/camel-smtp-transport.c:1375
+#, fuzzy
+msgid "RSET command failed"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr "انتهت مهلة طلب QUIT: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1398
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "فشل أمر IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
-msgid "QUIT response error"
-msgstr "خطأ في استجابة QUIT"
+#: camel/providers/smtp/camel-smtp-transport.c:1412
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "فشل أمر IMAP: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fك"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fم"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fغ"
 
-#: composer/e-msg-composer-attachment-bar.c:300 mail/em-utils.c:1380
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "مُرفق"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "حذف العناصر المنتقاة من قائمة المُرفقات"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "إضافة مُرفق..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "إرفاق ملف بالرّسالة"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "لا يمكن إرفاق الملف %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "لا يمكن إرفاق الملف %s: ليس ملفّاً اعتياديّاً"
@@ -10566,15 +12182,20 @@ msgid "MIME type:"
 msgstr "نوع MIME:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
 msgid "Suggest automatic display of attachment"
 msgstr "إقتراح العرض التّلقائي للمُرفق"
 
-#: 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:512
+msgid "Posting destination"
+msgstr "وجهة النشر"
+
+#: composer/e-msg-composer-hdrs.c:513
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "إختيار مجلّد لنشر الرّسالة فيه."
 
-#: composer/e-msg-composer-hdrs.c:480
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "أُنقر هنا لدفتر العناوين"
 
@@ -10585,224 +12206,304 @@ msgstr "أُنقر هنا لدفتر العناوين"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:510
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "رد-على:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:516
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "من:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:522
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "الموضوع:"
 
-#: composer/e-msg-composer-hdrs.c:531
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "إلى:"
 
-#: composer/e-msg-composer-hdrs.c:532
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "إدخال مستلِميْ الرّسالة"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "نسخة كربونيّة:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "إدخال العناوين التي ستستلم نسخةً كربونيّة من الرّسالة"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "نسخة كربونيّة مخفيّة:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr ""
-"إدخال العناوين التي ستستلم نسخةً كربونيّة من الرّسالة "
-"دون الظّهور في قائمة مستلِميْ الرّسالة."
+"إدخال العناوين التي ستستلم نسخةً كربونيّة من الرّسالة دون الظّهور في قائمة "
+"مستلِميْ الرّسالة."
 
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:547
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr "النشر في:"
 
-#: 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-hdrs.c:619
+#, fuzzy
+msgid "Click here to select folders to post to"
+msgstr "<أُنقر هنا لإنتقاء مجلّد>"
 
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr "إرفاق الملف (أو الملفّات)"
 
-#: composer/e-msg-composer.c:651
-msgid "Cannot sign outgoing message: No signing certificate set for from account"
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "لا يمكن توقيع الرّسالة الخارجة: لا توجد شهادة توقيع لحساب المرسِل"
 
-#: composer/e-msg-composer.c:657
+#: composer/e-msg-composer.c:711
+#, fuzzy
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
+"Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr ""
-"لا يمكن تشفير الرّسالة الخارجة: لا توجد شهادة تشفير معيّنة لحساب المرسِل"
+msgstr "لا يمكن تشفير الرّسالة الخارجة: لا توجد شهادة تشفير معيّنة لحساب المرسِل"
 
-#: composer/e-msg-composer.c:788
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"خطأ أثناء قراءة الملف %s:\n"
-"%s"
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "لا يمكن فتح الملف"
 
-#: composer/e-msg-composer.c:1153
-msgid "File exists, overwrite?"
-msgstr "الملف موجود أصلاً، هل أنمقه؟"
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "لا يمكن جلب الرّسالة من المحرّر"
 
-#: composer/e-msg-composer.c:1164 composer/e-msg-composer.c:1180
-#, c-format
-msgid "Error saving file: %s"
-msgstr "خطأ أثناء حفظ الملف: %s"
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "رسائل متعدّدة"
 
-#: composer/e-msg-composer.c:1204
-#, c-format
-msgid "Error loading file: %s"
-msgstr "خطأ أثناء تحميل الملف: %s"
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "فتح ملف"
 
-#: composer/e-msg-composer.c:1242
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "خطأ أثناء النّفاذ للملف: %s"
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "مولّد آليّاً"
 
-#: composer/e-msg-composer.c:1250
-msgid "Unable to retrieve message from editor"
-msgstr "لا يمكن جلب الرّسالة من المحرّر"
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "التّوقيع:"
 
-#: composer/e-msg-composer.c:1257
+#: composer/e-msg-composer.c:2298
 #, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
-"لا يمكن البحث على الملف: %s\n"
-"%s"
 
-#: composer/e-msg-composer.c:1264
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
-"لا يمكن بتر الملف: %s\n"
-"%s"
 
-#: composer/e-msg-composer.c:1273
-#, c-format
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "تأليف رسالة"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "فشل وضع الرّسالة %s في الذّاكرة المخبّأة: %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "إرفاق الرّسالة الأصليّة"
+msgstr[1] "إرفاق الرّسالة الأصليّة"
+
+#: composer/e-msg-composer.c:4332
 msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(المؤلّف يحوي متن رسالة غير نصّي، ما لا يمكن تحريره.)<b>"
+
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "إرفاق ملف بالرّسالة"
+
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"لا يمكن نسخ واصف الملف: %s\n"
-"%s"
 
-#: composer/e-msg-composer.c:1282
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"خطأ أثناء الحفظ الآلي للرّسالة: %s\n"
-" %s"
 
-#: composer/e-msg-composer.c:1386
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
-"Would you like to try to recover them?"
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
-"عثر زيميان إيفُليوشِن على ملفّات من جلسةٍ سابقة غير محفوظة.\n"
-"هل تود محاولة استعادتها؟"
 
-#: composer/e-msg-composer.c:1550
-#, c-format
+#. mail-composer:attach-nomessages primary
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "لا يمكن جلب الرّسالة من المحرّر"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+msgid "Unfinished messages found"
+msgstr ""
+
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "هل تريد حفظ التّغييرات؟"
+
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.h:21
+#, fuzzy
+msgid "Don't Recover"
+msgstr "عدم الحذف"
+
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Recover"
+msgstr "حذف"
+
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:24
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
-"لم ترسل الرّسالة \"%s\".\n"
-"\n"
-"هل تود حفظ تغييراتك؟"
 
-#: composer/e-msg-composer.c:1559
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:26
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "خطأ أثناء حفظ المختصرات."
+
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "تنبيه: رسالة معدّلة"
 
-#: composer/e-msg-composer.c:1592
-msgid "Open file"
-msgstr "فتح ملف"
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:30
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "هل تريد فعلاً حذف هذا الموعد الغير مسمّى؟"
 
-#: composer/e-msg-composer.c:2011
-msgid "Signature:"
-msgstr "التّوقيع:"
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:32
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
 
-#: composer/e-msg-composer.c:2051 mail/mail-account-gui.c:1260
-msgid "Autogenerated"
-msgstr "مولّد آليّاً"
+#: composer/mail-composer-errors.xml.h:34
+#, fuzzy
+msgid "Save Message"
+msgstr "حفظ الرّسالة..."
 
-#: composer/e-msg-composer.c:2231 composer/e-msg-composer.c:2929
-#: composer/e-msg-composer.c:2930
-msgid "Compose a message"
-msgstr "تأليف رسالة"
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:36
+#, fuzzy
+msgid "Could not create message."
+msgstr "لم يمكن إنشاء الأنبوب: %s"
 
-#: composer/e-msg-composer.c:2961
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"{0}\", you may need to select different mail options."
+msgstr ""
+
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:40
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "لم يمكن فتح المجلّد المشترك: %s."
+
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:44
+msgid "All accounts have been removed."
+msgstr ""
+
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "You need to configure an account before you can compose mail."
+msgstr "يجب أن تُعدّ حساباً قبل أن تتمكّن من كتابة البريد."
+
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "لم يمكن إنشاء الأنبوب: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
 msgstr ""
 "لا يمكن إنشاء نافذة التّأليف:\n"
 "لم يمكن تفعيل قطعة انتقاء العناوين."
 
-#: composer/e-msg-composer.c:2991
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "لم يمكن إنشاء نافذة التّأليف:\n"
 "لم يمكن تفعيل مكوّن تحرير HTML.\n"
 "الرجاء التأكّد من أن الإصدارة الصّحيحة\n"
 "من gtkhtml و libgtkhtml مثبّتة لديك.\n"
 
-#: composer/e-msg-composer.c:3061
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"لم يمكن إنشاء نافذة التّأليف:\n"
-"لم يمكن تفعيل مكوّن تحرير HTML."
-
-#: 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 Ximian Evolution Groupware Suite"
 msgstr "طقم برامج مجموعات زيميان إيفُليوشِن"
@@ -10811,54 +12512,14 @@ msgstr "طقم برامج مجموعات زيميان إيفُليوشِن"
 msgid "Ximian Evolution (Unstable)"
 msgstr "زيميان إيفُليوشِن (غير مستقر)"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "بطاقة عنوان"
 
-#: data/evolution.keys.in.h:2
+#: data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "معلومات الرزنامة"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "المتن يحتوي"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "المتن لا يحتوي"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "المتن أو الموضوع يحتوي"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "الرّسالة تحتوي"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "المستلمون يحتوون"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "المرسِل يحتوي"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "الموضوع يحتوي"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "الموضوع لا يحتوي"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr "بريد مهم (محلّي)"
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr "بريد غير مقروء (محلّي)"
-
 #: designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -10925,7 +12586,8 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>تخول لك هذه الصّفحة الإختيار بين ما إذا كنت تريد أن تبلّغ بواسطة وصل عن قراءة رسالة لك\n"
+"<small>تخول لك هذه الصّفحة الإختيار بين ما إذا كنت تريد أن تبلّغ بواسطة وصل عن "
+"قراءة رسالة لك\n"
 "و تحديد ما يفترض لإيفُليوشِن القيام به عند طلب شخص وصلا منك.</small>"
 
 #: designs/read_receipts/read.glade.h:6
@@ -10957,9 +12619,10 @@ msgid ""
 "When you receive an email with a read receipt request, what should Evolution "
 "do?"
 msgstr ""
-"عندما تستلم بريداً إلكترونيّاً مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض إيفُليوشِن فعله؟"
+"عندما تستلم بريداً إلكترونيّاً مع طلبٍ لوصل إفادةٍ بالقراءة، ما الذي يفترض "
+"إيفُليوشِن فعله؟"
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10967,15 +12630,16 @@ msgstr ""
 "هناك ملف موجود بهذا الاسم أصلاً.\n"
 "هل تريد تنميقه؟"
 
-#: e-util/e-dialog-utils.c:249
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "تنميق الملف؟"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "تذكر كلمة السّر هذه"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "تذكر كلمة السّر هذه لمذكر الجلسة"
 
@@ -11058,13 +12722,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:1416 widgets/misc/e-dateedit.c:1641
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 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:1413 widgets/misc/e-dateedit.c:1638
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -11073,83 +12737,65 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "منذ ثانية"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "منذ %d ثانية"
+msgid_plural "%d seconds ago"
+msgstr[0] "منذ ثانية"
+msgstr[1] "منذ ثانية"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "منذ دقيقة"
-
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "منذ %d دقيقة"
+msgid_plural "%d minutes ago"
+msgstr[0] "منذ دقيقة"
+msgstr[1] "منذ دقيقة"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "منذ ساعة"
+msgid_plural "%d hours ago"
+msgstr[0] "منذ ساعة"
+msgstr[1] "منذ ساعة"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "منذ %d ساعة"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "منذ يوم"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "منذ %d يوم"
+msgid_plural "%d days ago"
+msgstr[0] "منذ يوم"
+msgstr[1] "منذ يوم"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "منذ أسبوع"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "منذ %d أسبوع"
+msgid_plural "%d weeks ago"
+msgstr[0] "منذ أسبوع"
+msgstr[1] "منذ أسبوع"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "منذ شهر"
+msgid_plural "%d months ago"
+msgstr[0] "منذ شهر"
+msgstr[1] "منذ شهر"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "منذ %d شهر"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "منذ سنة"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "منذ %d سنة"
-
-#: filter/filter-datespec.c:176
-msgid "You must choose a date."
-msgstr "يجب أن تختار تاريخاً."
+msgid_plural "%d years ago"
+msgstr[0] "منذ سنة"
+msgstr[1] "منذ سنة"
 
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<أنقر هنا لاختيار تاريخ>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "الآن"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
@@ -11157,124 +12803,158 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "إختيار وقت للمقارنة به"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
-msgstr "قواعد التصفية"
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+#, fuzzy
+msgid "Missing date."
+msgstr "تحديث إجتماع"
+
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "يجب أن تختار تاريخاً."
 
-#: filter/filter-file.c:166
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+#, fuzzy
+msgid "Missing file name."
+msgstr "إ_سم مميّز:"
+
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "يجب تحديد اسم ملف."
 
-#: filter/filter-file.c:184
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "الملف '%s' غير موجود أو أنّه ليس ملفّاً اعتياديّاً."
 
-#: filter/filter-file.c:299
-msgid "Choose a file"
-msgstr "إختيار ملف"
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:14
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"خطأ في التّعبير النّظامي '%s':\n"
+"%s"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "Then"
-msgstr "ثم"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:16
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
 
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr "يجب تحديد مجلّد."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#, fuzzy
+msgid "Missing name."
+msgstr "مهمّة"
 
-#: filter/filter-folder.c:242 filter/vfolder-rule.c:459
-#: mail/mail-account-gui.c:1099
-msgid "Select Folder"
-msgstr "انتقاء المجلّد"
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:20
+msgid "You must name this filter."
+msgstr "يجب أن تسمّي هذه المصفاة."
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:22
+msgid "Name \"{0}\" already used."
 msgstr ""
-"خطأ في التّعبير النّظامي '%s':\n"
-"%s"
 
-#: 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
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:24
+#, fuzzy
+msgid "Please choose another name."
+msgstr "الرجاء اختيار نادل."
+
+#: filter/filter-file.c:288
+msgid "Choose a file"
+msgstr "إختيار ملف"
+
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "مهم"
 
 #. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:66
-#: mail/mail-config.glade.h:123 shell/e-config-upgrade.c:1457
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "للقيام به"
 
 #. blue
-#: filter/filter-label.c:125 mail/mail-config.c:67 mail/mail-config.glade.h:68
-#: shell/e-config-upgrade.c:1458
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "لاحقاً"
 
-#: filter/filter-part.c:531
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "إختبار"
 
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "يجب أن تسمّي هذه المصفاة."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
 msgstr "إسم القاعدة:"
 
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "بدون عنوان"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "إذا"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "تنفيذ الإجراءات"
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>مستحَق:</b> "
 
-#: filter/filter-rule.c:795
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "إذا قوبلت جميع المحدِّدات"
 
-#: filter/filter-rule.c:800
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "إذا قوبلت أي محدِّدة"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "تنفيذ الإجراءات"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "مفوّض"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "المستلِمون"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "الرّدود على %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "تضمين:"
+
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "قادمة"
 
-#: filter/filter-rule.c:895
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "الخارجة"
 
 #: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "المقارنة مع"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "قواعد التصفية"
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "تحرير المصفات"
+msgid "Compare against"
+msgstr "المقارنة مع"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "تحرير المجلدات الاعتباطية"
-
-#: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "قادمة"
 
-#: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "الخارجة"
-
-#: filter/filter.glade.h:7
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -11282,7 +12962,7 @@ msgstr ""
 "سيقارن تاريخ الرّسالة مع\n"
 "السّاعة 12:00 صباحاً من التّاريخ المحدّد."
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -11290,7 +12970,7 @@ msgstr ""
 "سيقارن تاريخ الرّسالة مع\n"
 "زمن نسبي لزمن التصفية."
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -11298,1009 +12978,1021 @@ msgstr ""
 "سيقارن تاريخ الرّسالة مع\n"
 "الوقت الحالي عند التصفية."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
-msgid "Virtual Folders"
-msgstr "مجلّدات اعتباطيّة"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr "زمن نسبيّ للوقت الحالي"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr "منذ"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr "أشهر"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:181
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "ثوان"
 
-#: filter/filter.glade.h:22
-msgid "specific folders only"
-msgstr "مجلّدات محدّدة فقط"
-
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:18
 msgid "the current time"
 msgstr "الوقت الحالي"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:19
 msgid "the time you specify"
 msgstr "الوقت الذي تحدّده أنت"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "موارد المجلّدات الاعتباطية"
-
-#: filter/filter.glade.h:26
-msgid "weeks"
-msgstr "أسابيع"
-
-#: filter/filter.glade.h:27
-msgid "with all active remote folders"
-msgstr "مع كل المجلّدات النّشطة عن بعد"
-
-#: filter/filter.glade.h:28
-msgid "with all local and active remote folders"
-msgstr "مع كل المجلّدات المحلّية و النّشطة عن بعد"
-
-#: filter/filter.glade.h:29
-msgid "with all local folders"
-msgstr "مع كل المجلّدات المحلّيّة"
-
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:21
 msgid "years"
 msgstr "سنوات"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "ضبط النّتيجة"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "تعيين لون"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "إضافة قاعدة"
 
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "تعيين نتيجة"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "تحرير قاعدة"
 
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "المُرفقات"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "إسم القاعدة"
 
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "صافرة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
-msgstr "نسخ للمجلّد"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "تفضيلات المؤلّف"
 
-#: filter/libfilter-i18n.h:8
-msgid "Date received"
-msgstr "تاريخ الاستلام"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "إعداد تفضيلات البريد هنا، بما فيها الأمن و عرض الرّسائل"
 
-#: filter/libfilter-i18n.h:9
-msgid "Date sent"
-msgstr "تاريخ الإرسال"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "إعداد فحص التّهجئة و التّواقيع و مؤلّف الرّسائل هنا"
 
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
-msgstr "حُذف"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "إعداد حساباتك البريديّة هنا"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "غير موجود"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "بريد إيفُليوشِن"
 
-#: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "مسوّدة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "قطعة إعداد حسابات بريد إيفُليوشِن"
 
-#: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "موجود"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "مكوّن بريد ايفُليوشِن"
 
-#: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "تعبير"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "مؤلّف بريد ايفُليوشِن"
 
-#: filter/libfilter-i18n.h:16
-msgid "Follow Up"
-msgstr "متابعة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "قطعة إعداد مؤلّف بريد إيفُليوشِن"
 
-#: filter/libfilter-i18n.h:18 mail/em-folder-view.c:713
-msgid "Label"
-msgstr "علامة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "قطعة تفضيلات بريد إيفُليوشِن"
 
-#: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "قائمة مراسَلة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "بريد"
 
-#: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "متن الرّسالة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "حسابات البريد"
 
-#: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "ترويسة الرّسالة"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "تفضيلات البريد"
 
-#: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "نقل للمجلّد"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_بريد:"
 
-#: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
-msgstr "نقل الرّسالة بأنبوب إلى أمر الهيكل"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
+msgstr "{الإفتراض}"
 
-#: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "عزف صوت"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
+msgstr "إسم الحساب"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "قراءة"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
+msgstr "البرتوكول"
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "المستلِمون"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
+msgstr "غير مسمّى"
 
-#: filter/libfilter-i18n.h:27
-msgid "Regex Match"
-msgstr "مطابقة التّعبير النّظامي"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
+msgstr "اللّغة (أو اللّغات)"
 
-#: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "أُجيب عليه"
+#: mail/em-composer-prefs.c:955
+#, fuzzy
+msgid "Add signature script"
+msgstr "إ_ضافة توقيع"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "النّتيجة"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr "التّوقيع (أو التّواقيع)"
 
-#: filter/libfilter-i18n.h:30
-msgid "Sender"
-msgstr "المرسِل"
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
+msgstr "-------- رسالة ممرّرة -------- "
 
-#: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "ضبط الحالة"
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
+msgstr "مرسِل مجهول"
 
-#: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "أمر الهيكل"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
 
-#: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "الحجم (ك.بايت)"
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "قواعد التصفية"
 
-#: filter/libfilter-i18n.h:34
-msgid "Source Account"
-msgstr "الحساب المصدر"
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "انتقاء المجلّد"
 
-#: filter/libfilter-i18n.h:35
-msgid "Spam"
-msgstr "سبام"
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "ضبط النّتيجة"
 
-#: filter/libfilter-i18n.h:36
-msgid "Specific header"
-msgstr "ترويسة محدّدة"
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "تعيين لون"
 
-#: filter/libfilter-i18n.h:38
-msgid "Stop Processing"
-msgstr "إيقاف المعالجة"
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "تعيين نتيجة"
 
-#: 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 "الموضوع"
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "المُرفقات"
 
-#: filter/libfilter-i18n.h:40
-msgid "Unset Status"
-msgstr "إلغاء ضبط الحالة"
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "صافرة"
 
-#: filter/libfilter-i18n.h:41
+#: mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "يحتوي"
 
-#: filter/libfilter-i18n.h:42
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "نسخ للمجلّد"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "تاريخ الاستلام"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "تاريخ الإرسال"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "حُذف"
+
+#: mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "لا يحتوي"
 
-#: filter/libfilter-i18n.h:43
+#: mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "لا ينتهي بـ"
 
-#: filter/libfilter-i18n.h:44
+#: mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "غير موجود"
 
-#: filter/libfilter-i18n.h:45
+#: mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "لا يُرجع"
 
-#: filter/libfilter-i18n.h:46
+#: mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "مَسمَعُه ليس مثل"
 
-#: filter/libfilter-i18n.h:47
+#: mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "لا يبدء بـ"
 
-#: filter/libfilter-i18n.h:48
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "غير موجود"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "مسوّدة"
+
+#: mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "ينتهي بـ"
 
-#: filter/libfilter-i18n.h:49
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "موجود"
+
+#: mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "موجود"
 
-#: filter/libfilter-i18n.h:50
-msgid "is Flagged"
-msgstr "عليه علم"
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "تعبير"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "متابعة"
 
-#: filter/libfilter-i18n.h:51
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "هو"
+
+#: mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "يقع بعد"
 
-#: filter/libfilter-i18n.h:52
+#: mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "يقع قبل"
 
-#: filter/libfilter-i18n.h:53
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "عليه علم"
+
+#: mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "أكبر من"
 
-#: filter/libfilter-i18n.h:54
+#: mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "أصغر من"
 
-#: filter/libfilter-i18n.h:55
-msgid "is not Flagged"
-msgstr "ليس عليه علم"
-
-#: filter/libfilter-i18n.h:56
+#: mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "ليس"
 
-#: filter/libfilter-i18n.h:57
-msgid "is"
-msgstr "هو"
-
-#: filter/libfilter-i18n.h:58
-msgid "returns greater than"
-msgstr "يُرجع أكبر من"
-
-#: filter/libfilter-i18n.h:59
-msgid "returns less than"
-msgstr "يُرجع أصغر من"
-
-#: filter/libfilter-i18n.h:60
-msgid "returns"
-msgstr "يُرجع"
-
-#: filter/libfilter-i18n.h:61
-msgid "sounds like"
-msgstr "مَسمَعُه مثل"
-
-#: filter/libfilter-i18n.h:62
-msgid "starts with"
-msgstr "يبدء بـ"
-
-#: filter/rule-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' ليس فريداً، إختر غيره."
-
-#: filter/rule-editor.c:170
-msgid "Rules"
-msgstr "القواعد"
-
-#: filter/rule-editor.c:291
-msgid "Add Rule"
-msgstr "إضافة قاعدة"
-
-#: filter/rule-editor.c:373
-msgid "Edit Rule"
-msgstr "تحرير قاعدة"
-
-#: filter/rule-editor.c:692
-msgid "Rule name"
-msgstr "إسم القاعدة"
-
-#: filter/score-editor.c:114
-msgid "Score Rules"
-msgstr "قواعد النتيجة"
-
-#: filter/vfolder-rule.c:209
-msgid "You must name this vfolder."
-msgstr "يجب ان تسمي المجلدا الاعتباطي هذا."
-
-#: filter/vfolder-rule.c:223
-msgid "You need to to specify at least one folder as a source."
-msgstr "يجب أن تحدّد مجلّدا واحداً على الأقل كمصدر."
-
-#: 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/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "ليس عليه علم"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "قطعة إعداد حسابات بريد إيفُليوشِن"
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "يونيو"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "مكوّن بريد ايفُليوشِن"
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "علامة"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "مؤلّف بريد ايفُليوشِن"
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "قائمة مراسَلة"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "قطعة إعداد مؤلّف بريد إيفُليوشِن"
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "متن الرّسالة"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "عارض مجلّدات بريد إيفُليوشِن"
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "ترويسة الرّسالة"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "قطعة تفضيلات بريد إيفُليوشِن"
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+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/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "تعليم كليس _نفاية"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "حسابات البريد"
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "نقل للمجلّد"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:71
-msgid "Mail Preferences"
-msgstr "تفضيلات البريد"
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "إنهاء البرنامج"
 
-#: mail/em-account-prefs.c:233
-msgid "Are you sure you want to delete this account?"
-msgstr "هل تريد فعلاً حذف هذا الحساب؟"
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "عزف صوت"
 
-#: mail/em-account-prefs.c:241
-msgid "Don't delete"
-msgstr "عدم الحذف"
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "قراءة"
 
-#: 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 "تعطيل"
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "المستلِمون"
 
-#: 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 "تفعيل"
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "مطابقة التّعبير النّظامي"
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:439
-msgid "[Default]"
-msgstr "{الإفتراض}"
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "أُجيب عليه"
 
-#. 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 "مفعّل"
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "يُرجع"
 
-#: mail/em-account-prefs.c:493
-msgid "Account name"
-msgstr "إسم الحساب"
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "يُرجع أكبر من"
 
-#: mail/em-account-prefs.c:495
-msgid "Protocol"
-msgstr "البرتوكول"
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "يُرجع أصغر من"
 
-#: mail/em-composer-prefs.c:226 mail/em-composer-prefs.c:349
-#: mail/mail-config.c:1250
-msgid "Unnamed"
-msgstr "غير مسمّى"
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "تشغيل البرنامج:"
 
-#: mail/em-composer-prefs.c:334
-msgid "You must specify a valid script name."
-msgstr "يجب أن تحدّد اسم مخطوطٍ صحيح."
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "النّتيجة"
 
-#: mail/em-composer-prefs.c:392 mail/em-composer-prefs.c:454
-msgid "[script]"
-msgstr "[مخطوط]"
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "المرسِل"
 
-#: mail/em-composer-prefs.c:858
-msgid "Language(s)"
-msgstr "اللّغة (أو اللّغات)"
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "ضبط الحالة"
 
-#: mail/em-composer-prefs.c:900
-msgid "Add script signature"
-msgstr "إضافة توقيع المخطوط"
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "الحجم (ك.بايت)"
 
-#: mail/em-composer-prefs.c:920
-msgid "Signature(s)"
-msgstr "التّوقيع (أو التّواقيع)"
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "مَسمَعُه مثل"
 
-#: 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-filter-i18n.h:59
+msgid "Source Account"
+msgstr "الحساب المصدر"
 
-#: mail/em-composer-utils.c:137
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"ليس لهذه الرّسالة موضوع.\n"
-"هل تريد فعلاً إرسالها؟"
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "ترويسة محدّدة"
 
-#: 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-filter-i18n.h:61
+msgid "starts with"
+msgstr "يبدء بـ"
 
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr "تحتوي هذه الرّسالة فقط على مستلمي نسخٍ كربونيّة مخفيّة."
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "إيقاف المعالجة"
 
-#: 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-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "الموضوع"
 
-#: mail/em-composer-utils.c:301
-msgid "You must specify recipients in order to send this message."
-msgstr "يجب تحديد مستلمين لإرسال هذه الرّسالة."
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "إلغاء ضبط الحالة"
 
-#: 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 ""
-"لم يمكن فتح مجلّد المسوّدات لهذا الحساب.\n"
-"هل تود استخدام مجلّد المسوّدات الافتراضي؟"
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>مستحَق:</b> "
 
-#: mail/em-folder-browser.c:128
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "إنشاء مجلّد ا_عتباطي من البحث..."
 
-#: mail/em-folder-selection-button.c:116
-#: shell/evolution-folder-selector-button.c:100
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "خصائص المجلّد"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "رسالة مساعدة"
+msgstr[1] "رسالة مساعدة"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "الرّسالة ال_غير مقروءة التالية"
+msgstr[1] "الرّسالة ال_غير مقروءة التالية"
+
+#: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<أُنقر هنا لإنتقاء مجلّد>"
 
-#: mail/em-folder-selector.c:137 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166
 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
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "تحديد أين سيتم إنشاء المجلّد:"
 
-#: mail/em-folder-selector.c:263
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:300
+#, fuzzy
+msgid "Create"
+msgstr "إنشاء مجلّد"
+
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "إ_سم المجلّد:"
 
-#: 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
-#, c-format
-msgid "Could not create temporary mbox store: %s"
-msgstr "لم يمكن إنشاء مخزن صندوق البريد المؤقّت: %s"
-
-#: mail/em-folder-tree-model.c:577
-#, c-format
-msgid "Could not create temporary mbox folder: %s"
-msgstr "لم يمكن إنشاء مجلّد صندوق البريد المؤقّت: %s"
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
 
-#: mail/em-folder-tree-model.c:592
-#, c-format
-msgid "Could not copy messages to temporary mbox folder: %s"
-msgstr "لم يمكن نسخ الرّسائل إلى مجلّد صندوق البريد المؤقّت: %s"
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
 
-#: mail/em-folder-tree-model.c:771 mail/em-folder-tree-model.c:1001
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
 msgid "Loading..."
 msgstr "جاري التّحميل..."
 
-#: mail/em-folder-tree.c:969 mail/em-folder-tree.c:1056
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: mail/em-folder-tree.c:846
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "جاري إزالة المجلّد %s"
+
+#: mail/em-folder-tree.c:848
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "جاري فتح المجلّد %s"
+
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "جاري نقل الرسائل إلى %s"
+
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "جاري نسخ الرسائل إلى %s"
+
+#: mail/em-folder-tree.c:873
+#, fuzzy
+msgid "Cannot drop message(s) into toplevel store"
+msgstr "لا يمكن نسخ أو نقل رسالة إلى مجلّد إعتباطي"
+
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "ن_سخ إلى دليل"
+
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+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
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
+msgid "_Move"
+msgstr "_نقل"
+
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "إلغاء المهمة"
+
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "إنتقاء مجلّد"
 
-#: mail/em-folder-tree.c:1091
-msgid "Create folder"
-msgstr "إنشاء مجلّد"
-
-#: mail/em-folder-tree.c:1179
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "لم يمكن حذف المجلّد: %s"
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
+#, fuzzy
+msgid "C_opy"
+msgstr "نسخ"
 
-#: mail/em-folder-tree.c:1200
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "هل تريد فعلاً حذف المجلّد \"%s\" و كل مجلّداته الفرعيّة؟"
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+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:2330 mail/mail-component.c:709
+msgid "Create folder"
+msgstr "إنشاء مجلّد"
 
-#: mail/em-folder-tree.c:1244 shell/e-shell-folder-commands.c:534
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "إعادة تسمية المجلّد \"%s\" إلى:"
 
-#: mail/em-folder-tree.c:1248 shell/e-shell-folder-commands.c:541
+#: mail/em-folder-tree.c:2528
 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
-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
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_عرض"
 
-#: mail/em-folder-tree.c:1492
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "فتح في نافذة _جديدة"
 
-#: mail/em-folder-tree.c:1497
-msgid "_Move"
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_نسخ"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
 msgstr "_نقل"
 
-#: mail/em-folder-tree.c:1500
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "مجلّد _جديد..."
 
-#: mail/em-folder-tree.c:1502 shell/e-shortcuts-view.c:427
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "إ_عادة التّسمية"
 
-#: mail/em-folder-tree.c:1505 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_خصائص..."
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "خصائص"
 
 #. { 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
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_تحرير كرسالةٍ جديدة..."
 
-#: mail/em-folder-view.c:683
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_طباعة"
 
-#: mail/em-folder-view.c:686 ui/evolution-mail-message.xml.h:124
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "ال_رّد على المرسِل"
 
-#: mail/em-folder-view.c:687 mail/em-popup.c:650
-#: ui/evolution-mail-message.xml.h:86
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "الرّد على ال_قائمة"
 
-#: mail/em-folder-view.c:688 mail/em-popup.c:651
-#: ui/evolution-mail-message.xml.h:85
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
+#: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "الرّد على ال_كل"
 
-#: mail/em-folder-view.c:689 mail/em-popup.c:653
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_تمرير"
 
-#: mail/em-folder-view.c:692
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "متا_بعة..."
 
-#: mail/em-folder-view.c:693
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "تم ال_علم"
 
-#: mail/em-folder-view.c:694
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_مسح العلم"
 
-#: mail/em-folder-view.c:697 ui/evolution-mail-message.xml.h:48
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "تعليم على أنّها _مقروءة"
 
-#: mail/em-folder-view.c:698
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "تعليم على أنّها _غير مقروءة"
 
-#: mail/em-folder-view.c:699
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "_تعليم على أنّها مهمّة"
 
-#: mail/em-folder-view.c:700
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "ت_عليم على أنّها غير مهمّة"
 
-#: mail/em-folder-view.c:701 ui/evolution-mail-message.xml.h:52
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "تعليم ك_نفاية"
 
-#: mail/em-folder-view.c:702 ui/evolution-mail-message.xml.h:53
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "تعليم كليس _نفاية"
 
-#: mail/em-folder-view.c:706
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "ترا_جع عن الحذف"
 
-#: mail/em-folder-view.c:709
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_نقل للمجلّد..."
 
-#: mail/em-folder-view.c:710 ui/evolution-addressbook.xml.h:31
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "ن_سخ للمجلّد..."
 
-#: mail/em-folder-view.c:718
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "إضافة المرسِل ل_دفتر العناوين"
 
-#: mail/em-folder-view.c:721
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "تطب_يق المصفات"
 
-#: mail/em-folder-view.c:724
+#: mail/em-folder-view.c:940
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "قواعد التصفية"
+
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "إنشاء قاعدة من الرّسالة"
 
-#: mail/em-folder-view.c:725
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "مجلّد إعتباطي على الموضوع"
 
-#: mail/em-folder-view.c:726
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "مجلّد·إعتباطي·على·الم_رسِل"
 
-#: mail/em-folder-view.c:727
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "مجلّد·إعتباطي·على·ال_متلّقين"
 
-#: mail/em-folder-view.c:728
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "مجلّد·إعتباطي·على·القوائم البريديّة"
 
-#: mail/em-folder-view.c:730
-msgid "VFolder on Thread"
-msgstr "مجلّد·إعتباطي·على·النقاش"
-
-#: mail/em-folder-view.c:734
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "تصفية باعتبار المو_ضوع"
 
-#: mail/em-folder-view.c:735
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "تصفية باعتبار المر_سِل"
 
-#: mail/em-folder-view.c:736
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "تصفية باعتبار المست_لمين"
 
-#: mail/em-folder-view.c:737
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "تصفية باعتبار ال_قائمة البريديّة"
 
-#: mail/em-folder-view.c:739
-msgid "Filter on Thread"
-msgstr "تصفية باعتبار النقاش"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1511 mail/em-folder-view.c:1549
-#: mail/mail-config.glade.h:40
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "الإفتراض"
 
-#: mail/em-folder-view.c:1583
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "طباعة الرّسالة"
 
-#: mail/em-folder-view.c:1825
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_نسخ موقع الوصلة"
 
+#: mail/em-folder-view.c:2377
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "نقر لإضافة مهمّة"
+
 #. message-search popup match count string
-#: mail/em-format-html-display.c:368
+#: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "المطابقات: %d"
 
-#: mail/em-format-html-display.c:597 mail/em-format-html.c:564
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 msgid "Unsigned"
 msgstr "غير موقّعة"
 
-#: mail/em-format-html-display.c:597
+#: mail/em-format-html-display.c:641
+#, fuzzy
 msgid ""
-"This message is not signed.  There is no guarantee the sender of the message "
-"is authentic."
-msgstr ""
-"هذه الرّسالة غير موقّعة. ليست هناك أيّة ضمانات أن مرسل الرّسالة حقيقي."
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "هذه الرّسالة غير موقّعة. ليست هناك أيّة ضمانات أن مرسل الرّسالة حقيقي."
 
-#: mail/em-format-html-display.c:598 mail/em-format-html.c:565
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "توقيع سليم"
 
-#: mail/em-format-html-display.c:598
+#: mail/em-format-html-display.c:642
+#, fuzzy
 msgid ""
-"This message is signed and is valid, the sender of this message is very "
-"likely who they claim to be."
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
-"هذه الرّسالة موقّعة و سليمة، من شبه المؤكّد أن مرسل هذه الرّسالة هو من يزعم أن يكون."
+"هذه الرّسالة موقّعة و سليمة، من شبه المؤكّد أن مرسل هذه الرّسالة هو من يزعم أن "
+"يكون."
 
-#: mail/em-format-html-display.c:599 mail/em-format-html.c:566
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "توقيع غير سليم"
 
-#: mail/em-format-html-display.c:599
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr ""
-"لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
+msgstr "لا يمكن التّحقّق من توقيع هذه الرّسالة، ربّما غُيّرت أثناء النّقل."
 
-#: mail/em-format-html-display.c:600 mail/em-format-html.c:567
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "توقيع سليم، تعذّر التّحقّق من المرسِل"
 
-#: mail/em-format-html-display.c:600
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr ""
-"هذه الرّسالة موقّعة بتوقيعٍ سليم، و لكن تعذّر التّحقّق من مرسِل الرّسالة."
+msgstr "هذه الرّسالة موقّعة بتوقيعٍ سليم، و لكن تعذّر التّحقّق من مرسِل الرّسالة."
 
-#: mail/em-format-html-display.c:606 mail/em-format-html.c:573
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 msgid "Unencrypted"
 msgstr "غير مشفّرة"
 
-#: mail/em-format-html-display.c:606
+#: mail/em-format-html-display.c:650
+#, fuzzy
 msgid ""
-"This message is not encrypted.  It's content may be viewed in transit across "
+"This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 "هذه الرّسالة ليست مشفّرة. من الممكن استعراض محتوياتها أثناء نقلها عبر الإنترنت."
 
-#: mail/em-format-html-display.c:607 mail/em-format-html.c:574
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "مشفّرة، ضعيفة"
 
-#: mail/em-format-html-display.c:607
+#: mail/em-format-html-display.c:651
 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
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "مشفّرة"
 
-#: mail/em-format-html-display.c:608
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr ""
-"هذه الرّسالة مشفّرة. سيصعب على أيّ غريبٍ استعراض محتوياتها."
+msgstr "هذه الرّسالة مشفّرة. سيصعب على أيّ غريبٍ استعراض محتوياتها."
 
-#: mail/em-format-html-display.c:609 mail/em-format-html.c:576
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "مشفّرة، بقوّة"
 
-#: mail/em-format-html-display.c:609
+#: mail/em-format-html-display.c:653
 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 "لم يمكن ترجمة رسالة S/MIME: خطأ مجهول"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+#, fuzzy
+msgid "_View Certificate"
+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:769
+#, fuzzy
+msgid "This certificate is not viewable"
+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:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
 
-#: mail/em-format-html-display.c:917
+#: mail/em-format-html-display.c:1012
+#, fuzzy
+msgid "Overdue:"
+msgstr "المهام ال_فائت موعدها:"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_عرض ضمن السّياق"
 
-#: mail/em-format-html-display.c:918
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "إ_خفاء"
 
-#: mail/em-format-html-print.c:99
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "الصّفحة %d من %d"
 
-#: mail/em-format-html.c:457 mail/em-format-html.c:459
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "جاري سحب `%s'"
 
-#: mail/em-format-html.c:826
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "توقيع سليم، تعذّر التّحقّق من المرسِل"
+
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "جزء متن خارجي مشوّه."
 
-#: mail/em-format-html.c:856
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "مؤشّر لموقع FTP (%s)"
 
-#: mail/em-format-html.c:867
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "مؤشّر لملفٍّ محلّي (%s) صحيح في الموقع \"%s\""
 
-#: mail/em-format-html.c:869
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "مؤشّر لملف محلّي (%s)"
 
-#: mail/em-format-html.c:890
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "مؤشّر لبيانات بعيدة (%s)"
 
-#: mail/em-format-html.c:901
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "مؤشّر لبيانات خارجيّة مجهولة (فئة \"%s\")"
 
-#: mail/em-format-html.c:1029
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "لم يمكن إعراب رسالة MIME. ستُعرض كمصدر."
-
-#: mail/em-format-html.c:1141
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "جاري تهيئة الرسالة"
 
-#: mail/em-format-html.c:1423 mail/em-format.c:673
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "من"
 
-#: mail/em-format-html.c:1425 mail/em-format.c:674
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "الرّد إلى"
 
-#: mail/em-format-html.c:1427 mail/em-format.c:675
-#: mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "إلى"
 
-#: mail/em-format-html.c:1429 mail/em-format.c:676
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "ن.ك"
 
-#: mail/em-format-html.c:1431 mail/em-format.c:677
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "ن.ك.م"
 
-#: mail/em-format-html.c:1450
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "المرسِل"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1477
+#: mail/em-format-html.c:1550
 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:1480
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1491 mail/em-format.c:679
-#: mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "التّاريخ"
 
-#: mail/em-format.c:892
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "مرفق %s"
 
-#: mail/em-format.c:1185
-msgid "Session not initialised"
-msgstr "لم تهيء الجلسة"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "لم يمكن ترجمة رسالة S/MIME: خطأ مجهول"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "لم يمكن إعراب رسالة MIME. ستُعرض كمصدر."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "تهيئة توقيع غير مدعومة"
 
-#: mail/em-format.c:1210
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr "هذه الرّسالة موقّعة رقميّاً و قد تبيّن أنّها أصليّة."
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: mail/em-format.c:1212
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr "هذه الرّسالة موقّعة رقميّاً و لكن لا يمكن إثبات كونها أصليّة."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "خطأ مجهول أثناء التّحقّق من التّوقيع"
 
-#: mail/em-junk-filter.c:72
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "سبام-أساسن (مضمّن)"
 
-#: mail/em-migrate.c:120
-msgid "Migrating..."
-msgstr "جاري التنزيح..."
+#: mail/em-mailer-prefs.c:100
+#, fuzzy
+msgid "Every time"
+msgstr "كل سنة"
+
+#: mail/em-mailer-prefs.c:101
+msgid "Once per day"
+msgstr ""
 
-#: mail/em-migrate.c:128
+#: mail/em-mailer-prefs.c:102
+#, fuzzy
+msgid "Once per week"
+msgstr "كل أسبوع"
+
+#: mail/em-mailer-prefs.c:103
+#, fuzzy
+msgid "Once per month"
+msgstr "كل شهر"
+
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12311,153 +14003,152 @@ msgstr ""
 "\n"
 "الرجاء الإنتظار حتى يقوم إيفُليوشِن بتنزيح مجلّداتك..."
 
-#: mail/em-migrate.c:161
-#, c-format
-msgid "Migrating `%s':"
-msgstr "جاري تنزيح `%s':"
+#: mail/em-migrate.c:1602
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+"لم يمكن إنشاء ملف الإخراج: %s\n"
+"·%s"
 
-#: mail/em-migrate.c:627
-#, c-format
-msgid "Failed to migrate `%s': %s"
-msgstr "فشل تنزيح `%s': %s"
+#: mail/em-migrate.c:1628
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"لا يمكن نسخ واصف الملف: %s\n"
+"%s"
 
-#: mail/em-migrate.c:653 mail/em-migrate.c:670
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1811
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "لا يمكن حفظ ملف قائمة المجموعة لـ %s: %s"
+
+#: mail/em-migrate.c:2015
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "فشل التّوثيق مع نادل POP %s: %s"
+
+#: mail/em-migrate.c:2029
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "فشل إنشاء المجلّد `%s': %s"
 
-#: mail/em-migrate.c:682
+#: mail/em-migrate.c:2058
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "فشل فتح المخزن لـ `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
 
-#: mail/em-popup.c:599
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "فشل إنشاء المجلّد `%s': %s"
+
+#: mail/em-migrate.c:2576
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"لم يمكن إنشاء ملف الإخراج: %s\n"
+"·%s"
+
+#: mail/em-migrate.c:2594
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "حفظ كـ..."
 
-#: mail/em-popup.c:647
+#: mail/em-popup.c:718
+#, c-format
+msgid "untitled_image.%s"
+msgstr ""
+
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "ضبط ك_خلفية"
 
-#: mail/em-popup.c:649
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "ال_رّد على المرسِل"
 
-#: mail/em-popup.c:697
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_فتح الوصلة في المتصفّح"
 
-#: mail/em-popup.c:698
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "إر_سال الرّسالة لـ..."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "إ_ضافة لدفتر العناوين"
 
-#: mail/em-popup.c:805
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "فتح في %s..."
 
-#: mail/em-subscribe-editor.c:583
-msgid "This store does not support subscriptions, or the are not enabled."
+#: mail/em-subscribe-editor.c:606
+#, fuzzy
+msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "هذا المخزن لا يدعم الإشتراكات، أو أنّها غير مدعومة."
 
-#: mail/em-subscribe-editor.c:612
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "تم الإشتراك"
 
-#: mail/em-subscribe-editor.c:616
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "مجلّد"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:803
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "الرجاء اختيار نادل."
 
-#: mail/em-subscribe-editor.c:824
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "لم يتم اختيار أي نادل"
 
-#: mail/em-utils.c:93
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "عدم إظهار هذه الرّسالة مجدّداً."
 
-#: mail/em-utils.c:275
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"خطأ أثناء تحميل معلومات المصفاة:\n"
-"%s"
-
-#: mail/em-utils.c:284
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "مصفات"
 
-#: mail/em-utils.c:491
-msgid "-------- Forwarded Message --------"
-msgstr "-------- رسالة ممرّرة -------- "
-
-#: 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:1054
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "كتب في %a, %Y-%m-%d السّاعة %H:%M %%+05d, %%s:"
-
-#: mail/em-utils.c:1330
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"لا يمكن الحفظ إلى `%s'\n"
-"%s"
-
-#: mail/em-utils.c:1335
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"`%s' موجود أصلاً.\n"
-"هل تريد تنميقه؟"
-
-#: mail/em-utils.c:1378
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "رسالة"
 
-#: mail/em-utils.c:1435
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "حفظ الرّسالة..."
 
-#: mail/em-utils.c:1473
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "إضافة عنوان"
 
-#: mail/em-utils.c:2262
-#, 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 ""
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:1019
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "البريد من %s"
 
-#: mail/em-utils.c:2288
-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 ""
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "مجلّدات اعتباطيّة"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "إ_ضافة"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "مصدر المجلّد الاعتباطي"
 
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
@@ -12472,400 +14163,512 @@ msgid "Check incoming mail being junk"
 msgstr "تفقّد عن كون البريد الوارد تافه"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "لون إبراز الإقتباس"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "لون إبراز الإقتباس."
 
 #: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:8
 msgid "Default charset in which to compose messages"
 msgstr "مجموعة المحارف الافتراضية التي ستؤلّف الرّسائل منها"
 
-#: mail/evolution-mail.schemas.in.in.h:7
+#: mail/evolution-mail.schemas.in.in.h:9
 msgid "Default charset in which to compose messages."
 msgstr "مجموعة المحارف الإفتراضية التي ستؤلّف الرّسائل منها."
 
-#: mail/evolution-mail.schemas.in.in.h:8
+#: mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to display messages"
 msgstr "مجموعة المحارف الافتراضية التي ستعرض الرّسائل بها"
 
-#: mail/evolution-mail.schemas.in.in.h:9
+#: mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to display messages."
 msgstr "مجموعة المحارف الافتراضية التي ستعرض الرّسائل بها."
 
-#: mail/evolution-mail.schemas.in.in.h:10
+#: mail/evolution-mail.schemas.in.in.h:12
 msgid "Default forward style"
 msgstr "أسلوب التمرير الإفتراضي"
 
-#: mail/evolution-mail.schemas.in.in.h:11
+#: mail/evolution-mail.schemas.in.in.h:13
+#, fuzzy
+msgid "Default height of the Composer Window"
+msgstr "العرض الإفتراضي للوح عمود المجلّد"
+
+#: mail/evolution-mail.schemas.in.in.h:14
+#, fuzzy
+msgid "Default height of the Message Window"
+msgstr "العنوان الإفتراضي للرّسالة."
+
+#: mail/evolution-mail.schemas.in.in.h:15
+#, fuzzy
+msgid "Default height of the Subscribe dialog"
+msgstr "العرض·الإفتراضي·للوح·عمود·المختصر"
+
+#: mail/evolution-mail.schemas.in.in.h:16
 msgid "Default reply style"
 msgstr "أسلوب الرّد الإفتراضي"
 
-#: mail/evolution-mail.schemas.in.in.h:12
+#: mail/evolution-mail.schemas.in.in.h:17
+#, fuzzy
+msgid "Default width of the Composer Window"
+msgstr "العرض الإفتراضي للوح عمود المجلّد"
+
+#: mail/evolution-mail.schemas.in.in.h:18
+#, fuzzy
+msgid "Default width of the Message Window"
+msgstr "العرض الإفتراضي للوح عمود المجلّد"
+
+#: mail/evolution-mail.schemas.in.in.h:19
+#, fuzzy
+msgid "Default width of the Subscribe dialog"
+msgstr "العرض·الإفتراضي·للوح·عمود·المختصر"
+
+#: mail/evolution-mail.schemas.in.in.h:20
 msgid "Draw spelling error indicators on words as you type."
 msgstr "رسم مؤشّرات أخطاء التّهجئة على الكلمات أثناء ما تكتب."
 
-#: mail/evolution-mail.schemas.in.in.h:13
+#: mail/evolution-mail.schemas.in.in.h:21
 msgid "Empty Trash folders on exit"
 msgstr "إفراغ مجلّدات القمامة عند الإنهاء"
 
-#: mail/evolution-mail.schemas.in.in.h:14
+#: mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "إفراغ جميع مجلّدات القمامة عند الخروج من إيفُليوشِن."
 
-#: mail/evolution-mail.schemas.in.in.h:15
+#: mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "تفعيل نسق النّابض، حتّى يمكنك رؤية مؤشّر عند قراءة البريد."
 
-#: mail/evolution-mail.schemas.in.in.h:16
+#: mail/evolution-mail.schemas.in.in.h:24
 msgid "Enable/disable caret mode"
 msgstr "تغعيل/تعطيل نسق النّابض"
 
-#: mail/evolution-mail.schemas.in.in.h:17
+#: mail/evolution-mail.schemas.in.in.h:25
 msgid "Height of the message-list pane"
 msgstr "ارتفاع لوح قائمة الرّسائل"
 
-#: mail/evolution-mail.schemas.in.in.h:18
+#: mail/evolution-mail.schemas.in.in.h:26
 msgid "Height of the message-list pane."
 msgstr "ارتفاع لوح قائمة الرّسائل."
 
-#: mail/evolution-mail.schemas.in.in.h:19
+#: mail/evolution-mail.schemas.in.in.h:27
 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"
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:29
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "قائمة العلامات و الألوان المرتبطة بها"
 
-#: mail/evolution-mail.schemas.in.in.h:21
+#: mail/evolution-mail.schemas.in.in.h:30
+#, fuzzy
+msgid "List of accepted licenses"
+msgstr "قائمة الحسابات"
+
+#: mail/evolution-mail.schemas.in.in.h:31
 msgid "List of accounts"
 msgstr "قائمة الحسابات"
 
-#: mail/evolution-mail.schemas.in.in.h:22
+#: mail/evolution-mail.schemas.in.in.h:32
 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
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:34
 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."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:24
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "قائمة أنواع mime للتّفقّد عن عارضات مكوّنات بونوبو"
 
-#: mail/evolution-mail.schemas.in.in.h:25
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "تحميل صور لرسائل HTML عبر http"
 
-#: mail/evolution-mail.schemas.in.in.h:26
+#: mail/evolution-mail.schemas.in.in.h:38
 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
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "تسجيل إجراءات المصفاة"
 
-#: mail/evolution-mail.schemas.in.in.h:28
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "تسجيل إجراءات المصفاة على ملف السّجل المحدّد."
 
-#: mail/evolution-mail.schemas.in.in.h:29
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "ملف السّجل لتسجيل إجراءات المصفاة"
 
-#: mail/evolution-mail.schemas.in.in.h:30
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "ملف السّجل لتسجيل إجراءات المصفاة."
 
-#: mail/evolution-mail.schemas.in.in.h:31
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "تعليم كمراجع بعد المهلة المحدّدة"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "تعليم كمراجع بعد المهلة المحدّدة."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "تعليم الاقتباسات في \"معاينة\" الرّسالة"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "تعليم الاقتباسات في \"معاينة\" الرّسالة."
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:47
+#, fuzzy
+msgid "Message Window default height"
+msgstr "إرتفاع النّافذة الإفتراضي"
+
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "أسلوب عرض الرّسالة (عادي، ترويسات كاملة، مصدر)"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "ملف صوت التّبليغ ببريدٍ جديد"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "نوع التّبليغ ببريدٍ جديد"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "المسائلة عن موضوع خالي"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:55
 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."
+#: mail/evolution-mail.schemas.in.in.h:56
+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
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "المسائلة حين يقوم المستخدم بالمحو"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "المسائلة حين لا يملأ المستخدم سوى حقل النّسخة الكربونيّة المخفيّة"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
-"المسائلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين "
-"قد لا يرغبون باستلام بريد HTML."
+"المسائلة حين يحاول المستخدم إرسال بريد HTML إلى مستلمين قد لا يرغبون باستلام "
+"بريد HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "المسائلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة\"."
+msgstr ""
+"المسائلة حين يحاول المستخدم إرسال رسالةٍ دون مستلمي \"إلى\" أو \"نسخة كربونيّة"
+"\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "المسائلة حين يحاول المستخدم إرسال HTML غير مرغوبٍ فيه"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "التّعرّف على الوصلات في النّص و الاستبدال بها."
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "التّعرّف على التّعابير في النّص و استبدال الصّور بها."
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "تنفيذ اختبار النفاية على البريد الوارد"
 
-#: mail/evolution-mail.schemas.in.in.h:49
-msgid "S3kr3t 0pt10n"
-msgstr "7يار·3رّي"
-
-#: mail/evolution-mail.schemas.in.in.h:50
-msgid "S3kr3t 0pt10n."
-msgstr "7يار 3رّي."
-
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "إرسال بريد HTML افتراضا"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:66
 msgid "Send HTML mail by default."
 msgstr "إرسال بريد HTML افتراضا."
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:67
 msgid "Show Animations"
 msgstr "إظهار الرّسوم المتحرّكة"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:68
 msgid "Show animated images as animations."
 msgstr "إظهار الصّور المتحرّكة كرسوم متحرّكة."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "إظهار الرّسائل المحذوفة (بخطٍّ يشطبها) في قائمة الرّسائل."
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
 msgstr "إظهار الرّسائل المحذوفة في قائمة الرّسائل"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:71
 msgid "Show the \"Preview\" pane"
 msgstr "إظهار لوح \"المعاينة\""
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:72
 msgid "Show the \"Preview\" pane."
 msgstr "إظهار لوح \"المعاينة\"."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:73
 msgid "Sound file to play when new mail arrives."
 msgstr "الصّوت الذي سيُعزف عند وصول بريدٍ جديد."
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr "لتحديد فئة إشعار البريد الجديد التي يود المستخدم استخدامها."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
 msgstr "فحص تهجئة ضمن السّياق"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default height"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:78
 msgid "Terminal font"
 msgstr "خط الشاشة الطرفيّة"
 
-#: mail/evolution-mail.schemas.in.in.h:63
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
 msgstr "خط الشاشة الطرفيّة لعرض البريد"
 
-#: mail/evolution-mail.schemas.in.in.h:64
+#: mail/evolution-mail.schemas.in.in.h:81
 msgid "The variable width font for mail display"
 msgstr "الخط المتغيّر العرض لعرض البريد"
 
-#: mail/evolution-mail.schemas.in.in.h:65
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:83
 msgid "Thread the message list."
 msgstr "تشعيب قائمة الرّسائل."
 
-#: mail/evolution-mail.schemas.in.in.h:66
+#: mail/evolution-mail.schemas.in.in.h:84
 msgid "Thread the message-list"
 msgstr "تشعيب قائمة الرّسائل"
 
-#: mail/evolution-mail.schemas.in.in.h:67
+#: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
 msgstr "تشعيب قائمة الرّسائل حسب الموضوع"
 
-#: mail/evolution-mail.schemas.in.in.h:68
+#: mail/evolution-mail.schemas.in.in.h:86
 msgid "Timeout for marking message as Seen"
 msgstr "مهلة قبل تعليم الرسالة كمراجَعة"
 
-#: mail/evolution-mail.schemas.in.in.h:69
+#: mail/evolution-mail.schemas.in.in.h:87
 msgid "Timeout for marking message as Seen."
 msgstr "مهلة·قبل·تعليم·الرسالة·كمراجَعة."
 
-#: mail/evolution-mail.schemas.in.in.h:70
+#: mail/evolution-mail.schemas.in.in.h:88
 msgid "UID string of the default account."
 msgstr "سلسلة هويّة المستخدم للحساب الإفتراضي."
 
-#: mail/evolution-mail.schemas.in.in.h:71
+#: mail/evolution-mail.schemas.in.in.h:89
+msgid "Use Spamasssassin daemon and client"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:90
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:91
 msgid "Use custom fonts"
 msgstr "إستعمال خطوط مخصّصة"
 
-#: mail/evolution-mail.schemas.in.in.h:72
+#: mail/evolution-mail.schemas.in.in.h:92
 msgid "Use custom fonts for displaying mail"
 msgstr "إستعمال خطوط مخصّصة لعرض البريد"
 
-#: mail/evolution-mail.schemas.in.in.h:73
+#: mail/evolution-mail.schemas.in.in.h:93
+msgid "Use only local spam tests."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:94
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:95
 msgid "Variable width font"
 msgstr "خط متغير العرض"
 
-#: mail/evolution-mail.schemas.in.in.h:74
+#: mail/evolution-mail.schemas.in.in.h:96
 msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:75
+#: mail/evolution-mail.schemas.in.in.h:97
 msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:76
+#: mail/evolution-mail.schemas.in.in.h:98
 msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:77
+#: mail/evolution-mail.schemas.in.in.h:99
 msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:78
+#: mail/evolution-mail.schemas.in.in.h:100
 msgid "View/From menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:79
+#: mail/evolution-mail.schemas.in.in.h:101
 msgid "View/From menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:80
+#: mail/evolution-mail.schemas.in.in.h:102
 msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:81
+#: mail/evolution-mail.schemas.in.in.h:103
 msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:82
+#: mail/evolution-mail.schemas.in.in.h:104
 msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:83
+#: mail/evolution-mail.schemas.in.in.h:105
 msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:84
+#: mail/evolution-mail.schemas.in.in.h:106
 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/evolution-mail.schemas.in.in.h:107
+msgid "port for starting user runned spamd"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
-msgstr "مستورد صندوق بريد إيفُليوشِن"
+#: mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
+msgid "spamd port"
+msgstr "استيراد"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
-msgstr "صندوق البريد (mbox)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "مستورد elm لإيفُليوشِن"
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 msgid "Evolution Netscape Mail importer"
 msgstr "مستورد إيفُليوشِن لبريد نتْسكيب"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
 msgid "Evolution Outlook Express 4 importer"
 msgstr "مستورد آوتلوك إكسبرس 4 لإيفُليوشِن"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
-msgstr "آوتلوك·إكسبرس (.mbx)"
-
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 msgid "Evolution Pine importer"
 msgstr "مستورد pine لإيفُليوشِن"
 
-#: mail/importers/elm-importer.c:105
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "مستورد صندوق بريد إيفُليوشِن"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "صندوق البريد (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "آوتلوك·إكسبرس (.mbx)"
+
+#: mail/importers/elm-importer.c:88
 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
+#: mail/importers/elm-importer.c:89
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "جاري الاستيراد..."
 
-#: mail/importers/elm-importer.c:108 mail/importers/netscape-importer.c:1240
-#: mail/importers/pine-importer.c:117
+#: mail/importers/elm-importer.c:91
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 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:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "جاري إستيراد الملفات"
 
-#: mail/importers/elm-importer.c:547
+#: mail/importers/elm-importer.c:436
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -12873,16 +14676,46 @@ msgstr ""
 "عثر إيفُليوشِن على ملفّات بريد elm\n"
 "هل تريد استيرادها لإيفُليوشِن؟"
 
-#: mail/importers/elm-importer.c:568
+#: mail/importers/elm-importer.c:444
 msgid "Elm"
 msgstr "Elm"
 
-#: mail/importers/netscape-importer.c:75
+#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
+#, fuzzy
+msgid "Destination folder:"
+msgstr "مجلّد ال_مسوّدات:"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "إنتقاء شهادة لإستيرادها..."
+
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/mail-importer.c:226
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "جاري استيراد"
+
+#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/mail-importer.c:140
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "جاري إستيراد الملفات"
+
+#: mail/importers/mail-importer.c:360
+#, c-format
+msgid "Scanning %s"
+msgstr "جاري مسح %s"
+
+#: mail/importers/netscape-importer.c:73
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "مصفاة ذات الأولويّة \"%s\""
 
-#: mail/importers/netscape-importer.c:663
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -12897,7 +14730,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:687
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12905,7 +14738,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:704
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -12914,31 +14747,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1237
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "إيفُليوشِن بصدد استيراد ملفّات نتْسكيب القديمة الخاصّة بك"
 
-#: mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "جاري مسح مصفات البريد"
-
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "جاري مسح الدّليل"
-
-#: mail/importers/netscape-importer.c:2015 shell/e-shell-startup-wizard.c:563
-msgid "Starting import"
-msgstr "بدأ الإستيراد"
+#: mail/importers/netscape-importer.c:1707
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "إيفُليوشِن بصدد استيراد ملفّات نتْسكيب القديمة الخاصّة بك"
 
-#: mail/importers/netscape-importer.c:2090
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "التعيينات"
 
-#: mail/importers/netscape-importer.c:2095
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "مصفات البريد"
 
-#: mail/importers/netscape-importer.c:2119
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -12946,11 +14772,20 @@ msgstr ""
 "عثر إيفُليوشِن على ملفّات بريد نتْسكيب\n"
 "هل تريد استيرادها لإيفُليوشِن؟"
 
-#: mail/importers/pine-importer.c:114
+#: mail/importers/pine-importer.c:116
 msgid "Evolution is importing your old Pine data"
 msgstr "إيفُليوشِن بصدد استيراد ملفّات pine القديمة الخاصّة بك"
 
-#: mail/importers/pine-importer.c:599
+#: mail/importers/pine-importer.c:314
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "جاري إستيراد الملفات"
+
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "دفتر العناوين"
+
+#: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -12958,173 +14793,186 @@ msgstr ""
 "عثر إيفُليوشِن على ملفّات بريد pine.\n"
 "هل تريد استيرادها لإيفُليوشِن؟"
 
-#: mail/importers/pine-importer.c:618
+#: mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "تهيئة الخزن الحالية:"
-
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
-msgstr "محتويات متن الفهرس"
-
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "تهيئة خزن جديدة:"
-
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "دليل البريد"
-
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
-
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
-
-#: mail/mail-account-editor.c:102
-msgid "You have not filled in all of the required information."
-msgstr "لم تكتب جميع المعلومات المطلوبة."
-
 #. give our dialog an OK button and title
 #: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "محرّر حسابات إيفُليوشِن"
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:153
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "اتفاق على المفتاح"
+
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "ال_مضيف:"
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "إ_سم المستخدم:"
 
-#: mail/mail-account-gui.c:764 mail/mail-config.glade.h:162
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "ال_مسار:"
 
-#: mail/mail-account-gui.c:1970
-msgid "You may not create two accounts with the same name."
-msgstr "لا يمكنك إنشاء حسابين بالإسم ذاته."
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "البريد إلى %s"
 
-#: mail/mail-autofilter.c:260
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "الموضوع هو %s"
 
-#: mail/mail-autofilter.c:276
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "البريد من %s"
 
-#: mail/mail-autofilter.c:293
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "قائمة %s البريديّة"
 
-#: mail/mail-autofilter.c:317
-#, c-format
-msgid "Replies to %s"
-msgstr "الرّدود على %s"
-
-#: mail/mail-autofilter.c:370
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "إضافة قاعدة مصفاة"
 
-#: mail/mail-autofilter.c:419
-msgid "The following filter rule(s):\n"
-msgstr "قاعدة (أو قواعد) التصفية الآتية:\n"
-
-#: mail/mail-autofilter.c:425
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-"استخدم المجلّد المزاح:\n"
-"····'%s'\n"
-"و تم تحديثه."
-
-#: mail/mail-component.c:214
-msgid "On this Computer"
-msgstr "على هذا الحاسوب"
-
-#: mail/mail-component.c:379
+#: mail/mail-component.c:459
+#, fuzzy, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "حُذف"
+msgstr[1] "حُذف"
+
+#: mail/mail-component.c:461
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d يوم"
+msgstr[1] "%d يوم"
+
+#: mail/mail-component.c:486
+#, fuzzy, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d ثواني"
+msgstr[1] "%d ثواني"
+
+#: mail/mail-component.c:488
+#, fuzzy, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d ثواني"
+msgstr[1] "%d ثواني"
+
+#: mail/mail-component.c:492
+#, fuzzy, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d مراسَلين"
+msgstr[1] "%d مراسَلين"
+
+#: mail/mail-component.c:494
+#, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "رسالة بريديّة جديدة"
 
-#: mail/mail-component.c:380
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_رسالة بريديّة"
 
-#: mail/mail-component.c:381
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "تأليف رسالة بريديّة جديدة"
 
-#: mail/mail-component.c:472
-#, c-format
-msgid ""
-"The following error occured while migrating your mail data:\n"
-"%s"
+#: mail/mail-component.c:669
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "مجلّد _جديد..."
+
+#: mail/mail-component.c:670
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "مصفات البريد"
+
+#: mail/mail-component.c:671
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "إنشاء رزنامة جديدة"
+
+#: mail/mail-component.c:803
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:63
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "الهويّة"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:364
 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:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "جاري تلقي البريد"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:372
 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:384
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "الرجاء الانتقاء من الخيارات التالية"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "جاري إرسال البريد"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:384
 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:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "إدارة الحسابات"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -13133,119 +14981,260 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1090
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "جاري فحص الخدمة"
 
-#: mail/mail-config.c:1168 mail/mail-config.c:1172
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "جاري الاتّصال بالنّادل..."
 
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
-msgstr " _مراجعة عن الأنواع المدعومة "
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
 
-#: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr "(SSL ليس مدعوماً في هذا المركّب من إيفُليوشِن)"
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " Ch_eck for Supported Types "
+msgstr " _مراجعة عن الأنواع المدعومة "
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL ليس مدعوماً في هذا المركّب من إيفُليوشِن)"
 
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "<b>الحالة:</b>"
+
 #: mail/mail-config.glade.h:7
-msgid "A_lso encrypt to self when sending encrypted mail"
-msgstr "_تشفير للذات كذلك عند إرسال البريد المشفّر"
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "<b>الحالة:</b>"
 
 #: mail/mail-config.glade.h:8
-msgid "Account Editor"
-msgstr "محرّر الحسابات"
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Information"
-msgstr "معلومات الحساب"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:11
-msgid "Add Sc_ript"
-msgstr "إضافة مخطو_ط"
+msgid "<span weight=\"bold\">Authentication Type</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add new signature..."
-msgstr "إضافة توقيع جديد..."
+msgid "<span weight=\"bold\">Authentication</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Al_ways encrypt to myself when sending encrypted mail"
-msgstr "تشفير _دائم لي عند إرسال البريد"
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "مراجعة عن بريد جديد"
+
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Composing Messages</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:16
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr "إرسال نسخة كربونيّة _مخفيّة دائماً إلى:"
+msgid "<span weight=\"bold\">Default Behavior</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _carbon-copy (Cc) to:"
-msgstr "إرسال نسخة _كربونيّة دائماً إلى:"
+msgid "<span weight=\"bold\">Delete Mail</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Filter Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">General</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Display</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Message Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:25
+#, fuzzy
+msgid "<span weight=\"bold\">New Mail Notification</span>"
+msgstr "التّبليغ بالبريد الجديد"
+
+#: mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Optional Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Options</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:28
+#, fuzzy
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr "أمن طيب جدا (PGP/GPG)"
+
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Printed Fonts</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Required Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "الرسائل المبعوثة و المسودّات"
+
+#: mail/mail-config.glade.h:34
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:35
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "_تشفير للذات كذلك عند إرسال البريد المشفّر"
+
+#: mail/mail-config.glade.h:36
+msgid "Account Editor"
+msgstr "محرّر الحسابات"
+
+#: mail/mail-config.glade.h:38
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "إضافة توقيع جديد..."
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Add _Script"
+msgstr "إضافة مخطو_ط"
+
+#: mail/mail-config.glade.h:40
+msgid "Al_ways encrypt to myself when sending encrypted mail"
+msgstr "تشفير _دائم لي عند إرسال البريد"
+
+#: mail/mail-config.glade.h:41
+#, fuzzy
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "إرسال نسخة _كربونيّة دائماً إلى:"
+
+#: mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "إرسال نسخة كربونيّة _مخفيّة دائماً إلى:"
+
+#: mail/mail-config.glade.h:44
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "توقيع الرسائل الخارجة _دائما عند إستعمال هذا الحساب"
+
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "وثوق دائم لمفاتيحي عند التشفير"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "إرفاق الرّسالة الأصليّة"
 
-#: mail/mail-config.glade.h:20 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "المُرفق"
 
-#: mail/mail-config.glade.h:21
-msgid "Authentication"
-msgstr "التّوثّق"
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "إدراج آ_لي للتعابير المرسومة"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:49
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "مراجعة آ_لية عن الرسائل كل"
+
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "بلطيق (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "بلطيق (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_رنّة عند مجيء بريد جديد"
+
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "ال_محرف:"
 
-#: mail/mail-config.glade.h:25
-msgid "C_olors"
-msgstr "الأ_لوان"
+#: mail/mail-config.glade.h:54
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " _مراجعة عن الأنواع المدعومة "
 
-#: mail/mail-config.glade.h:26
-msgid "Check _Incoming Mail"
-msgstr "مراجعة البريد ال_داخل"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "تفقّد عن كون البريد الوارد تافه"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:56
 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
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "مراجعة رسائل البريد الداخلة فيما إذا كانت نفاية"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "لون الكلمات المت_هجّأة خطأً:"
 
-#: mail/mail-config.glade.h:31
-msgid "Composing Messages"
-msgstr "جاري تأليف الرسائل"
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Colors"
+msgstr "الأ_لوان"
 
-#: mail/mail-config.glade.h:32
-msgid "Configuration"
-msgstr "الإعدادات"
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "تأ_كيد عند شطب مجلّد"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -13261,288 +15250,276 @@ msgstr ""
 "\n"
 "الرجاء نقر \"تطبيق\" لحفظ تعييناتك."
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "الإ_فتراض"
 
-#: mail/mail-config.glade.h:41
-msgid "Default Behavior"
-msgstr "السّلوك الافتراضي"
-
-#: mail/mail-config.glade.h:42
-msgid "Default character _encoding:"
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Default character e_ncoding:"
 msgstr "_تشفير الحروف الإفتراضي:"
 
-#: mail/mail-config.glade.h:43
-msgid "Deleting Mail"
-msgstr "جاري حذف البريد"
-
-#: mail/mail-config.glade.h:45
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "ت_وقيع الرسائل الخارجة رقميّا (إفتراضا)"
+#: mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Defaults"
+msgstr "الإ_فتراضات"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "عدم اقتباس الرّسالة الأصليّة"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "لا توقيع لطلبات المقابلة (للتوافق مع آوتلوك)"
 
-#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "تم"
 
-#: mail/mail-config.glade.h:49
-msgid "Drafts _folder:"
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Drafts _Folder:"
 msgstr "مجلّد ال_مسوّدات:"
 
-#: mail/mail-config.glade.h:50
-msgid "E_nable"
-msgstr "_تفعيل"
-
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "حسابات البريد الإلكتروني"
 
-#: mail/mail-config.glade.h:52
-msgid "Email _address:"
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Email _Address:"
 msgstr "_عنوان البريد الإلكتروني:"
 
-#: mail/mail-config.glade.h:53
-msgid "Empty _trash folders on exit"
+#: mail/mail-config.glade.h:79
+#, fuzzy
+msgid "Empty trash folders on e_xit"
 msgstr "إفراغ _مجلّدات المهملات عند الإنهاء"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "شهادة الت_شفير:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "مساعد حسابات إيفُليوشِن"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "تنفيذ الأمر..."
 
-#: mail/mail-config.glade.h:57
-msgid "Fi_xed -width:"
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_ثابت العرض:"
 
-#: mail/mail-config.glade.h:58
-msgid "Filter Options"
-msgstr "خيارات المصفاة"
-
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "خصائص الخط"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "تهيئة الملفّات ب_تهيئة HTML"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:87
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_بريد HTML"
+
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Headers"
+msgstr "التّرويسة"
+
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "إبراز الإ_قتباسات بـ"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4·"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "ضمن السّياق"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "كربروس "
 
-#: mail/mail-config.glade.h:67
-msgid "Labels and Colors"
-msgstr "العلامات و الألوان"
-
-#: mail/mail-config.glade.h:69
-msgid "Loading Images"
-msgstr "جاري تحميل الصّور"
-
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "إعدادات البريد"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "موقع صندوق البريد"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "مؤلّف الرّسائل"
 
-#: mail/mail-config.glade.h:74
-msgid "Message Display"
-msgstr "عرض الرّسائل"
-
-#: mail/mail-config.glade.h:75
-msgid "Message Fonts"
-msgstr "خطوط الرّسائل"
-
-#: mail/mail-config.glade.h:77
-msgid "New Mail Notification"
-msgstr "التّبليغ بالبريد الجديد"
-
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr ""
-"ملاحظة: لن تسأل عن كلمة السر حتى تتصل لأوّل مرّة"
-
-#: mail/mail-config.glade.h:80
-msgid "Optional Information"
-msgstr "معلومات خياريّة"
+msgstr "ملاحظة: لن تسأل عن كلمة السر حتى تتصل لأوّل مرّة"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "ال_منظّمة:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "هوية _مفتاح PGP/GPG:"
 
-#: mail/mail-config.glade.h:87
-msgid "Pick a color"
-msgstr "إنتقي لوناً"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_عزف ملف صوتي عند تلقي رسالة جديدة"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "السؤال عند إرسال الرسائل مع تحديد لمتلقّي النسخ الكربونيّة المخفيّة فقط"
 
-#: mail/mail-config.glade.h:89
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr "أمن طيب جدا (PGP/GPG)"
-
-#: mail/mail-config.glade.h:90
-msgid "Printed Fonts"
-msgstr "الخطوط المطبوعة"
-
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "دليل البريد Qmail"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "إقتباس الرسالة الأصليّة"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "مقتبس"
 
-#: mail/mail-config.glade.h:94
-msgid "Re_member this password"
+#: mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Re_member password"
 msgstr "_تذكر كلمة السر هذه"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "رد على:"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "جاري تلقي البريد الإلكتروني"
 
-#: mail/mail-config.glade.h:97
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Receiving Options"
 msgstr "خيارات الت_لقي"
 
-#: mail/mail-config.glade.h:98
-msgid "Remember this _password"
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Remember _password"
 msgstr "تذكر كلمة ال_سر هذه"
 
-#: mail/mail-config.glade.h:99
-msgid "Required Information"
-msgstr "معلومات لازمة"
-
-#: mail/mail-config.glade.h:100
-msgid "Restore Defaults"
-msgstr "الإفتراضات المخزونة"
-
-#: mail/mail-config.glade.h:102
-msgid "S_ecurity"
-msgstr "_الأمن"
+#: mail/mail-config.glade.h:123
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "خط _قياسي:"
 
-#: mail/mail-config.glade.h:103
-msgid "Secure MIME (S/MIME)"
-msgstr "MIME آمن (S/MIME)"
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Security"
+msgstr "_أمن"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "إنتقاء خط HTML الثّابت العرض"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "إنتقاء خط HTML الثّابت العرض للطّباعة"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "إنتقاء خط HTML المتغيّر العرض"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "إنتقاء خط HTML المتغيّر العرض للطّباعة"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:129
+#, fuzzy
+msgid "Select..."
+msgstr "إ_نتقاء..."
+
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "جاري إرسال البريد الإلكتروني"
 
-#: mail/mail-config.glade.h:110
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:133
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "مجلّد ال_رسائل المرسلة:"
 
-#: mail/mail-config.glade.h:111
-msgid "Sent and Draft Messages"
-msgstr "الرسائل المبعوثة و المسودّات"
-
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "يتطلب ال_نادل التوثّق"
 
-#: mail/mail-config.glade.h:113
-msgid "Server Configuration"
-msgstr "إعدادات النّادل"
-
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_نوع النّادل:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "شهادة ال_توقيع:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "التّوقيع:"
+
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "Signatures"
+msgstr "ت_وقيعات"
+
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "تحديد إسم _ملف:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:140
+#, fuzzy
+msgid "Spell Checking"
 msgstr "مراجعة الت_هجأة"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "صندوق بريد mbox يونكس قياسي"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "خط الشاشة ال_طّرفيّة:"
+
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "T_ype: "
+msgstr "النّوع:"
+
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13550,15 +15527,11 @@ msgstr ""
 "اكتب الإسم الذي تريد به الإشارة إلى هذا الحساب.\n"
 "\"عمل\" أو \"شخصي\" مثلا"
 
-#: mail/mail-config.glade.h:126
-msgid "Use _Daemon"
-msgstr "إستخدام _جني"
-
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "عرض _متغيّر:"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13568,315 +15541,890 @@ msgstr ""
 "\n"
 "الرجاء نقر \"تقدم\" للبدأ. "
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "إ_ضافة توقيع"
 
-#: mail/mail-config.glade.h:135
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Always load images from the Internet"
 msgstr "تحميل الصور _دائما خارج الإنترنت"
 
-#: mail/mail-config.glade.h:136
-msgid "_Always sign outgoing messages when using this account"
-msgstr "توقيع الرسائل الخارجة _دائما عند إستعمال هذا الحساب"
-
-#: mail/mail-config.glade.h:137
-msgid "_Authentication Type: "
-msgstr "نوع ال_تّوثق:"
-
-#: mail/mail-config.glade.h:138
-msgid "_Authentication type: "
-msgstr "نوع ال_تّوثق:"
-
-#: mail/mail-config.glade.h:139
-msgid "_Automatically check for new mail every"
-msgstr "مراجعة آ_لية عن الرسائل كل"
-
-#: mail/mail-config.glade.h:140
-msgid "_Automatically insert smiley images"
-msgstr "إدراج آ_لي للتعابير المرسومة"
-
-#: mail/mail-config.glade.h:141
-msgid "_Beep when new mail arrives"
-msgstr "_رنّة عند مجيء بريد جديد"
-
-#: mail/mail-config.glade.h:142
-msgid "_Confirm when expunging a folder"
-msgstr "تأ_كيد عند شطب مجلّد"
-
-#: mail/mail-config.glade.h:143
-msgid "_Default signature:"
-msgstr "التّوقيع الإ_فتراضي:"
-
-#: mail/mail-config.glade.h:144
-msgid "_Defaults"
-msgstr "الإ_فتراضات"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
+msgstr "ت_وقيع الرسائل الخارجة رقميّا (إفتراضا)"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "لا ت_بلغني عند مجيء بريد جديد"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_تفعيل"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_تشفير الرسائل الخارجة (إفتراضا)"
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "أسلوب الت_مرير:"
 
-#: mail/mail-config.glade.h:150
-msgid "_Full name:"
-msgstr "الإسم ال_كامل:"
-
-#: mail/mail-config.glade.h:152
-msgid "_HTML Mail"
-msgstr "_بريد HTML"
-
-#: mail/mail-config.glade.h:154
-msgid "_Identity"
-msgstr "ال_هويّة"
-
-#: mail/mail-config.glade.h:155
-msgid "_Junk"
-msgstr "_نفاية"
-
-#: mail/mail-config.glade.h:156
-msgid "_Load images if sender is in addressbook"
+#: mail/mail-config.glade.h:168
+#, fuzzy
+msgid "_Load images if sender is in address book"
 msgstr "_تحميل الصور إذا كان المرسِل في دفتر العناوين"
 
-#: mail/mail-config.glade.h:157
-msgid "_Local Tests Only"
-msgstr "اختبارات _محليّة فقط"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_جعل هذا حسابي الإفتراضي"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "ت_عليم الرسائل على أنها قُرأت بعد"
 
-#: mail/mail-config.glade.h:160
-msgid "_Name:"
-msgstr "الإ_سم:"
-
-#: mail/mail-config.glade.h:161
-msgid "_Never load images off the net"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Never load images from the Internet"
 msgstr "_لا تحميل للصور خارج الإنترنت بتاتا"
 
-#: mail/mail-config.glade.h:163
-msgid "_Play sound file when new mail arrives"
-msgstr "_عزف ملف صوتي عند تلقي رسالة جديدة"
-
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
-msgid "_Receiving Mail"
-msgstr "جاري _تلقي البريد"
-
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "أسلوب ال_رد:"
 
-#: mail/mail-config.glade.h:168
-msgid "_Restore defaults"
-msgstr "إسترجاع الإ_فتراضات"
-
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_مخطوط:"
 
-#: mail/mail-config.glade.h:170
-msgid "_Select..."
-msgstr "إ_نتقاء..."
-
-#: mail/mail-config.glade.h:171
-msgid "_Sending Mail"
-msgstr "جاري إ_رسال البريد"
-
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "إ_ظهار الصور المتحركة"
 
-#: mail/mail-config.glade.h:173
-msgid "_Signatures"
-msgstr "ت_وقيعات"
-
-#: mail/mail-config.glade.h:174
-msgid "_Standard Font:"
-msgstr "خط _قياسي:"
-
-#: mail/mail-config.glade.h:175
-msgid "_Terminal Font:"
-msgstr "خط الشاشة ال_طّرفيّة:"
-
-#: mail/mail-config.glade.h:176
-msgid "_Use secure connection (SSL):"
+#: mail/mail-config.glade.h:179
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "إ_ستعمال إتصال آمن (SSL):"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:181
+msgid "color"
+msgstr "اللّون"
+
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "الوصف"
 
-#: mail/mail-folder-cache.c:776
-#, c-format
-msgid "Pinging %s"
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
 msgstr ""
 
-#: mail/mail-mt.c:260
-#, c-format
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "موارد المجلّدات الاعتباطية"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "مقبول"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "ت_م"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "حسّاس للحالة"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "إيجاد:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "إشتراكات المجلّدات"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "اتفاق على المفتاح"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "النّا_دل:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "معلومات الأمن"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
-"Error while '%s':\n"
-"%s"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "تاريخ الإ_ستحقاق:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "ال_علم:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_اشتراك"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "إل_غاء الإشتراك"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "مجلّدات محدّدة فقط"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "مع كل المجلّدات النّشطة عن بعد"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "مع كل المجلّدات المحلّية و النّشطة عن بعد"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "مع كل المجلّدات المحلّيّة"
+
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "توثّق SMTP"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "نادل SMTP %s لا يدعم فئة التّوثّق المطلوبة %s."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "هل تريد فعلاً حذف هذا الحساب؟"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
+msgid "_Send"
+msgstr "إرسال"
+
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "مسائلة المستخدم عندما يحاول إرسال رسالةٍ دون موضوع."
+
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "هل تريد فعلاً حذف خانة السّجل هذه `%s'؟"
+
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+#, fuzzy
+msgid "Use default drafts folder?"
+msgstr "مسار مجلّد المراسَلين الإفتراضي"
+
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"لم يمكن فتح مجلّد المسوّدات لهذا الحساب.\n"
+"هل تود استخدام مجلّد المسوّدات الافتراضي؟"
+
+#: mail/mail-errors.xml.h:41
+#, fuzzy
+msgid "Use _Default"
+msgstr "الإفتراض"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "إزالة جميع الرّسائل المحذوفة من هذا المجلّد نهائيّاً"
+
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+#: mail/mail-errors.xml.h:46
+#, fuzzy
+msgid "_Expunge"
+msgstr "_شطب"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
+
+#: mail/mail-errors.xml.h:51
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "إفراغ _سلّة المهملات"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
+
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+#, fuzzy
+msgid "Error while {0}."
 msgstr ""
 "خطأ أثناء '%s':\n"
 "%s"
 
-#: mail/mail-mt.c:263
-#, c-format
-msgid ""
-"Error while performing operation:\n"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+#, fuzzy
+msgid "Error while performing operation."
+msgstr "خطأ أثناء فتح الرُّزنامة"
+
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+#, fuzzy
+msgid "Enter password."
+msgstr "أدخل كلمة السّر"
+
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"خطأ أثناء تحميل معلومات المصفاة:\n"
+"%s"
+
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "لا يمكن إنشاء الدّليل `%s': %s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "لم يمكن إنشاء الدليل المؤقّت: %s"
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "الملف موجود أصلاً، هل أنمقه؟"
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "الملف '%s' غير موجود أو أنّه ليس ملفّاً اعتياديّاً."
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"لا يمكن حذف المجلّد:\n"
 "%s"
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "لا يمكن إعادة تسمية الدّليل: %s: لا مجلّد بهذا الإسم"
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "حذف \"%s\""
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "هل تريد فعلاً حذف المجلّد \"%s\" و كل مجلّداته الفرعيّة؟"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "هناك مجلّد بالإسم \"%s\" موجود أصلاً. الرجاء استعمال إسم آخر."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "لا يمكن فتح الملف"
+
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
+msgid "Cannot save changes to account."
+msgstr "و مراسَل آخر."
+
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "لم تكتب جميع المعلومات المطلوبة."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "لا يمكنك إنشاء حسابين بالإسم ذاته."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "حذف المراسَلين المنتقَيين"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+#, fuzzy
+msgid "Are you sure you want to delete this account?"
+msgstr ""
+"هل أنت متأكّد أنّك تريد\n"
+"حذف هذا المراسَل؟"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+#: mail/mail-errors.xml.h:169
+#, fuzzy
+msgid "Don't delete"
+msgstr "_تراجع عن الحذف"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "لم يمكن فتح المجلّد المشترك: %s."
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr ""
+
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "لم يمكن فتح المجلّد المشترك: %s."
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "تجا_هل التّغييرات"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "هل تريد حفظ التّغييرات؟"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"لقد غيّر هذا الحدث، و لكنّه لم يحفظ.\n"
+"\n"
+"هل تود حفظ تغييراتك؟"
+
+#: mail/mail-errors.xml.h:184
+#, fuzzy
+msgid "_Discard changes"
+msgstr "تجا_هل التّغييرات"
+
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "الملف `%s' غير موجود."
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: mail/mail-mt.c:903
-msgid "Working"
-msgstr "شاغل"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+#, fuzzy
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
+
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"استخدم المجلّد المزاح:\n"
+"····'%s'\n"
+"و تم تحديثه."
+
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"استخدم المجلّد المزاح:\n"
+"····'%s'\n"
+"و تم تحديثه."
+
+#. mail:no-folder primary
+#: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "تحديث إجتماع"
 
-#: mail/mail-ops.c:88
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "يجب تحديد مجلّد."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "يجب ان تسمي المجلدا الاعتباطي هذا."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "لم يتم اختيار أي نادل"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+
+#: mail/mail-errors.xml.h:230
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "تنميق"
+
+#: mail/mail-errors.xml.h:232
+#, fuzzy
+msgid "_Append"
+msgstr "_فتح"
+
+#: mail/mail-folder-cache.c:785
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "جاري تصفية الدّليل"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "جاري سحب البريد"
 
-#: mail/mail-ops.c:558
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "فشل تطبيق مصفات الإخراج: %s"
 
-#: mail/mail-ops.c:579
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:588
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:630
-#, c-format
-msgid "Sending \"%s\""
-msgstr "جاري إرسال \"%s\""
-
-#: mail/mail-ops.c:748
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "جاري إرسال الرسالة %d من %d"
 
-#: mail/mail-ops.c:767
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "فشل عند الرسالة %d من أصل·%d"
+#: mail/mail-ops.c:703
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "فشل عند الرّسالة %d من أصل %d"
 
-#: mail/mail-ops.c:769
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "تم."
 
-#: mail/mail-ops.c:863
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "جاري حفظ الرّسالة في المجلّد"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "جاري نقل الرسائل إلى %s"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "جاري نسخ الرسائل إلى %s"
 
-#: mail/mail-ops.c:1057
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "جاري مسح الرسائل في \"%s\""
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "الرسائل الممرّرة"
 
-#: mail/mail-ops.c:1303
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "جاري فتح المجلّد %s"
 
-#: mail/mail-ops.c:1375
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "جاري فتح المخزن %s"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "جاري إزالة المجلّد %s"
 
-#: mail/mail-ops.c:1547
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "جاري تخزين المجلّد '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1467
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: mail/mail-ops.c:1468
+#, fuzzy, c-format
+msgid "Storing account '%s'"
+msgstr "جاري تخزين المجلّد '%s'"
+
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "جاري تحديث المجلّد"
 
-#: mail/mail-ops.c:1634 mail/mail-ops.c:1685
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "جاري شطب المجلّد"
 
-#: mail/mail-ops.c:1682
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "جاري إفراغ سلة المهملات في '%s'"
 
-#: mail/mail-ops.c:1683
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "مجلّدات محلّيّة"
 
-#: mail/mail-ops.c:1766
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "جاري سحب الرسالة %s"
 
-#: mail/mail-ops.c:1838
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "جاري سحب %d رسائل"
+#: mail/mail-ops.c:1763
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "جاري سحب %d رسائل"
+msgstr[1] "جاري سحب %d رسائل"
 
-#: mail/mail-ops.c:1922
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "جاري حفظ %d رسائل"
+#: mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "جاري حفظ %d رسائل"
+msgstr[1] "جاري حفظ %d رسائل"
 
-#: mail/mail-ops.c:1970
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13885,169 +16433,129 @@ msgstr ""
 "لم يمكن إنشاء ملف الإخراج: %s\n"
 "·%s"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2069
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "جاري حفظ المُرفق"
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2116
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "لم يمكن كتابة البيانات: %s"
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2264
+#: mail/mail-ops.c:2168
 #, 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 "حسّاس للحالة"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "إيجاد:"
-
-#: mail/mail-search.glade.h:5
-msgid "Search"
-msgstr "بحث"
-
-#: 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
+#: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "جاري الإلغاء..."
 
-#: mail/mail-send-recv.c:253
+#: mail/mail-send-recv.c:264
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "النادل: %s، النوع: %s"
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:266
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "المسار: %s، النوع: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:268
 #, c-format
 msgid "Type: %s"
 msgstr "النوع: %s"
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "إرسال و تلقي البريد"
 
-#: mail/mail-send-recv.c:307
+#: mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "إلغاء ال_كل"
 
-#: mail/mail-send-recv.c:388
+#: mail/mail-send-recv.c:412
 msgid "Updating..."
 msgstr "جاري التّحديث..."
 
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "جاري الإنتظار..."
 
-#: mail/mail-session.c:234
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:267
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ادخل كلمة السر لـ %s"
 
-#: mail/mail-session.c:269
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "أدخل كلمة السّر"
 
-#: mail/mail-session.c:292
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:293
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_تذكُّر كلمة السّر هذه لبقيّة الجلسة"
 
-#: mail/mail-signature-editor.c:80
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr ""
-
-#: mail/mail-signature-editor.c:226
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: mail/mail-signature-editor.c:229
-msgid "_Discard changes"
-msgstr ""
-
-#: mail/mail-signature-editor.c:233
-msgid "Save signature"
-msgstr "حفظ التّوقيع"
-
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr "تحرير التّوقيع"
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr "ادخل إسما لهذا التوقيع."
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "الإسم:"
 
-#: mail/mail-tools.c:271
+#: mail/mail-tools.c:114
+#, fuzzy, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr ""
+"لم يمكن إنشاء المجلّد `%s':\n"
+"%s"
+
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
+#: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:273
+#: mail/mail-tools.c:278
 msgid "Forwarded message"
 msgstr ""
 
-#: mail/mail-tools.c:313
+#: mail/mail-tools.c:319
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr ""
@@ -14057,102 +16565,89 @@ msgstr ""
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:205
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
-
-#: mail/mail-vfolder.c:463
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "جاري تخزين المجلّد '%s'"
 
-#: mail/mail-vfolder.c:774
-msgid "VFolders"
-msgstr ""
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "جاري تخزين المجلّد '%s'"
 
-#: mail/mail-vfolder.c:833
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:872
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:892
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr ""
-
-#: mail/mail-vfolder.c:964
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:904
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "غير مراجع"
 
-#: mail/message-list.c:905
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "روجع"
 
-#: mail/message-list.c:906
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "مجاب"
 
-#: mail/message-list.c:907
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "رسائل غير مراجعة متعدّد"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "رسائل متعدّدة"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "الأدنى"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "أدنى"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "أعلى"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "الأعلى"
 
-#: mail/message-list.c:1241
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "؟"
 
-#: mail/message-list.c:1248
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "اليوم %l:%M %p"
 
-#: mail/message-list.c:1257
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "الأمس %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3082
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "جاري إنشاء قائمة الرسائل"
 
@@ -14184,355 +16679,171 @@ msgstr ""
 msgid "Size"
 msgstr "الحجم"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "نداء"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "لا تمرير"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "متابعة"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "لمعلوماتك"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "تمرير"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "لا داعي للرّد"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:83
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "رد"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:84
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "رد على الجميع"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
-
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "ت_م"
-
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "المتن يحتوي"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due by:"
-msgstr ""
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "المتن لا يحتوي"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "ال_علم:"
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "المتن أو الموضوع يحتوي"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "إشتراكات المجلّدات"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "الرّسالة تحتوي"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr ""
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "المستلمون يحتوون"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "النّا_دل:"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "المرسِل يحتوي"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_اشتراك"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "الموضوع يحتوي"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "إل_غاء الإشتراك"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+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:4
-msgid "Folder Settings"
-msgstr "تعيينات المجلّد"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "افُليوشِن"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "مكوّن مهام إيفُليوشِن"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: 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
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "إرتفاع النّافذة الإفتراضي"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "عرض النّافذة الإفتراضي"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 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
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 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
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 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"
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "بريد"
 
-#: shell/e-setup.c:144
-msgid "Could not update files correctly"
-msgstr "لم يمكن تحديث الملفّات بشكلٍ صحيح"
-
-#: shell/e-setup.c:165
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-
-#: shell/e-setup.c:176
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "قدّم لكم من طرف"
-
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr ""
-
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr "إنتقاء المجلّد الإفتراضي"
-
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr "المجلّدات الإفتراضيّة"
-
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr ""
-
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "لا يمكن نسخ المجلّد: %s"
-
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "لا يمكن نقل الملف فوق نفسه."
-
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "لا يمكن نسخ الملف فوق نفسه."
-
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "نسخ مجلّد"
-
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "نقل المجلّد"
-
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"لا يمكن حذف المجلّد:\n"
-"%s"
-
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:489
-#, c-format
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-"لا يمكن إعادة تسمية المجلّد:\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 ""
-
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr ""
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "الإتّصالات النّشطة"
 
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"لا يمكن نقل المجلّد:\n"
-"%s"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "الإتّصالات النّشطة"
 
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"لا يمكن إنشاء المجلّد المحدّد:\n"
-"%s"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+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:138
+#: shell/e-shell-importer.c:146
 msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:149
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -14541,11 +16852,16 @@ msgid ""
 "to work it out."
 msgstr ""
 
-#: shell/e-shell-importer.c:147 shell/e-shell-startup-wizard.c:731
+#: shell/e-shell-importer.c:155
+#, fuzzy
+msgid "Choose the destination for this import"
+msgstr "إلغاء الإجتماع لهذا العنصر"
+
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:161
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -14553,89 +16869,69 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:218 shell/e-shell-importer.c:249
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item %d."
 msgstr ""
 
-#: shell/e-shell-importer.c:322
+#: shell/e-shell-importer.c:333
 msgid "Select importer"
 msgstr "انتقي المستورد"
 
-#: shell/e-shell-importer.c:463
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "الملف %s·غير موجود"
 
-#: 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:480
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-importer.c:489
+#: shell/e-shell-importer.c:459
 msgid "Importing"
 msgstr "جاري استيراد"
 
-#: shell/e-shell-importer.c:496
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"جاري استيراد.\n"
-"جاري بدأ %s"
-
-#: shell/e-shell-importer.c:508
-#, c-format
-msgid "Error starting %s"
-msgstr "خطأ عند بدأ تشغيل %s"
+#: shell/e-shell-importer.c:467
+#, fuzzy, c-format
+msgid "Importing %s.\n"
+msgstr "جاري استيراد"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "خطأ عند تحميل %s"
 
-#: shell/e-shell-importer.c:539
+#: shell/e-shell-importer.c:495
 #, c-format
 msgid ""
 "Importing %s\n"
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:593
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "تلقائي"
 
-#: shell/e-shell-importer.c:642
-msgid "_Filename:"
-msgstr "إ_سم الملف:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "إسم الملف:"
 
-#: shell/e-shell-importer.c:647
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "إنتقاء ملف"
 
-#: shell/e-shell-importer.c:657
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_نوع الملف:"
 
-#: shell/e-shell-importer.c:683
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:686
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "إستيراد ملف _وحيد"
 
-#: shell/e-shell-importer.c:754 shell/e-shell-startup-wizard.c:560
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -14643,62 +16939,42 @@ msgstr ""
 "الرجاء الإنتظار...\n"
 "جاري المسح عن التعيينات الموجودة"
 
-#: shell/e-shell-importer.c:757
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:883 shell/e-shell-startup-wizard.c:686
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "من %s:"
 
-#: shell/e-shell-importer.c:1061
-msgid "Select a destination folder for importing this data"
-msgstr ""
+#: shell/e-shell-importer.c:1073
+#, fuzzy, c-format
+msgid "No importer available for file %s"
+msgstr "لا مُقدّم متوفّر للبرتوكول `%s'"
 
-#: shell/e-shell-importer.c:1190
+#: shell/e-shell-importer.c:1085
+#, fuzzy
+msgid "Unable to execute importer"
+msgstr "فشل تنفيذ gpg."
+
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "إ_ستيراد"
 
-#: shell/e-shell-offline-handler.c:596
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "جاري غلق الإتصالات..."
 
-#: shell/e-shell-settings-dialog.c:346
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "إعدادات إيفُليوشِن"
 
-#. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
-#: shell/e-shell-shared-folder-picker-dialog.c:281
-msgid "Please select a user."
-msgstr "الرجاء انتقاء مستخدم."
-
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr "جاري فتح المجلّد"
-
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr "جاري فتح المجلّد \"%s\""
-
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr "في \"%s\"·..."
-
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr "لم يمكن فتح المجلّد المشترك: %s."
-
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr "لم يمكن ايجاد المجلّد المشترك المحدّد."
+#: shell/e-shell-startup-wizard.c:575
+msgid "Starting import"
+msgstr "بدأ الإستيراد"
 
-#: shell/e-shell-startup-wizard.c:778
+#: shell/e-shell-startup-wizard.c:795
 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 "
@@ -14707,10 +16983,6 @@ msgid ""
 "Do you want to quit using the Assistant now?"
 msgstr ""
 
-#: shell/e-shell-startup-wizard.c:789
-msgid "Quit Assistant"
-msgstr "إنهاء المساعد"
-
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "لم يحدَّد إسم مجلّد."
@@ -14731,329 +17003,109 @@ msgstr "لا يمكن أن يحتوي إسم المجلّد الرمز·\"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.'·و '..'·أسماء مجلّدات محجوزة."
 
-#: shell/e-shell-view-menu.c:89 shell/e-shell-window-commands.c:58
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:97 shell/e-shell-window-commands.c:66
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "خطأ تنفيذ %s."
 
-#: shell/e-shell-view-menu.c:193 shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "باك بدي ليس مثبّتاً"
 
-#: shell/e-shell-view-menu.c:201 shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "لم يمكن تشغيل باك بدي."
 
-#: shell/e-shell-view-menu.c:247 shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
-msgstr "حول زيميان إيفُليوشِن"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Go to folder..."
-msgstr "إذهب إلى المجلّد..."
-
-#: shell/e-shell-view-menu.c:503
-msgid "Select the folder that you want to open"
-msgstr "إنتقاء المجلّد الذي تود فتحه"
-
-#: shell/e-shell-view-menu.c:617
-msgid "Create New Shortcut"
-msgstr "إنشاء مختصر جديد"
-
-#: shell/e-shell-view-menu.c:618
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "انتقي المجلّد الذي تريد المختصر أن يؤشر إليه:"
+#: shell/e-shell-window-commands.c:322
+msgid "Groupware Suite"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:769 shell/e-shell-window-commands.c:314
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:782 shell/e-shell-window-commands.c:327
-#: ui/evolution.xml.h:34
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:795 shell/e-shell-window-commands.c:340
-#: ui/evolution.xml.h:20
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:324
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "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."
+#: shell/e-shell-window.c:344
+msgid "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-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"زيميان افليوشن غير متصل بالانترنت حاليا.  انقر هذا الزر للعمل على اتصال "
+"بالإنترنت."
+
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "البريد إلى %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/e-shell.c:1003
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "خطأ مجهول"
+
+#: shell/e-shell.c:1131
 msgid "Invalid arguments"
 msgstr "معطيات غير سليمة"
 
-#: shell/e-shell.c:1005
+#: shell/e-shell.c:1133
 msgid "Cannot register on OAF"
 msgstr "لم يمكن تسجيل OAF"
 
-#: shell/e-shell.c:1007
+#: shell/e-shell.c:1135
 msgid "Configuration Database not found"
 msgstr "لم يعثر على قاعدة بيانات الإعداد"
 
-#: shell/e-shell.c:1009
+#: shell/e-shell.c:1137
 msgid "Generic error"
 msgstr "خطأ عام"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "إنشاء مجموعة مختصرات جديدة"
-
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "إسم المجموعة:"
-
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr "هل حقا تريد حذف المجموعة \"%s\" من عمود المختصرات هذا؟"
-
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "إعادة تسمية مجموعة المختصرات"
-
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "إعادة تسمية مجموعة المختصرات المنتقاة لـ:"
-
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "أيقونات _صغيرة"
-
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "عرض المختصرات كأيقونات صغيرة"
-
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "أيقونات _عريضة"
-
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "عرض المختصرات كأيقونات عريضة"
-
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "إ_ضافة مجموعة..."
-
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "إنشاء مجموعة مختصرات جديدة"
-
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "_حذف هذه المجموعة..."
-
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "حذف مجموعة المختصرات هذه"
-
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "إ_عادة تسمية هذه المجموعة..."
-
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "إعادة تسمية مجموعة المختصرات هذه"
-
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "إ_خفاء عمود المختصرات"
-
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "أخفاء عمود المختصرات"
-
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "إنشاء مختصرات إ_فتراضيّة"
-
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "إنشاء مختصرات إفتراضيّة"
-
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "إعادة تسمية المختصر"
-
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "إعادة تسمية المختصر المنتقى إلى:"
-
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "فتح المجلّد الموصول بهذا المختصر"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open in New _Window"
-msgstr "فتح في _نافذة جديدة"
-
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "فتح المجلد الموصول بهذا المختصر في نافذة جديدة"
-
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "إعادة تسمية هذا المختصر"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "إ_زالة"
-
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "إزالة هذا المختصر من عمود المختصرات."
-
-#: shell/e-shortcuts.c:650
-msgid "Error saving shortcuts."
-msgstr "خطأ أثناء حفظ المختصرات."
-
-#: shell/e-shortcuts.c:1085
-msgid "Inbox"
-msgstr "صندوق البريد الداخل"
-
-#: shell/e-shortcuts.c:1097
-msgid "Shortcuts"
-msgstr "المختصرات"
-
-#: shell/e-task-widget.c:211
-#, c-format
-msgid "%s (...)"
-msgstr "%s·(...)"
-
-#: shell/e-task-widget.c:216
-#, c-format
-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
+#: shell/e-user-creatable-items-handler.c:691
 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 ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"خطأ مجهول."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"خطأ من نظام المكوّنات هو::\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"خطأ نظام التنشيط هو:\n"
-"%s"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr "الإتّصالات النّشطة"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "انقر موافق لغلق هذه الإتصلات و لتكون غير متصل بالإنترنت"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "الإتصالات التالية نشطة حاليا:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "الر_زنامة:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "م_راسَلين:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_بريد:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_مهام:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_نوع المجلّد:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "فتح مجلّدات مستخدمين آخرين"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "ال_حساب:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "إ_سم المجلّد:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "ال_مستخدم:"
-
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "مساعد ضبط افُليوشِن"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "جاري إستيراد الملفات"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "المنطقة الزّمنيّة "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "مرحبا"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -15062,7 +17114,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -15070,6 +17122,21 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "مهمّة جديدة"
+
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "إختبار"
+
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "إنشاء مهمّةً جديدة"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "انقر \"استيراد\" لبدأ استيراد الملف إلى افُليوشِن"
@@ -15079,64 +17146,65 @@ msgid "Evolution Import Assistant"
 msgstr "مساعد الإستيراد لافُليوشِن"
 
 #: shell/importer/import.glade.h:3
-msgid "Import File (step 3 of 3)"
-msgstr "إستيراد ملف (الخطوة الثالثة من ثلاث)"
+#, fuzzy
+msgid "Import File"
+msgstr "جاري إستيراد الملفات"
 
 #: shell/importer/import.glade.h:4
-msgid "Importer Type (step 1 of 3)"
-msgstr "نوع المستورد (الخطوة الأولى من ثلاث)"
+#, fuzzy
+msgid "Import Location"
+msgstr "جاري استيراد"
 
 #: shell/importer/import.glade.h:5
-msgid "Select Importers (step 2 of 3)"
-msgstr "إنتقاء المستوردين (الخطوة الثانية من ثلاث)"
+#, fuzzy
+msgid "Importer Type"
+msgstr "المستوردين"
 
 #: shell/importer/import.glade.h:6
-msgid "Select a File (step 2 of 3)"
-msgstr "إنتقاء ملف (الخطوة الثانية من ثلاث)"
+#, fuzzy
+msgid "Select Importers"
+msgstr "انتقي المستورد"
 
 #: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File"
+msgstr "إنتقاء ملف"
+
+#: shell/importer/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of\n"
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:189
+#: shell/importer/intelligent.c:193
 msgid "Importers"
 msgstr "المستوردين"
 
-#: shell/importer/intelligent.c:191 smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "استيراد"
 
-#: shell/importer/intelligent.c:195
+#: shell/importer/intelligent.c:199
 msgid "Don't import"
 msgstr "لا تستورد"
 
-#: shell/importer/intelligent.c:199
+#: shell/importer/intelligent.c:203
 msgid "Don't ask me again"
 msgstr "لا تسألني مجدّداً"
 
-#: shell/importer/intelligent.c:207
+#: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
 msgstr "يمكن لافُليوشِن استيراد البيانات من الملفات الحالية:"
 
-#: shell/main.c:114 shell/main.c:559
-msgid "Evolution"
-msgstr "افُليوشِن"
-
-#: shell/main.c:120
-msgid "Evolution is now exiting ..."
-msgstr "جاري إنهاء افُليوشِن..."
-
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:270
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of 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"
@@ -15150,56 +17218,48 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:294
+#: shell/main.c:249
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "شكراً\n"
 "فريق زيميان إيفُليوشِن\n"
 
-#: shell/main.c:302
+#: shell/main.c:256
 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:411
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "لم يمكن النفاذ إلى هيكل زيميان افُليوشِن."
-
-#: shell/main.c:420
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "لم يمكن تشغيل هيكل زيميان افُليوشِن: %s"
-
-#: shell/main.c:526
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "بدأ افليوشن بتنشيط المكوّن المحدّد"
 
-#: shell/main.c:528
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "بدأ دون اتصال بالإنترنت"
 
-#: shell/main.c:530
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "بدأ على اتصال بالإنترنت"
 
-#: shell/main.c:533
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "إجبار غلق جميع مكونات افُليوشِن"
 
-#: shell/main.c:536
+#: shell/main.c:472
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
+
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "إرسال معلومات إخراج التنقيح لجميع المكوّنات لملف."
 
-#: shell/main.c:563
+#: shell/main.c:502
+msgid "Evolution"
+msgstr "افُليوشِن"
+
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15208,40 +17268,144 @@ msgstr ""
 "%s: لا يمكن استعمال --online و --offline سويّةً.\n"
 "  إستعمل %s --help لمزيد من المعلومات.\n"
 
-#: smime/gui/certificate-manager.c:122 smime/gui/certificate-manager.c:238
-#: smime/gui/certificate-manager.c:395
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "جاري الإتّصال"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "لم يمكن تشغيل نادل وُمْبَت"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "مساعد حسابات إيفُليوشِن"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 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
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "إسم الشّهادة"
 
-#: smime/gui/certificate-manager.c:162 smime/gui/certificate-manager.c:329
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "الأغراض"
 
-#: smime/gui/certificate-manager.c:168 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:512
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "الرّقم التّسلسلي"
 
-#: smime/gui/certificate-manager.c:174
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "تنتهي صلاحيتها"
 
-#: smime/gui/certificate-manager.c:323
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "عنوان البريد الالكتروني"
 
-#: smime/gui/certificate-viewer.c:281
+#: smime/gui/certificate-viewer.c:334
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "عارض الشهادات: %s"
 
+#: smime/gui/component.c:45
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "ادخل كلمة السر لـ %s"
+
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "%s أدخل كلمة السّر لـ %s·(المستخدم %s)"
+
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "أدخل كلمة السّر"
+
 #. FIXME: add serial no, validity date, uses
-#: smime/gui/e-cert-selector.c:116
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -15250,7 +17414,7 @@ msgstr ""
 "أصدر لـ:\n"
 "  الموضوع: %s\n"
 
-#: smime/gui/e-cert-selector.c:117
+#: smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -15259,6 +17423,11 @@ msgstr ""
 "صادر من طرف:\n"
 "  الموضوع: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "شهادة عميل SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ليس جزءً من الشّهادة>"
@@ -15313,7 +17482,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1019
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "شهادة"
 
@@ -15333,19 +17502,23 @@ msgstr "الإسم المتداول (CN)"
 msgid "Contact Certificates"
 msgstr "شهادات المراسَل"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "هل تريد الوثوق بـ \"%s\" للأغراض التّالية؟"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "نافذة زائفة فقط"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "تحرير"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "سلطة شهادة البريد الإلكتروني"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "شهادة مستلِم البريد الإلكتروني"
@@ -15378,257 +17551,270 @@ msgstr "وحدة المنظّمة (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "بصمة SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:761
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "شهادة عميل SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:765
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "شهادة نادل SSL"
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "عرض"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "عرض الشّهادة"
+msgid "View"
+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:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "لديك شهادات مسجّلة تميز سلطات الشّهادات التّالية:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "لديك شهادات مسجّلة تميز هؤلاء الأشخاص:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "شهاداتك"
 
-#: smime/lib/e-cert-db.c:494
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "الشّهادة موجودة أصلاً"
 
-#: smime/lib/e-cert.c:229 smime/lib/e-cert.c:239
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:473
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "التّوقيع"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "مشفّرة"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "النّسخة"
 
-#: smime/lib/e-cert.c:488
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "النّسخة 1"
 
-#: smime/lib/e-cert.c:491
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "النّسخة 2"
 
-#: smime/lib/e-cert.c:494
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "النّسخة 3"
 
-#: smime/lib/e-cert.c:576
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 بتشفير·RSA"
 
-#: smime/lib/e-cert.c:579
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS·#1·MD5·بتشفير RSA"
 
-#: smime/lib/e-cert.c:582
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS·#1·SHA-1·بتشفير RSA"
 
-#: smime/lib/e-cert.c:585
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:588
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:591
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:594
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:597
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:600
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:603
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:606
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:609
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "تشفير PKCS·#1·RSA"
 
-#: smime/lib/e-cert.c:612
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "إستخدام مفتاح الشّهادة"
 
-#: smime/lib/e-cert.c:615
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "نوع شهادة نتْسكيب"
 
-#: smime/lib/e-cert.c:618
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "مميّز مفتاح سلطة الشّهادة"
 
-#: smime/lib/e-cert.c:621
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "هوية المستخدم (UID)"
 
-#: smime/lib/e-cert.c:630
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "مميّز الجسم (%s)"
 
-#: smime/lib/e-cert.c:681
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "مميّز الألغورذم"
 
-#: smime/lib/e-cert.c:689
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "معطيات الألغورذم"
 
-#: smime/lib/e-cert.c:711
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "معلومات مفتاح الموضوع العام"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "ألغورذم مفتاح الموضوع العام"
 
-#: smime/lib/e-cert.c:731
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "مفتاح الموضوع العام"
 
-#: smime/lib/e-cert.c:752 smime/lib/e-cert.c:801
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "خطأ: لم يمكن معالجة الإمتداد"
 
-#: smime/lib/e-cert.c:773 smime/lib/e-cert.c:785
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "موقّع الجسم"
 
-#: smime/lib/e-cert.c:777
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "سلطة شهادة SSL"
 
-#: smime/lib/e-cert.c:781
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "سلطة شهادة البريد الإلكتروني"
 
-#: smime/lib/e-cert.c:809
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "التّوقيع"
 
-#: smime/lib/e-cert.c:813
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:817
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:821
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:825
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "اتفاق على المفتاح"
 
-#: smime/lib/e-cert.c:829
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "مُوقّع الشّهادة"
 
-#: smime/lib/e-cert.c:833
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "موقّع CRL"
 
-#: smime/lib/e-cert.c:881
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "حرِج"
 
-#: smime/lib/e-cert.c:883 smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "غير حرِج"
 
-#: smime/lib/e-cert.c:907
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "امتدادات"
 
-#: smime/lib/e-cert.c:978
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1034 smime/lib/e-cert.c:1154
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "ألغورذم توقيع الشّهادة"
 
-#: smime/lib/e-cert.c:1043
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "المُصدر"
 
-#: smime/lib/e-cert.c:1097
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "الهويّة الفريدة للمُصدر"
 
-#: smime/lib/e-cert.c:1116
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "الهويّة الفريدة للموضوع"
 
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "قيمة توقيع الشّهادة"
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "كلمة سر ملف PKCS12"
 
-#: smime/lib/e-pkcs12.c:246
+#: smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "إدخال كلمة السّر لملف PKCS12:"
 
-#: smime/lib/e-pkcs12.c:379
+#: smime/lib/e-pkcs12.c:365
 msgid "Imported Certificate"
 msgstr "شهادة مستوردة"
 
@@ -15659,12 +17845,12 @@ msgstr "العنوان الإفتراضي للرّسالة."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "لم يمكن تنفيذ '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "جاري إطفاء %s (%s)\n"
@@ -15681,7 +17867,7 @@ msgstr "نسخ المنتقى"
 msgid "Copy to Folder..."
 msgstr "نسخ للمجلّد..."
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:4
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "قص المنتقى"
 
@@ -15697,7 +17883,7 @@ msgstr "نقل المراسَل (أو المراسَلين) لمجلّد آخر.
 msgid "Move to Folder..."
 msgstr "نقل للمجلّد..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:20
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "لصق الحافظة الوسيطة"
 
@@ -15705,9 +17891,9 @@ msgstr "لصق الحافظة الوسيطة"
 msgid "Previews the contacts to be printed"
 msgstr "معاينة المراسَلين الذين سيُطبعون"
 
-#: 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
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "_معاينة قبل الطّباعة"
 
@@ -15728,7 +17914,8 @@ msgid "Select all contacts"
 msgstr "إنتقاء جميع المراسَلين"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "إرسال رسالة للمراسَلين المنتقَيين."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -15740,56 +17927,58 @@ msgid "Send selected contacts to another person."
 msgstr "إرسال المراسَلين المختارين لشخص آخر."
 
 #: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Show contact preview window"
+msgstr "إظهار نافذة معاينة الرّسائل"
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "توقّف"
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr "إيقاف التّحميل"
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr "عرض المراسَل الحالي"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:34
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
 #: 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-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: 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
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "إ_جراءات"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_تمرير المراسَل..."
 
-#: ui/evolution-addressbook.xml.h:35
+#: ui/evolution-addressbook.xml.h:36
 msgid "_Move to Folder..."
 msgstr "_نقل للمجلّد..."
 
-#: ui/evolution-addressbook.xml.h:39
-msgid "_Save as VCard"
-msgstr "_حفظ كفِيكارد"
-
-#: ui/evolution-addressbook.xml.h:40
-msgid "_Search for Contacts"
-msgstr "_بحث عن مراسَلين"
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+msgid "_Preview Pane"
+msgstr "لوح ال_معاينة"
 
 #: ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "_حفظ كفِيكارد"
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "إ_ختيار الكل"
 
-#: ui/evolution-addressbook.xml.h:42
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr "إرسال _رسالة للمراسَل..."
 
-#: ui/evolution-calendar.xml.h:3
-msgid "Create a new calendar"
-msgstr "إنشاء رزنامة جديدة"
-
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "اليوم"
 
@@ -15822,78 +18011,110 @@ msgid "Go forward"
 msgstr "تقدُّم إلى الأمام"
 
 #: ui/evolution-calendar.xml.h:13
-msgid "Go to _Date"
-msgstr "إذهب إلى ال_تاريخ"
-
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to a specific date"
-msgstr "إذهب للتاريخ المحدّد"
-
-#: ui/evolution-calendar.xml.h:16
-msgid "Go to today"
-msgstr "إذهب إلى اليوم"
-
-#: ui/evolution-calendar.xml.h:17
 msgid "List"
 msgstr "قائمة"
 
-#: ui/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "الشهر"
 
-#: ui/evolution-calendar.xml.h:19
-msgid "New _Calendar"
-msgstr "_رزنامة جديدة"
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "التّالي"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr "معاينة الرزنامة التي ستطبع"
 
-#: ui/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "السابق"
+
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr "طباعة هذه الرزنامة"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr "نشر معلومات متوفر/مشغول لهذه الرزنامة"
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-tasks.xml.h:15
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "تنظ_يف"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:24
 msgid "Purge old appointments and meetings"
 msgstr "تنظيف المواعيد و الاجتماعات القديمة"
 
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "إنتقاء الأسماء"
+
 #: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "إذهب للتاريخ المحدّد"
+
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "إنتقاء مجلّد"
+
+#: ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "عرض كقائمة"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "إظهار يوم واحد"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "إظهار شهر واحد"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "إظهار أسبوع واحد"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "إظهار أسبوع العمل"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "اليوم"
+
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "View the current appointment"
+msgstr "عرض المراسَل الحالي"
+
+#: ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "الأسبوع"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "أسبوع عمل"
+
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Open Appointment"
+msgstr "_موعد"
+
+#: 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 "_غلق"
+
 #: 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
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "غلق"
 
@@ -15906,7 +18127,7 @@ msgid "Delete this item"
 msgstr "حذف هذا العنصر"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "عمود الأدوات الرّئيسي"
 
@@ -15947,19 +18168,12 @@ msgstr "حفظ هذا العنصر على القرص"
 #: 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-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_ملف"
 
-#: 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 "_حفظ"
-
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
 msgstr "نسخ النّص المنتقى للحافظة الوسيطة"
@@ -15997,6 +18211,13 @@ msgstr "حفظ المراسَل و غلق صندوق الحوار"
 msgid "Send _Message to Contact..."
 msgstr "إرسال _رسالة للمراسَل..."
 
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_حفظ"
+
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
 msgstr "حذف هذه القائمة"
@@ -16074,53 +18295,41 @@ msgid "Empty _Trash"
 msgstr "إفراغ _سلّة المهملات"
 
 #: ui/evolution-mail-global.xml.h:7
-msgid "Forget _Passwords"
-msgstr "نسيان _كلمات السّر"
-
-#: ui/evolution-mail-global.xml.h:8
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "نسيان كلمات السّر المتذكّرة حتّى يُطلب منك إدخالها من جديد"
-
-#: ui/evolution-mail-global.xml.h:9
 msgid "Open a window for composing a mail message"
 msgstr "فتح نافذة جديدة لتأليف رسالة بريديّة"
 
-#: ui/evolution-mail-global.xml.h:10
+#: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "إزالة جميع الرّسائل المحذوفة من كل المجلّدات نهائيّاً"
 
-#: ui/evolution-mail-global.xml.h:11
+#: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
 msgstr "إرسال رسالة جد_يدة"
 
-#: ui/evolution-mail-global.xml.h:12
+#: ui/evolution-mail-global.xml.h:10
 msgid "Post a message to a Public folder"
 msgstr "تعليق الرّسالة في مجلّد عام"
 
-#: ui/evolution-mail-global.xml.h:13
+#: ui/evolution-mail-global.xml.h:11
 msgid "S_ubscribe to Folders..."
 msgstr "الإ_شتراك في المجلّدات..."
 
-#: ui/evolution-mail-global.xml.h:14
+#: ui/evolution-mail-global.xml.h:12
 msgid "Show message preview window"
 msgstr "إظهار نافذة معاينة الرّسائل"
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "الإشتراك أو إلغاء الاشتراك في المجلّدات على النّوادل البعيدة"
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
 msgstr "محرّ_ر المجلّدات الاعتباطيّة..."
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
 msgstr "_مصفات..."
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Preview Pane"
-msgstr "لوح ال_معاينة"
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr "تغيير خواص هذا المجلّد"
@@ -16150,7 +18359,8 @@ msgid "Hide _Read Messages"
 msgstr "إخفاء الرّسائل المقر_وءة"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "إخفاء الرّسائل المحذوفة عوضاً عن إظهارها بخطٍّ يشطبها"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -16161,7 +18371,7 @@ msgstr "تعليم الجميع كمقروءة"
 msgid "Mark all visible messages as read"
 msgstr "تعليم جميع الرسائل المرئيّة كمقروءة"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "لصق رسالة (أو رسائل) من الحافظة"
 
@@ -16218,7 +18428,8 @@ msgid "_Threaded Message List"
 msgstr "قائمة رسائل _مشعّبة"
 
 #: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
+#, fuzzy
+msgid "A_dd Sender to Address Book"
 msgstr "إ_ضافة مرسِل إلى دفتر العناوين"
 
 #: ui/evolution-mail-message.xml.h:2
@@ -16226,7 +18437,8 @@ msgid "A_pply Filters"
 msgstr "ت_طبيق المصفاة"
 
 #: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
+#, fuzzy
+msgid "Add Sender to Address Book"
 msgstr "إضافة المرسِل إلى دفتر العناوين"
 
 #: ui/evolution-mail-message.xml.h:4
@@ -16322,324 +18534,312 @@ msgid "Display the previous unread message"
 msgstr "عرض الرسالة الغير مقروءة السابقة"
 
 #: ui/evolution-mail-message.xml.h:32
-msgid "F_orward"
+#, fuzzy
+msgid "F_orward As..."
 msgstr "ت_وجيه"
 
 #: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "قواعد التصفية"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr "تصفية بناءً على ال_قائمة البريدية..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr "تصفية بناء على ال_مُرسِل..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr "تصفية بناءً على المُرسل إل_يهم..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr "تصَفية بناءً على ال_موضوع..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "تعليم الرسائل المنتقات على أنها نفاية"
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr "تعليم الرسالة المنتقاة للمتابعة"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "_تابع..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "إجبار تحميل الصور في بريد HTML"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "توجيه الرسالة المنتقاة ضمن رسالة جديدة"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "توجيه الرسالة المنتقاة مقتبَسة كردّ"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "توجيه الرسالة المنتقاة لشخص ما"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "توجيه الرسالة المنتقاة إلى شخص ما كمُرفق"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "رفع حجم النّص"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr "تحميل ال_صور"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr "تعليم كمُ_همّة"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Mark as U_nread"
 msgstr "تعليم كغير م_قروءة"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr "تعليم كغير _مُهمّة"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr "تعليم الرسائل المنتقات كمقروءة"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr "تعليم الرسائل المنتقات كمُهمّة"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Mark the selected message(s) as junk"
 msgstr "تعليم الرسائل المنتقات على أنها نفاية"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 msgid "Mark the selected message(s) as not being junk"
 msgstr "تعليم·الرسائل·المنتقات·على·أنها ليست·نفاية"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr "تعليم الرسائل المنتقات كلم تقرأ بعد"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr "تعليم الرسائل المنتقات كغير مهمّة"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr "تعليم الرسالة المنتقات للحذف"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "نقل"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr "نقل الرسائل المنتقات إلى مجلّد آخر"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Next"
-msgstr "التّالي"
-
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:66
 msgid "Next _Important Message"
 msgstr "الرسالة ال_مهمّة التالية"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:67
 msgid "Next _Thread"
 msgstr "ال_نّقاش التالي"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:68
 msgid "Next _Unread Message"
 msgstr "الرّسالة ال_غير مقروءة التالية"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:69
 msgid "Not Junk"
 msgstr "ليس نفاية"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr "افتح الرسالة المحدّدة في نافذة جديدة"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Open the selected message in the composer to re-send it"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "فتح الرسالة المحدّدة في المُؤلّف لإعادة إرسالها"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr "الحجم الأ_صلي"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:73
 msgid "P_revious Unread Message"
 msgstr "الرسالة الغير مقروءة ال_سابقة"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:75
 msgid "Post a Repl_y"
 msgstr "إرسال _رد"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:76
 msgid "Post a reply to a message in a Public folder"
 msgstr "إرسال رد على رسالة في مجلّد عمومي"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:77
 msgid "Pr_evious Important Message"
 msgstr "الرسالة المهمّة ال_سابقة"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:78
 msgid "Preview the message to be printed"
 msgstr "تعيين الرسالة قبل طبعها"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "Previous"
-msgstr "السابق"
-
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr "طبع هذه الرسالة"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr "إ_عادة توجيه"
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "إعادة توجيه (bounce) الرسالة المحدّدة إلى أحد ما"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr "إعادة ضبط النّص لحجمه الأصلي"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:90
 msgid "S_earch in Message..."
 msgstr "_بحث في رسالة..."
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr "أ_صغر"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr "حفظ الرّسالة كملف نصّي"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr "بحث عن النّص في الرسالة المعروضة"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:94
 msgid "Set up the page settings for your current printer"
 msgstr "ضبط تعيينات الصّفحة لطابعتك الحاليّة"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr "إظهار مصدر ال_بريد الالكتروني"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr "إظهار ال_ترويسات كاملة"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:97
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "إظهار مؤشّر وامض في متن الرّسائل المعروضة"
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr "إظهار الرّسالة بالأسلوب العادي"
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr "إظهار الرّسالة مع كل ترويسات البريد الإلكتروني"
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr "إظهار مصدر البريد الإلكتروني الخام للرّسالة"
 
-#: ui/evolution-mail-message.xml.h:99
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr "ح_جم النّص"
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr "تراجع عن حذف الرسائل المنتقات"
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr "مُ_رفق"
 
-#: ui/evolution-mail-message.xml.h:108
-msgid "_Copy to Folder"
-msgstr "ن_سخ إلى دليل"
-
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "إ_نشاء مُصفّي من رسالة"
 
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Forward Message"
-msgstr "_تمرير الرّسالة"
-
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "إ_ذهب إلى"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_ضمن السّياق"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "أ_وسع"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_عرض الرّسالة"
 
-#: ui/evolution-mail-message.xml.h:116
-msgid "_Move to Folder"
-msgstr "_نقل للمجلّد"
-
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "الرّسالة ال_تّالية"
 
-#: ui/evolution-mail-message.xml.h:118
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_عرض عادي"
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_فتح الرسالة"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "ال_رّسالة السابقة"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_مُقتبس"
 
-#: ui/evolution-mail-message.xml.h:125
-msgid "_Resend..."
-msgstr "إ_عادة الإرسال..."
-
-#: ui/evolution-mail-message.xml.h:127 ui/evolution.xml.h:31
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "أد_وات"
 
-#: ui/evolution-mail-message.xml.h:128
+#: ui/evolution-mail-message.xml.h:130
 msgid "_Undelete"
 msgstr "_تراجع عن الحذف"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 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
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_غلق"
 
@@ -16675,10 +18875,6 @@ msgstr "_تهيئة"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "فتح"
-
 #: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "فتح ملفّ"
@@ -16729,10 +18925,6 @@ msgstr "حفظ الملف الحالي بإسم مغاير"
 msgid "Save the message in a specified folder"
 msgstr "حفظ الرسالة في مجلّد محدد"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "إرسال"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -16775,46 +18967,64 @@ msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
+msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:37
+msgid "Toggles whether the To field is displayed"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:38
 msgid "_Attachment..."
 msgstr "_مُرفق..."
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr "حقل النّسخة الكربونيّة ال_مخفيّة"
 
-#: ui/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr "حقل ال_نسخة الكربونية"
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr "_حذف الكل"
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr "حقل _مِن"
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:46
 #: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_إدراج"
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_فتح..."
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "حقل ال_رّد إلى"
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr "حقل ال_رّد إلى"
 
-#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr "_أمن"
 
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "حقل _مِن"
+
 #: ui/evolution-signature-editor.xml.h:5
 msgid "H_TML"
 msgstr "H_TML"
@@ -16883,142 +19093,165 @@ msgstr "نسخ المهام·المنتقاة"
 msgid "Cut selected task"
 msgstr "قص المهام·المنتقاة"
 
-#: ui/evolution-tasks.xml.h:6
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "حذف المهام المكتملة"
 
-#: ui/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "حذف المهام المنتقاة"
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr "ت_عليم كمكتمل"
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "تعليم المهام المنتقاة كمكتملة"
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr "لصق مهمّة من الحافظة الوسيطة"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "استعراض قائمة المهام التي ستطبع"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "طبع قائمة المهام"
 
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "View the selected task"
+msgstr "حذف المهام المنتقاة"
+
+#: ui/evolution-tasks.xml.h:23
+#, fuzzy
+msgid "_Open Task"
+msgstr "_مهمّة"
+
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
 msgstr "حول زيميان ايفُليوشِن..."
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "تغيير تعيينات ايفُليوشِن"
 
-#: ui/evolution.xml.h:5
-msgid "Create a new window"
-msgstr "إنشاء نافذة جديدة"
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "تغيير خواص هذا المجلّد"
 
 #: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "إنشاء نافذة جديدة"
+
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "إ_نهاء"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "الأ_سئلة الشائعة حول زيميان إيفُليوشِن"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "إنهاء البرنامج"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
+msgid "Forget _Passwords"
+msgstr "نسيان _كلمات السّر"
+
+#: ui/evolution.xml.h:11
+msgid "Forget remembered passwords so you will be prompted for them again"
+msgstr "نسيان كلمات السّر المتذكّرة حتّى يُطلب منك إدخالها من جديد"
+
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "استيراد بيانات من برامج أخرى"
 
-#: ui/evolution.xml.h:10
-msgid "Open a new window"
-msgstr "فتح نافذة جديدة"
+#: ui/evolution.xml.h:14
+#, fuzzy
+msgid "New _Window"
+msgstr "_نافذة"
 
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "إعدادات الحاسوب ال_يدوي..."
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "ارسال / تلقي"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "إرسال العناصر المصطفة و جلب العناصر الجديدة"
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "ضبط إعدادات الحاسوب اليدوي"
 
-#: ui/evolution.xml.h:15
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "عرض معلومات حول زيميان ايفُليوشِن"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "إرسال تقرير خلل"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "إرسال تقرير _خلل"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "إرسال تقرير خلل باستخدام باك بدي"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "عمود الأدوات الرّئيسي"
+
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Ximian Evolution _FAQ"
-msgstr "الأ_سئلة الشائعة حول زيميان إيفُليوشِن"
-
-#: ui/evolution.xml.h:22
-msgid "_About Ximian Evolution..."
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
 msgstr "_حول زيميان.ايفُليوشِن..."
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_إستيراد..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_جديد"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Quick Reference"
+msgstr "تفضيلات البريد"
+
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_إرسال / تلقي"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_نافذة"
 
-#: ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "ملخص الطبع"
-
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "ملخص الطبع"
-
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "إعادة تحميل"
-
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "إعادة تحميل المشهد الحالي"
-
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "بحسب ال_شركة"
@@ -17040,10 +19273,15 @@ msgid "_Day View"
 msgstr "مشهد ال_يوم"
 
 #: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "مشهد اللائحة"
+
+#: views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "مشهد ال_شهر"
 
-#: views/calendar/galview.xml.h:4
+#: views/calendar/galview.xml.h:5
 msgid "_Work Week View"
 msgstr "_مشهد أسبوع العمل"
 
@@ -17072,27 +19310,35 @@ msgid "_Messages"
 msgstr "ال_رسائل"
 
 #: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "مع ال_فئة"
+#, fuzzy
+msgid "With _Due Date"
+msgstr "تاريخ الإ_ستحقاق:"
 
 #: views/tasks/galview.xml.h:2
-msgid "_Tasks"
-msgstr "_مهام"
+#, fuzzy
+msgid "With _Status"
+msgstr "ضبط الحالة"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "ت.غ"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "اختر منطقة زمنيّة"
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "المناطق الزمنيّة"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "المناطق الزمنيّة"
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr "ال_منتقى:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "اختر منطقة زمنيّة"
+
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -17101,24 +19347,20 @@ msgstr ""
 "استخدم زر الفأرة الأيسر لتكبير منطقة من الخريطة واختر منطقة زمنيّة.\n"
 "استخدم زر الفأرة الأيمن للتصغير."
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "ال_منتقى:"
-
-#: widgets/menus/gal-view-menus.c:290
+#: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "المشهد ال_حالي"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
+#: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "مشهد مخصّص"
 
-#: widgets/menus/gal-view-menus.c:358
+#: widgets/menus/gal-view-menus.c:360
 msgid "Save Custom View..."
 msgstr "حفظ المشهد المخصّص..."
 
-#: widgets/menus/gal-view-menus.c:371
+#: widgets/menus/gal-view-menus.c:373
 msgid "Define Views..."
 msgstr "تعريف المشاهد..."
 
@@ -17133,14 +19375,10 @@ msgstr "إثأخجسأ"
 msgid "%B %Y"
 msgstr "%B·%Y"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "الآن"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
-msgid "Today"
-msgstr "اليوم"
-
 #: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
@@ -17150,82 +19388,87 @@ msgstr "يجب أن يكون الوقت بتهيئة: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "يجب أن تكون القيمة المائويّة بين 0 و100،مضمنة"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "البلطيقيّة"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "وسط أوروبيّة"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "الصّينيّة"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "السّريليّة"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "اليونانيّة"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "العبريّة"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "اليابانيّة"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "الكوريّة"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "التركيّة"
 
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "يونيكود"
 
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "غرب أوروبي"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
+#: widgets/misc/e-charset-picker.c:74
+#, fuzzy
+msgid "Western European, New"
+msgstr "غرب أوروبي"
+
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "تقليدي"
 
-#: 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
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "مبسّط"
 
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "الأكرانية"
 
-#: widgets/misc/e-charset-picker.c:100
+#: widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "مرئي"
 
-#: widgets/misc/e-charset-picker.c:168
+#: widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "مجموعة رموز مجهولة: %s"
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "تشفيرة الرموز"
 
-#: widgets/misc/e-charset-picker.c:222
+#: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "أدخل مجموعة الرموز للاستخدام"
 
-#: widgets/misc/e-charset-picker.c:318
+#: widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "أخرى..."
 
@@ -17233,52 +19476,1494 @@ msgstr "أخرى..."
 msgid "..."
 msgstr "   "
 
-#: widgets/misc/e-filter-bar.c:185
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
+msgid "Evolution Error"
+msgstr "خطأ إيفُليوشِن"
+
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "بريد إيفُليوشِن"
+
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Information"
+msgstr "معلومات خياريّة"
+
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Query"
+msgstr "افُليوشِن"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:417
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
+#: widgets/misc/e-expander.c:181
+#, fuzzy
+msgid "Expanded"
+msgstr "_شطب"
+
+#: widgets/misc/e-expander.c:182
+#, fuzzy
+msgid "Whether or not the expander is expanded"
+msgstr "ما إذا كان سيُسْأل عن تأكيد عند مَحْوِ مجلّد"
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "غير معرّف"
+
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "إسبانيا"
+
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
+msgstr ""
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: widgets/misc/e-expander.c:231
+msgid "Indicator Spacing"
+msgstr ""
+
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:195
+#, fuzzy
+msgid "_Searches"
+msgstr "_بحث"
+
+#: widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "محرّر البحث"
 
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
+#: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "حفظ البحث"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_حفظ البحث..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_تحرير.البحوث المحفوظة..."
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_متقدّم..."
 
-#: widgets/misc/e-search-bar.c:531
+#: widgets/misc/e-image-chooser.c:172
+#, fuzzy
+msgid "Choose Image"
+msgstr "إختيار ملف"
+
+#: widgets/misc/e-search-bar.c:540
 msgid "_Search"
 msgstr "_بحث"
 
-#: widgets/misc/e-search-bar.c:537
+#: widgets/misc/e-search-bar.c:546
 msgid "_Find Now"
 msgstr "_بحث الآن"
 
-#: widgets/misc/e-search-bar.c:538 widgets/misc/e-search-bar.c:928
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_مسح"
 
-#: widgets/misc/e-search-bar.c:836
+#: widgets/misc/e-search-bar.c:837
 msgid "Item ID"
 msgstr "هوية العنصر"
 
-#: widgets/misc/e-search-bar.c:843
+#: widgets/misc/e-search-bar.c:844
 msgid "Subitem ID"
 msgstr "هوية العنصر المحوي"
 
-#: widgets/misc/e-search-bar.c:850
+#: widgets/misc/e-search-bar.c:851
 msgid "Text"
 msgstr "نص"
 
-#: widgets/misc/e-search-bar.c:930
+#: widgets/misc/e-search-bar.c:931
 msgid "Find _Now"
 msgstr "بحث الآ_ن"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"%s موجود\n"
+"هل تريد تنميقه؟"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "لا يمكن فتح الملف"
+
+#: widgets/misc/e-task-widget.c:212
+#, c-format
+msgid "%s (...)"
+msgstr "%s·(...)"
+
+#: widgets/misc/e-task-widget.c:217
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% تام)"
+
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "إستجابة توثيق رديئة من النّادل."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "إسم ال_قائمة:"
+
+#, fuzzy
+#~ msgid "URL:"
+#~ msgstr "العنوان"
+
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "عارض مجلدّات دفتر عناوين إيفُليوشِن"
+
+#~ msgid "Rename"
+#~ msgstr "إعادة تسمية"
+
+#~ msgid "Could not create a directory for the new addressbook."
+#~ msgstr "لم يمكن إنشاء دليل لدفتر العناوين الجديد."
+
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "فشل الإتّصال بنادل LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "لم يمكن القيام ببحث على DSE الجذري"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "حدث خطأ عند سحب معلومات المخطّط"
+
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "هوية المستخدم لمصدر المراسَلين الذي سيظهره المشهد"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  عرض ال_قواعد المدعومة "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "2:30"
+#~ msgstr "2:30"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Addressbook Creation Assistant"
+#~ msgstr "مساعد إنشاء دفاتر العناوين"
+
+#~ msgid ""
+#~ "Congratulations, you are finished setting up this addressbook.\n"
+#~ "\n"
+#~ "Please click the \"Finish\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "تهانينا، انهيت ضبط دفتر العناوين هذا.\n"
+#~ "\n"
+#~ "رجاءً أُنقر زر \"إنهاء\" لحفظ التّعيينات التي أدخلتها هنا."
+
+#~ msgid "Edit LDAP Server"
+#~ msgstr "تحرير نادل LDAP"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "سيستخدم إيفُليوشِن الإسم المميّز هذا لتوثيقك مع النّادل"
+
+#~ msgid "Finished"
+#~ msgstr "إنتهى"
+
+#~ msgid ""
+#~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
+#~ "(Secure Sockets Layer)\n"
+#~ "and TLS (Transport Layer Security) protocols are used by some servers to "
+#~ "cryptographically protect\n"
+#~ "your connection. Ask your system administrator if your LDAP server uses "
+#~ "these protocols."
+#~ msgstr ""
+#~ "يجب أن تحدّد الآن الكيفيّة التي تريد بها الإتّصال بنادل LDAP.تستخدم "
+#~ "بروتوكولات الـSSL و الـ TLS من قبل بعض النّوادل لحماية إتّصالك "
+#~ "كريبتوغرافيا\n"
+#~ "إسأل مدير نظامك إذا كان نادل LDAP يستخدم هذه البروتوكولات."
+
+#~ msgid "One"
+#~ msgstr "واحد"
+
+#~ msgid "Selected:"
+#~ msgstr "مُنتقى:"
+
+#~ msgid ""
+#~ "Selecting this option will let you change Evolution's default settings "
+#~ "for LDAP\n"
+#~ "searches, and for creating and editing contacts. "
+#~ msgstr ""
+#~ "إنتقاء هذا الخيار سوف يسمح لك بتغيير إعدادات إيفُليوشِن الإفتراضيّة\n"
+#~ "لبحث نوادل LDAP كما إنشاء وتعديل المراسَلين."
+
+#~ msgid ""
+#~ "Specifying a display name and group is the first step in setting up an "
+#~ "addressbook."
+#~ msgstr "تحديد إسم للعرض و مجموعة أوّل خطوة لضبط دفتر عناوين."
+
+#~ msgid "Step 1: Folder Characteristics"
+#~ msgstr "الخطوة الأولى: صفات المجلّد"
+
+#~ msgid "Step 3: Connecting to Server"
+#~ msgstr "الخطوة الثّالثة: الإتّصال بالنّادل"
+
+#~ msgid "Step 4: Searching the Directory"
+#~ msgstr "الخطوة الرّابعة: البحث في الدّليل"
+
+#~ msgid "Sub"
+#~ msgstr "فرعي"
+
+#~ msgid ""
+#~ "The options on this page control how many entries should be included in "
+#~ "your\n"
+#~ "searches, and how long a search should take. Ask your system "
+#~ "administrator if you\n"
+#~ "need to change these options."
+#~ msgstr ""
+#~ "تتحكم الخيارات على هذه الصّفحة بعدد المدخلات التي يجب أن تُضم في\n"
+#~ "بحوثك، والوقت الذي يستغرقه كل بحث. إسأل مدير نظامك إن كنت\n"
+#~ "تحتاج أن تغيّر هذه الخيارات."
+
+#~ msgid ""
+#~ "This assistant will help you create a new addressbook. \n"
+#~ "\n"
+#~ "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"
+#~ "\n"
+#~ "بناءً على نوع دفتر العناوين الذي ستنشئه، قد يتطلب هذا مُعاملات إضافية.\n"
+#~ "الرجاءً الإتّصل بمدير نظامك إن احتجت مساعدة في إيجاد هذه المعلومات."
+
+#~ msgid ""
+#~ "This is the name that will appear in your Evolution folder list. It is "
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "هذا هو الإسم الذي سوف يظهر على لائحتك لمجلدّات إيفُليوشِن. إنه لغرض العرض "
+#~ "فقط. "
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "يتحكّم هذا الخيار في مدّة القيام ببحث."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "إ_ستخدام SSL/TLS:"
+
+#~ 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"
+#~ "ومعلومات دخولك. رجاء اسأل مدير نظامك إن كنت غير متأكد من هذه المعلومات."
+
+#~ msgid "_Display name:"
+#~ msgstr "إسم ال_عرض:"
+
+#~ msgid "_Port number:"
+#~ msgstr "رقم ال_منفذ:"
+
+#~ msgid "_Server name:"
+#~ msgstr "إسم ال_نّادل:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "ال_مهلة (دقائق):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "لسان-الإتّصال"
+
+#~ msgid "general-tab"
+#~ msgstr "اللّسان-العام"
+
+#~ msgid "searching-tab"
+#~ msgstr "لسان-البحث"
+
+#~ msgid "Selected Contacts:"
+#~ msgstr "المراسَلون المنتقون:"
+
+#~ msgid ""
+#~ "Type a name into the entry, or\n"
+#~ "select one from the list below:"
+#~ msgstr ""
+#~ "أُكتب اسماً في الخانة، أو\n"
+#~ "إختر واحداً من القائمة أدناه:"
+
+#~ msgid "_Folder:"
+#~ msgstr "ال_مجلّد:"
+
+#~ msgid " B_usiness:"
+#~ msgstr " _عمل:"
+
+#~ msgid "A_ddress..."
+#~ msgstr "ال_عنوان..."
+
+#~ msgid "A_ssistant's name:"
+#~ msgstr "إسم ال_مساعد:"
+
+#~ msgid "Blog address:"
+#~ msgstr "عنوان البلوغ:"
+
+#~ msgid "Business fa_x:"
+#~ msgstr "فا_كس العمل:"
+
+#~ msgid "Collaboration"
+#~ msgstr "التّعاون"
+
+#~ msgid "File a_s:"
+#~ msgstr "الملف _كـ:"
+
+#~ msgid ""
+#~ "If this person publishes free/busy or other calendar information on the "
+#~ "Internet, enter the address\n"
+#~ "of that information here."
+#~ msgstr ""
+#~ "إذا نشر هذا الشّخص معلومات حرّ/مشغول أو أي معلومات رُزنامة أُخرى على "
+#~ "الإنترنت، أدخل عنوان\n"
+#~ "تلك المعلومات هنا."
+
+#~ msgid "New phone type"
+#~ msgstr "نوع هاتف جديد"
+
+#~ msgid "Organi_zation:"
+#~ msgstr "الم_ؤسّسة:"
+
+#~ msgid "Primary _email:"
+#~ msgstr "عنوان البريد الإل_كتروني الأساسي:"
+
+#~ msgid "_Business:"
+#~ msgstr "ال_عمل:"
+
+#~ msgid "_Categories..."
+#~ msgstr "أ_صناف..."
+
+#~ msgid "_Home:"
+#~ msgstr "ال_منزل:"
+
+#~ msgid "_Job title:"
+#~ msgstr "المسمّى ال_وظيفي:"
+
+#~ msgid "_Manager's name:"
+#~ msgstr "إسم ال_مدير:"
+
+#~ msgid "_Mobile:"
+#~ msgstr "الهاتف ال_جوّال:"
+
+#~ msgid "_Public Calendar URL:"
+#~ msgstr "عنوان الرُّزنامة ال_عامّة:"
+
+#~ msgid "_This is the mailing address"
+#~ msgstr "_هذا هو عنوان التراسل"
+
+#~ msgid "_Web page address:"
+#~ msgstr "عنوان صفحة الإ_نترنت:"
+
+#~ msgid "East Timor"
+#~ msgstr "تيمور الشّرقية"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "يوغوسلافيا"
+
+#~ msgid "Save Contact as VCard"
+#~ msgstr "حفظ المراسَل كـVCard"
+
+#~ msgid "Business"
+#~ msgstr "العمل"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "لم يمكن إيجاد قطعة لحقل: `%s'"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "محرّر قائمة المراسَلين"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "حفظ القائمة كـ VCard"
+
+#~ msgid "1 contact"
+#~ msgstr "مراسَل واحد"
+
+#~ msgid "Move to folder..."
+#~ msgstr "نقل إلى مجلّد..."
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "خلفيّة دفتر العناوين ل\n"
+#~ "%s\n"
+#~ "قد إنهارت. ستضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+
+#~ msgid "Map It"
+#~ msgstr "خطِّطه"
+
+#~ msgid "Home Address"
+#~ msgstr "عنوان المنزل"
+
+#~ msgid "Work Address"
+#~ msgstr "عنوان العمل"
+
+#~ msgid "Other Address"
+#~ msgstr "عنوان آخر"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "خطأ أثناء حفظ %s:·%s"
+
+#~ msgid "and %d other contacts."
+#~ msgstr "و %d مراسَلين آخرين."
+
+#~ msgid "Can not load URI"
+#~ msgstr "لا يمكن تحميل العنوان URI"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "لم يمكن تشغيل وُمْبَت"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "عارض رُزنامة إيفُليوشِن"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "عارض مهام إيفُليوشِن"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "لم يمكن تشغيل gnome-vfs"
+
+#~ msgid "The view showing when the calendar starts"
+#~ msgstr "المشهد الذي يُظهر متى تبدأ الرُّزنامة"
+
+#~ msgid "Rename this calendar to"
+#~ msgstr "إعادة تسمية هذه الرُّزنامة لـ"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "لم يمكن فتح المجلّد في '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "العنوان الذي ستعرضه الرُّزنامة"
+
+#~ msgid "The type of view to show"
+#~ msgstr "نوع المشهد الذي سيُعرض"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "خيارات المنبّه الصّوتي"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "خيارات منبّه الرّسائل"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "خيارات منبّه البريد الإلكتروني"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "خيارات منبّه البرامج"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "خيارات مُنبّه مجهول"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "تكرار التّنبيه"
+
+#~ msgid "Message to Display:"
+#~ msgstr "الرّسالة التي ستُعرض:"
+
+#~ msgid "Message to Send"
+#~ msgstr "الرّسالة التي ستُرسل"
+
+#~ msgid "Play sound:"
+#~ msgstr "عزف صّوت:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "مع هذه المتغيّارات:"
+
+#~ msgid "Basics"
+#~ msgstr "الأساسيّات"
+
+#~ msgid "Date/Time:"
+#~ msgstr "التّاريخ/الوقت:"
+
+#~ msgid "Display a message"
+#~ msgstr "عرض رسالةً"
+
+#~ msgid "Reminders"
+#~ msgstr "علامات التّذكير"
+
+#~ msgid "Send an Email"
+#~ msgstr "إرسال بريد إلكتروني"
+
+#~ msgid "_Options..."
+#~ msgstr "ال_خيارات..."
+
+#~ msgid "Alerts"
+#~ msgstr "التّنبيهات"
+
+#~ msgid "Time"
+#~ msgstr "الوقت"
+
+#~ msgid "_General"
+#~ msgstr "_عام"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "الحدث الجاري حذفه إجتماع، هل تود إرسال تبليغ بالإلغاء؟"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "المهمّة التي يجري حذفها منسوبة، هل تود إرسال تبليغ بالإلغاء؟"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "هل تريد فعلاً إلغاء و حذف هذه المهمّة؟"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "خانة السجل الجاري حذفها منشورة، هل تود إرسال تبليغ بالإلغاء؟"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "هل تريد فعلاً حذف هذه المهمّة الغير مسمّاة؟"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "هل تريد فعلاً حذف خانة السّجل الغير مسمّاة هذه؟"
+
+#~ msgid "Reminder"
+#~ msgstr "علامة تذكير"
+
+#~ msgid "B_usy"
+#~ msgstr "_مشغول"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_سرّي"
+
+#~ msgid "F_ree"
+#~ msgstr "م_توفّر"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_خاص"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_عام"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "د_عوة آخرين..."
+
+#~ msgid "Could not create cache for new calendar"
+#~ msgstr "لم يمكن إنشاء ذاكرة مخبّأة للرزنامة الجديدة"
+
+#~ msgid "Could not create directory for new calendar"
+#~ msgstr "لم يمكن إنشاء دليل للرُّزنامة الجديدة"
+
+#~ msgid "A group must be selected"
+#~ msgstr "يجب إنتقاء مجموعة"
+
+#~ msgid "Could not create directory for new task list"
+#~ msgstr "لم يمكن إنشاء دليل لقائمة المهام الجديدة"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "قاعدة التّكرار"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "تكرار _مخصّص"
+
+#~ msgid "_Modify"
+#~ msgstr "ت_عديل"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_دون تكرار"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "تكرار _بسيط"
+
+#~ msgid "Save Event"
+#~ msgstr "حفظ الحدث"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "تم إنشاء معلومات الإجتماع. هل أُرسلها؟"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "وقع تغيير معلومات الإجتماع. هل أُرسل نسخةً محدّثة؟"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "تم إنشاء معلومات التّكليف بالمهام. هل أُرسلها؟"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "وقع تغييرت معلومات المهام. هل أُرسل نسخةً محدّثة؟"
+
+#~ msgid "% _Complete"
+#~ msgstr "_مُنجز %"
+
+#~ msgid "Progress"
+#~ msgstr "التقدّم"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_سرّي"
+
+#~ msgid "1 day"
+#~ msgstr "يوم واحد"
+
+#~ msgid "1 week"
+#~ msgstr "أسبوع واحد"
+
+#~ msgid "1 hour"
+#~ msgstr "ساعة واحدة"
+
+#~ msgid "1 minute"
+#~ msgstr "دقيقة واحدة"
+
+#~ msgid "1 second"
+#~ msgstr "ثانية واحدة"
+
+#~ msgid "component"
+#~ msgstr "المكوِّن"
+
+#~ msgid "Geographical Position"
+#~ msgstr "الموقع الجغرافي"
+
+#~ msgid "start_calendar_server(): %s"
+#~ msgstr "start_calendar_server(): %s"
+
+#~ msgid "Every %d days"
+#~ msgstr "كل %d أيام"
+
+#~ msgid "Every %d weeks"
+#~ msgstr "كل %d أسابيع"
+
+#~ msgid "Every %d weeks on "
+#~ msgstr "كل %d أسابيع يوم"
+
+#~ msgid "every %d months"
+#~ msgstr "كل %d أشهر"
+
+#~ msgid "Every %d years"
+#~ msgstr "كل %d سنين"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>تم:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i> لا شيء</i>"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "لم يمكن تحديث ملف الرُزنامة!\n"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "ثمّة خطأ على نظام كوربا\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "لم يعثر على الجسم\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "ليس لديك التّصاريح الكافية لتحديث الرُّزنامة\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "لم يمكن تحديث حالة الحاضر!\n"
+
+#~ msgid "Select Calendar Folder"
+#~ msgstr "إنتقاء مجلّد الرُّزنامة"
+
+#~ msgid "Select Tasks Folder"
+#~ msgstr "إنتقاء مجلّد المهام"
+
+#~ msgid "_Options"
+#~ msgstr "_خيارات"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "وقت _بدء الإجتماع:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "وقت إ_نتهاء الإجتماع:"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "لم يمكن تحميل المهام في `%s'"
+
+#~ msgid "The method required to load `%s' is not supported"
+#~ msgstr "الطريقة المطلوبة لتحميل `%s' غير مدعومة"
+
+#~ msgid "You don't have permission to open the folder in `%s'"
+#~ msgstr "ليس لديك التصريح لفتح المجلّد في `%s'"
+
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "لم يمكن فتح المجلّد في `%s'"
+
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "الطريقة المطلوبة لفتح `%s' غير مدعومة"
+
+#~ msgid "Adding alarms for %s"
+#~ msgstr "جاري إضافة المنبّهات لـ %s"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "خلفيّة المهام لـ\n"
+#~ "%s\n"
+#~ "قد إنهارت. سوف تضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+
+#~ msgid ""
+#~ "The calendar backend for\n"
+#~ "%s\n"
+#~ " has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "خلفيّة الرُّزنامة لـ\n"
+#~ "%s\n"
+#~ "قد إنهارت. سوف تضطر إلى إعادة تشغيل إيفُليوشِن لإستعمالها مجدّداً"
+
+#~ msgid "Go To Date"
+#~ msgstr "إذهب إلى التّاريخ"
+
+#~ msgid "Go To Today"
+#~ msgstr "إذهب إلى اليوم"
+
+#~ msgid "Rename this task list to"
+#~ msgstr "إعادة تسمية قائمة المهام هذه لـ"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "عنوان مجلّد المهام الذي سيُعرض"
+
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لم يمكن فتح الملف `%s':\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لم يمكن إنشاء الملف `%s':\n"
+#~ "%s"
+
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' ليس دليلاً."
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "لم يمكن جلب المجموعة: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "إستجابة نادل مجهولة: %s"
+
+#~ msgid "STARTTLS request timed out: %s"
+#~ msgstr "انتهت مهلة طلب STARTTLS: %s"
+
+#~ msgid "STARTTLS response error"
+#~ msgstr "خطأ في استجابة STARTTLS"
+
+#~ msgid "HELO request timed out: %s"
+#~ msgstr "انتهت مهلة طلب HELO: %s"
+
+#~ msgid "HELO response error"
+#~ msgstr "خطأ في استجابة HELO"
+
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "انتهت مهلة طلب AUTH: %s"
+
+#~ msgid "AUTH request failed."
+#~ msgstr "فشل طلب التّوثّق."
+
+#~ msgid "MAIL FROM response error"
+#~ msgstr "خطأ في استجابة MAILFROM"
+
+#~ msgid "DATA response error"
+#~ msgstr "خطأ في استجابة DATA"
+
+#~ msgid "DATA send timed out: message termination: %s: mail not sent"
+#~ msgstr "انتهت مهلة إرسال DATA: نهاية الرّسالة: %s: لم يرسل البريد"
+
+#~ msgid "DATA termination response error"
+#~ msgstr "خطأ في استجابة نهاية DATA"
+
+#~ msgid "RSET request timed out: %s"
+#~ msgstr "انتهت مهلة طلب RSET: %s"
+
+#~ msgid "RSET response error"
+#~ msgstr "خطأ في استجابة RSET"
+
+#~ msgid "QUIT request timed out: %s"
+#~ msgstr "انتهت مهلة طلب QUIT: %s"
+
+#~ msgid "QUIT response error"
+#~ msgstr "خطأ في استجابة QUIT"
+
+#~ msgid "Error saving file: %s"
+#~ msgstr "خطأ أثناء حفظ الملف: %s"
+
+#~ msgid "Error loading file: %s"
+#~ msgstr "خطأ أثناء تحميل الملف: %s"
+
+#~ msgid "Error accessing file: %s"
+#~ msgstr "خطأ أثناء النّفاذ للملف: %s"
+
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لا يمكن البحث على الملف: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لا يمكن بتر الملف: %s\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "خطأ أثناء الحفظ الآلي للرّسالة: %s\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved files from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "عثر زيميان إيفُليوشِن على ملفّات من جلسةٍ سابقة غير محفوظة.\n"
+#~ "هل تود محاولة استعادتها؟"
+
+#~ msgid ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "لم ترسل الرّسالة \"%s\".\n"
+#~ "\n"
+#~ "هل تود حفظ تغييراتك؟"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "لم يمكن إنشاء نافذة التّأليف:\n"
+#~ "لم يمكن تفعيل مكوّن تحرير HTML."
+
+#~ msgid "Important mail (local)"
+#~ msgstr "بريد مهم (محلّي)"
+
+#~ msgid "Unread mail (local)"
+#~ msgstr "بريد غير مقروء (محلّي)"
+
+#~ msgid "%d seconds ago"
+#~ msgstr "منذ %d ثانية"
+
+#~ msgid "%d minutes ago"
+#~ msgstr "منذ %d دقيقة"
+
+#~ msgid "%d hours ago"
+#~ msgstr "منذ %d ساعة"
+
+#~ msgid "%d days ago"
+#~ msgstr "منذ %d يوم"
+
+#~ msgid "%d weeks ago"
+#~ msgstr "منذ %d أسبوع"
+
+#~ msgid "%d months ago"
+#~ msgstr "منذ %d شهر"
+
+#~ msgid "%d years ago"
+#~ msgstr "منذ %d سنة"
+
+#~ msgid "Then"
+#~ msgstr "ثم"
+
+#~ msgid "If"
+#~ msgstr "إذا"
+
+#~ msgid "Edit Filters"
+#~ msgstr "تحرير المصفات"
+
+#~ msgid "Edit VFolders"
+#~ msgstr "تحرير المجلدات الاعتباطية"
+
+#~ msgid "Outgoing"
+#~ msgstr "الخارجة"
+
+#~ msgid "Pipe Message to Shell Command"
+#~ msgstr "نقل الرّسالة بأنبوب إلى أمر الهيكل"
+
+#~ msgid "Shell Command"
+#~ msgstr "أمر الهيكل"
+
+#~ msgid "Spam"
+#~ msgstr "سبام"
+
+#~ msgid "Rule name '%s' is not unique, choose another."
+#~ msgstr "إسم القاعدة '%s' ليس فريداً، إختر غيره."
+
+#~ msgid "Rules"
+#~ msgstr "القواعد"
+
+#~ msgid "Score Rules"
+#~ msgstr "قواعد النتيجة"
+
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "يجب أن تحدّد مجلّدا واحداً على الأقل كمصدر."
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "عارض مجلّدات بريد إيفُليوشِن"
+
+#~ msgid "You must specify a valid script name."
+#~ msgstr "يجب أن تحدّد اسم مخطوطٍ صحيح."
+
+#~ msgid "[script]"
+#~ msgstr "[مخطوط]"
+
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "ليس لهذه الرّسالة موضوع.\n"
+#~ "هل تريد فعلاً إرسالها؟"
+
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "تحتوي هذه الرّسالة فقط على مستلمي نسخٍ كربونيّة مخفيّة."
+
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "يجب تحديد مستلمين لإرسال هذه الرّسالة."
+
+#~ msgid "Could not create temporary mbox store: %s"
+#~ msgstr "لم يمكن إنشاء مخزن صندوق البريد المؤقّت: %s"
+
+#~ msgid "Could not create temporary mbox folder: %s"
+#~ msgstr "لم يمكن إنشاء مجلّد صندوق البريد المؤقّت: %s"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "Could not delete folder: %s"
+#~ msgstr "لم يمكن حذف المجلّد: %s"
+
+#~ msgid "Folder Name"
+#~ msgstr "إسم المجلّد"
+
+#~ msgid "_Properties..."
+#~ msgstr "_خصائص..."
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "مجلّد·إعتباطي·على·النقاش"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "تصفية باعتبار النقاش"
+
+#~ msgid "Session not initialised"
+#~ msgstr "لم تهيء الجلسة"
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr "هذه الرّسالة موقّعة رقميّاً و قد تبيّن أنّها أصليّة."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr "هذه الرّسالة موقّعة رقميّاً و لكن لا يمكن إثبات كونها أصليّة."
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "فشل فتح المخزن لـ `%s': %s"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "كتب في %a, %Y-%m-%d السّاعة %H:%M %%+05d, %%s:"
+
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "لا يمكن الحفظ إلى `%s'\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "`%s' موجود أصلاً.\n"
+#~ "هل تريد تنميقه؟"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "7يار·3رّي"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "7يار 3رّي."
+
+#~ msgid "Importing %s as %s"
+#~ msgstr "جاري استيراد %s كـ %s"
+
+#~ msgid "Scanning mail filters"
+#~ msgstr "جاري مسح مصفات البريد"
+
+#~ msgid "Scanning directory"
+#~ msgstr "جاري مسح الدّليل"
+
+#~ msgid "Current store format:"
+#~ msgstr "تهيئة الخزن الحالية:"
+
+#~ msgid "Index body contents"
+#~ msgstr "محتويات متن الفهرس"
+
+#~ msgid "New store format:"
+#~ msgstr "تهيئة خزن جديدة:"
+
+#~ msgid "maildir"
+#~ msgstr "دليل البريد"
+
+#~ msgid "mbox"
+#~ msgstr "mbox"
+
+#~ msgid "mh"
+#~ msgstr "mh"
+
+#~ msgid "The following filter rule(s):\n"
+#~ msgstr "قاعدة (أو قواعد) التصفية الآتية:\n"
+
+#~ msgid "On this Computer"
+#~ msgstr "على هذا الحاسوب"
+
+#~ msgid "(SSL is not supported in this build of Evolution)"
+#~ msgstr "(SSL ليس مدعوماً في هذا المركّب من إيفُليوشِن)"
+
+#~ msgid "Account Information"
+#~ msgstr "معلومات الحساب"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "مراجعة البريد ال_داخل"
+
+#~ msgid "Composing Messages"
+#~ msgstr "جاري تأليف الرسائل"
+
+#~ msgid "Configuration"
+#~ msgstr "الإعدادات"
+
+#~ msgid "Default Behavior"
+#~ msgstr "السّلوك الافتراضي"
+
+#~ msgid "Deleting Mail"
+#~ msgstr "جاري حذف البريد"
+
+#~ msgid "Filter Options"
+#~ msgstr "خيارات المصفاة"
+
+#~ msgid "Labels and Colors"
+#~ msgstr "العلامات و الألوان"
+
+#~ msgid "Message Display"
+#~ msgstr "عرض الرّسائل"
+
+#~ msgid "Message Fonts"
+#~ msgstr "خطوط الرّسائل"
+
+#~ msgid "Printed Fonts"
+#~ msgstr "الخطوط المطبوعة"
+
+#~ msgid "Required Information"
+#~ msgstr "معلومات لازمة"
+
+#~ msgid "Restore Defaults"
+#~ msgstr "الإفتراضات المخزونة"
+
+#~ msgid "S_ecurity"
+#~ msgstr "_الأمن"
+
+#~ msgid "Secure MIME (S/MIME)"
+#~ msgstr "MIME آمن (S/MIME)"
+
+#~ msgid "Server Configuration"
+#~ msgstr "إعدادات النّادل"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "إستخدام _جني"
+
+#~ msgid "_Authentication Type: "
+#~ msgstr "نوع ال_تّوثق:"
+
+#~ msgid "_Authentication type: "
+#~ msgstr "نوع ال_تّوثق:"
+
+#~ msgid "_Default signature:"
+#~ msgstr "التّوقيع الإ_فتراضي:"
+
+#~ msgid "_Full name:"
+#~ msgstr "الإسم ال_كامل:"
+
+#~ msgid "_Identity"
+#~ msgstr "ال_هويّة"
+
+#~ msgid "_Junk"
+#~ msgstr "_نفاية"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "اختبارات _محليّة فقط"
+
+#~ msgid "_Receiving Mail"
+#~ msgstr "جاري _تلقي البريد"
+
+#~ msgid "_Restore defaults"
+#~ msgstr "إسترجاع الإ_فتراضات"
+
+#~ msgid "_Sending Mail"
+#~ msgstr "جاري إ_رسال البريد"
+
+#~ msgid "Working"
+#~ msgstr "شاغل"
+
+#~ msgid "Sending \"%s\""
+#~ msgstr "جاري إرسال \"%s\""
+
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "فشل عند الرسالة %d من أصل·%d"
+
+#~ msgid "Search"
+#~ msgstr "بحث"
+
+#~ msgid "Digital Signature"
+#~ msgstr "توقيع رقمي"
+
+#~ msgid "Encryption"
+#~ msgstr "التشفير"
+
+#~ msgid "Save signature"
+#~ msgstr "حفظ التّوقيع"
+
+#~ msgid "Folder Settings"
+#~ msgstr "تعيينات المجلّد"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "مجموعة المختصرات الإفتراضيّة"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "مسار مجلّد الرزنامة الإفتراضي"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "مسار مجلّد البريد الإفتراضي"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "مسار مجلّد المهام الإفتراضي"
+
+#~ msgid "Could not update files correctly"
+#~ msgstr "لم يمكن تحديث الملفّات بشكلٍ صحيح"
+
+#~ msgid "Brought to you by"
+#~ msgstr "قدّم لكم من طرف"
+
+#~ msgid "Select Default Folder"
+#~ msgstr "إنتقاء المجلّد الإفتراضي"
+
+#~ msgid "Default Folders"
+#~ msgstr "المجلّدات الإفتراضيّة"
+
+#~ msgid "Cannot copy folder: %s"
+#~ msgstr "لا يمكن نسخ المجلّد: %s"
+
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "لا يمكن نقل الملف فوق نفسه."
+
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "لا يمكن نسخ الملف فوق نفسه."
+
+#~ msgid "Copy Folder"
+#~ msgstr "نسخ مجلّد"
+
+#~ msgid "Move Folder"
+#~ msgstr "نقل المجلّد"
+
+#~ msgid ""
+#~ "Cannot rename folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لا يمكن إعادة تسمية المجلّد:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "لا يمكن نقل المجلّد:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Importing %s.\n"
+#~ "Starting %s"
+#~ msgstr ""
+#~ "جاري استيراد.\n"
+#~ "جاري بدأ %s"
+
+#~ msgid "Error starting %s"
+#~ msgstr "خطأ عند بدأ تشغيل %s"
+
+#~ msgid "_Filename:"
+#~ msgstr "إ_سم الملف:"
+
+#~ msgid "Please select a user."
+#~ msgstr "الرجاء انتقاء مستخدم."
+
+#~ msgid "Opening Folder"
+#~ msgstr "جاري فتح المجلّد"
+
+#~ msgid "Opening Folder \"%s\""
+#~ msgstr "جاري فتح المجلّد \"%s\""
+
+#~ msgid "in \"%s\" ..."
+#~ msgstr "في \"%s\"·..."
+
+#~ msgid "Cannot find the specified shared folder."
+#~ msgstr "لم يمكن ايجاد المجلّد المشترك المحدّد."
+
+#~ msgid "Quit Assistant"
+#~ msgstr "إنهاء المساعد"
+
+#~ msgid "About Ximian Evolution"
+#~ msgstr "حول زيميان إيفُليوشِن"
+
+#~ msgid "Go to folder..."
+#~ msgstr "إذهب إلى المجلّد..."
+
+#~ msgid "Select the folder that you want to open"
+#~ msgstr "إنتقاء المجلّد الذي تود فتحه"
+
+#~ msgid "Create New Shortcut"
+#~ msgstr "إنشاء مختصر جديد"
+
+#~ msgid "Select the folder you want the shortcut to point to:"
+#~ msgstr "انتقي المجلّد الذي تريد المختصر أن يؤشر إليه:"
+
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "إنشاء مجموعة مختصرات جديدة"
+
+#~ msgid "Group name:"
+#~ msgstr "إسم المجموعة:"
+
+#~ msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+#~ msgstr "هل حقا تريد حذف المجموعة \"%s\" من عمود المختصرات هذا؟"
+
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "إعادة تسمية مجموعة المختصرات"
+
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "إعادة تسمية مجموعة المختصرات المنتقاة لـ:"
+
+#~ msgid "_Small Icons"
+#~ msgstr "أيقونات _صغيرة"
+
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "عرض المختصرات كأيقونات صغيرة"
+
+#~ msgid "_Large Icons"
+#~ msgstr "أيقونات _عريضة"
+
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "عرض المختصرات كأيقونات عريضة"
+
+#~ msgid "_Remove this Group..."
+#~ msgstr "_حذف هذه المجموعة..."
+
+#~ msgid "Remove this shortcut group"
+#~ msgstr "حذف مجموعة المختصرات هذه"
+
+#~ msgid "Re_name this Group..."
+#~ msgstr "إ_عادة تسمية هذه المجموعة..."
+
+#~ msgid "Rename this shortcut group"
+#~ msgstr "إعادة تسمية مجموعة المختصرات هذه"
+
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "إ_خفاء عمود المختصرات"
+
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "أخفاء عمود المختصرات"
+
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "إنشاء مختصرات إ_فتراضيّة"
+
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "إنشاء مختصرات إفتراضيّة"
+
+#~ msgid "Rename Shortcut"
+#~ msgstr "إعادة تسمية المختصر"
+
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "إعادة تسمية المختصر المنتقى إلى:"
+
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "فتح المجلّد الموصول بهذا المختصر"
+
+#~ msgid "Open in New _Window"
+#~ msgstr "فتح في _نافذة جديدة"
+
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "فتح المجلد الموصول بهذا المختصر في نافذة جديدة"
+
+#~ msgid "Rename this shortcut"
+#~ msgstr "إعادة تسمية هذا المختصر"
+
+#~ msgid "Re_move"
+#~ msgstr "إ_زالة"
+
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "إزالة هذا المختصر من عمود المختصرات."
+
+#~ msgid "Shortcuts"
+#~ msgstr "المختصرات"
+
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\"·في \"%s\""
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "خطأ مجهول."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "خطأ من نظام المكوّنات هو::\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "خطأ نظام التنشيط هو:\n"
+#~ "%s"
+
+#~ msgid "The following connections are currently active:"
+#~ msgstr "الإتصالات التالية نشطة حاليا:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "م_راسَلين:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_مهام:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_نوع المجلّد:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "فتح مجلّدات مستخدمين آخرين"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "إ_سم المجلّد:"
+
+#~ msgid "_User:"
+#~ msgstr "ال_مستخدم:"
+
+#~ msgid "Import File (step 3 of 3)"
+#~ msgstr "إستيراد ملف (الخطوة الثالثة من ثلاث)"
+
+#~ msgid "Importer Type (step 1 of 3)"
+#~ msgstr "نوع المستورد (الخطوة الأولى من ثلاث)"
+
+#~ msgid "Select Importers (step 2 of 3)"
+#~ msgstr "إنتقاء المستوردين (الخطوة الثانية من ثلاث)"
+
+#~ msgid "Select a File (step 2 of 3)"
+#~ msgstr "إنتقاء ملف (الخطوة الثانية من ثلاث)"
+
+#~ msgid "Evolution is now exiting ..."
+#~ msgstr "جاري إنهاء افُليوشِن..."
+
+#~ msgid "Cannot access the Ximian Evolution shell."
+#~ msgstr "لم يمكن النفاذ إلى هيكل زيميان افُليوشِن."
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "لم يمكن تشغيل هيكل زيميان افُليوشِن: %s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "هل تريد الوثوق بـ \"%s\" للأغراض التّالية؟"
+
+#~ msgid "_Search for Contacts"
+#~ msgstr "_بحث عن مراسَلين"
+
+#~ msgid "Go to _Date"
+#~ msgstr "إذهب إلى ال_تاريخ"
+
+#~ msgid "Go to today"
+#~ msgstr "إذهب إلى اليوم"
+
+#~ msgid "New _Calendar"
+#~ msgstr "_رزنامة جديدة"
+
+#~ msgid "_Forward Message"
+#~ msgstr "_تمرير الرّسالة"
+
+#~ msgid "_Resend..."
+#~ msgstr "إ_عادة الإرسال..."
+
+#~ msgid "Open a new window"
+#~ msgstr "فتح نافذة جديدة"
+
+#~ msgid "Print Summary"
+#~ msgstr "ملخص الطبع"
+
+#~ msgid "Print summary"
+#~ msgstr "ملخص الطبع"
+
+#~ msgid "Reload"
+#~ msgstr "إعادة تحميل"
+
+#~ msgid "Reload the view"
+#~ msgstr "إعادة تحميل المشهد الحالي"
+
+#~ msgid "With _Category"
+#~ msgstr "مع ال_فئة"
diff --git a/po/az.po b/po/az.po
index 1c9062dc37..77e36348b4 100644
--- a/po/az.po
+++ b/po/az.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-17 12:41+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -23,14 +23,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution ünvan kitabçası"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "əlaqənin başlığı: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution mini kart"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "hazırkı ünvan kitabçası qovluğu"
@@ -51,34 +43,250 @@ msgstr " kartlar"
 msgid " card"
 msgstr " kart"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "əlaqənin başlığı: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution mini kart"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Üzv göndərilə bilmədi!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "IMAP vericisinə tanıdılma xətası"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Bu verici dəstəklənməyən axtarış bazaları ilə cavab verdi"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Bu verici LDAPv3 sxem məlumatını dəstəkləmir"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Wombat vericisi başladıla bilmədi"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Verici hökmlü sxem məlumatı ilə cavab vermədi"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Ünvan kitabçası yüklənə bilmədi"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kateqoriya editoru mövcud deyildir."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "Ünvan kitabçası açıla bilmədi"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Əsas ünvan kitabçasını yükləmə xətası."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Növbə qovluğu həll edilə bilmədi"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Dəyişikliklərinizi qeyd etmək istəyirsiniz?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Unut"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "və bir dənə başqa əlaqə."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "İsmarış məzmunu oxuna bilmədi"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Əlaqə əlavə etmə xətası"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Əgər çıxsanız, bu məktublar Evolution yenidən başladılana dək "
+"göndərilməyəcəkdir."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Ön Qurğulu Sinxronlaşdırma Ünvanı:"
 
-#: addressbook/conduit/address-conduit.c:1150
-#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Ünvan kitabçası yüklənə bilmədi"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot-un Ünvan təminatı bloku oxuna bilmədi"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP vericisinə anonim olaraq yetişmə"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Tanıdılma bacarılmadı.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Avtomatik Tamamlama"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s %s üçün şifrəni bildirin (%s istifadəçisi)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "Ə_laqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "_Vəsiqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Avtomatik tamamlamanı buradan quraşdırın"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Əlaqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Ünvan Kitabçası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Ünvan Kitabçası ünvan pop-up pəncərəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Ünvan Kitabçası kart nümayişçisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Ünvan Kitabçası tərkib hissəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Vəsiqə İdarəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "S/MIME vəsiqələrinizi buradan idarə edin"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -109,87 +317,60 @@ msgid "New Contacts Group"
 msgstr "Yeni Əlaqələr Qrupu"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Ə_laqələr Qrupu:"
 
 #: addressbook/gui/component/addressbook-component.c:111
 msgid "Create a new contacts group"
 msgstr "Yeni əlaqələr qrupu yarat"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Ünvan kitabçası qurğuları ya da qovluqlar yenilənə bilmədi."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP vericisinə bağlanma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "IMAP vericisinə tanıdılma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:535
-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:840
-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:1245
-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:1266
-msgid "Error retrieving schema information"
-msgstr "Sxem məlumatını alma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Verici hökmlü sxem məlumatı ilə cavab vermədi"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Daşınır..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' daşınır:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Bu Kompüterdə"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Şəxsi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP Vericilərində"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP Vericiləri"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Avtomatik Tamamlama Qovluqları"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -201,7 +382,7 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -211,39 +392,41 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolution proqramının bəzi telefon nömrələrini saxlama yöntəmi dəyişdirilibdir.\n"
+"Evolution proqramının bəzi telefon nömrələrini saxlama yöntəmi "
+"dəyişdirilibdir.\n"
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"Evolution proqramının Palm Sync dəyişmə qeydi və xəritə faylları dəyişdirilibdir.\n"
+"Evolution proqramının Palm Sync dəyişmə qeydi və xəritə faylları "
+"dəyişdirilibdir.\n"
 "\n"
 "Xahiş edirik Evolution Pilot Sync məlumatlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' ünvan kitabçası silinəcəkdir. Davam etmək istəyirsiniz?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Yeni Ünvan Kitabçası"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 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
@@ -251,21 +434,25 @@ msgstr "Yeni Ünvan Kitabçası"
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Xassələ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/addressbook-view.c:1002
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Əlaqələr"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP vericisinə anonim olaraq yetişmə"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Tanıdılma bacarılmadı.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s %s üçün şifrəni bildirin (%s istifadəçisi)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -287,70 +474,14 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adları seç dialoqunda ən son işlədilən qovluğun URI-si"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Avtomatik Tamamlama"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "Ə_laqələr"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "_Vəsiqələr"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Avtomatik tamamlamanı buradan quraşdırın"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Ünvan Kitabçası"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Ünvan Kitabçası ünvan pop-up pəncərəsi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Ünvan Kitabçası kart nümayişçisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Ünvan Kitabçası tərkib hissəsi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Vəsiqə İdarəsi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "S/MIME vəsiqələrinizi buradan idarə edin"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Dəstəklənən Bazaları _Göstər "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -358,384 +489,309 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Tanıtma</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Görünüş</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Endirmə</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Axtarış</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Verici Məlumatı</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Yazı:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Əlaqələr Qrupu Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Ünvan Kitabçası Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonim olaraq"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-#: calendar/gui/dialogs/task-editor.c:193
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Əsas"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Bağlanır"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Təfərruatlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Ayırılan _adı:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Ayırılan ad"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Endirmə məhdudiyyəti"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Epoçt ünvanı"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Epoçt ünvanı:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-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:29
-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:22
+#, fuzzy
+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:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Mümkün Axtarış Bazalarını Tap"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Qətiyyən"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Bir"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Təkcə başlanğıc nöqtəsində olan mövqeləri"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Axtarışın əhatə _sahəsi: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Təkcə axtarış bazası"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Axtarışın əhatə sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Axtarılır"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Alt"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Bu sizin ldap vericinizin tam adıdır. Məsələn: \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 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:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "BU seçim axtarışın nə vaxtla icra ediləcəyini bildirir."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Vaxt dolması:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "SSL/TLS _işlət:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Ayırılan ad (DN) işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Mümkünsə Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "Ə_laqələr Qrupu Əlavə Et"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Göstərilən ad:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Mümkün Axtarış Bazalarını Tap"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Giriş"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port nömrəsi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Axtarış bazası:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Verici adı:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Axtarışın əhatə sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Verici:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Vaxt Dolması (dəqiqə):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Vaxt dolması:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Etibarlı bağlantı işlət:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "bağlanma-səkməsi"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "ümumi-səkmə"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "axtarış-səkməsi"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Ünvan Kitabçası siçim ara üzü"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Ünvan Kitabçasından Əlaqələri Seç"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Hamısını Sil"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Sil"
 
-#: 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 "Ad"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Hamısını Sil"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Əlaqə Siyahısını Göstər"
@@ -750,7 +806,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML Məktubu Göndərilsin?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Əlaqələrə Əlavə Et"
 
@@ -758,15 +814,22 @@ msgstr "Əlaqələrə Əlavə Et"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
+#: 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
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Mənbə"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Ünvan Kitabçası siçim ara üzü"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Ünvan Kitabçasından Əlaqələri Seç"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -788,6 +851,11 @@ msgstr "_Kateqoriya:"
 msgid "_Find"
 msgstr "_Tap"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "A_xtar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Epoçt</b>"
@@ -826,8 +894,7 @@ msgstr "<b>İş</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -848,7 +915,6 @@ msgid "Birthday:"
 msgstr "Ad günü:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Təqvim:"
 
@@ -861,15 +927,15 @@ msgid "Company:"
 msgstr "Şirkət:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Əlaqə"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
@@ -890,86 +956,85 @@ msgid "Full _Name..."
 msgstr "_Tam Ad..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Ev"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Veb Səhifəsi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Məslək:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Mövqe:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Məktublaşma Ünvanı"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "İdarəçi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Ləqəb:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Digər"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "İdarə"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "PO Qutusu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Şəxsi Məlumatlar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Məslək:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Yoldaş"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Vilayət/Provinsiya:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "B_aşlıq:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "HTML poçt almaq istəyir"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Veb Kamerası:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Veb Səhifəsi:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "İş"
 
@@ -986,50 +1051,27 @@ msgid "_File under:"
 msgstr "_Fayl altında:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Harada:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "üzv7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "üzv8"
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Həqiqətən də bu əlaqələri \n"
-"silmək istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Həqiqətən də bu əlaqəni \n"
-"silmək istəyirsiniz?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Ünvan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Dəyişdirilə bilən"
 
@@ -2001,107 +2043,121 @@ msgstr "Zambiya"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Xidmət"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Mövqe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "İstifadəçi adı"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
+msgid "Other"
+msgstr "Digər"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
-msgid "ICQ"
-msgstr "ICQ"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Mənbə Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Hədəf Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Yeni Əlaqə Mi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kateqoriya editoru mövcud deyildir."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Xaniş edirik bu əlaqə üçün bir rəsm seçin"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Rəsm olmasın"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr ""
-"Aşağıdakı girişlər səhvdir:\n"
-"\n"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, 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-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+msgstr "Təkrar tarixi səhvdir"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Xidmət"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d əlaqə"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Mövqe"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "İstifadəçi adı"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2112,7 +2168,7 @@ msgid "_Edit Full"
 msgstr "_Hamısını Düzəlt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Tam Ad:"
 
@@ -2120,6 +2176,22 @@ msgstr "_Tam Ad:"
 msgid "E-_mail:"
 msgstr "E-_poçt:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Həqiqətən də bu əlaqələri \n"
+"silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Həqiqətən də bu əlaqəni \n"
+"silmək istəyirsiniz?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Ünvan _2:"
@@ -2242,48 +2314,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Ünvan Kitabçasından Əlaqələri Seç"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Üzvlər"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Seçili üzvləri ilişdirilmiş fayllar siyahısından sil"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Seçili"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Bu siyahıya məktub göndərəndə ünvanları _gizlə"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Siyahı _adı:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Epoçt ünvanını _yazın ya da əlaqəni aşağıdakı siyahıya daşıyın:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "contact-list-editor"
-msgstr "əlaqə-siyahısı-editoru"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialoq1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Kitab"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: 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:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Məcburi İştirakçılar"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
-msgid "Save List as VCard"
-msgstr "Siyahını VCard Olaraq Qeyd Et"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Dəyişdirilmiş Əlaqə:"
@@ -2322,425 +2415,11 @@ msgstr ""
 "mövcuddur.  Bunu yenə də əlavə etmək istəyirsiniz?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
-msgid "(map)"
-msgstr "(xəritə)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
-msgid "map"
-msgstr "xəritə"
-
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
-msgid "List Members"
-msgstr "Üzvləri Sırala"
-
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "E-mail"
-msgstr "E-poçt"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Quruluş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-msgid "Position"
-msgstr "Mövqe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:348
-msgid "Video Conferencing"
-msgstr "Video İclas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:350
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "work"
-msgstr "iş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
-msgid "Blog"
-msgstr "Bloq"
-
-#: addressbook/gui/widgets/eab-contact-display.c:371
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Əl Telefonu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:375
-msgid "personal"
-msgstr "şəxsi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:382
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Qeyd"
-
-#: addressbook/gui/widgets/eab-contact-display.c:548
-msgid "Job Title"
-msgstr "Məslək"
-
-#: addressbook/gui/widgets/eab-contact-display.c:552
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Epoçt"
-
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Home page"
-msgstr "Ev səhifəsi"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Success"
-msgstr "Müvəffəqiyyət"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Backend busy"
-msgstr "Bəkend məşğuldur"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Repository offline"
-msgstr "Nüsxə xətdə deyil"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
-msgid "Address Book does not exist"
-msgstr "Ünvan Kitabçası mövcud deyil"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
-msgid "No Self Contact defined"
-msgstr ""
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Permission denied"
-msgstr "İcazə verilmədi"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact not found"
-msgstr "Əlaqə tapıla bilmədi"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Contact ID already exists"
-msgstr "Əlaqə ID-si onsuz da mövcuddur"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Protocol not supported"
-msgstr "Protokol dəstəklənmir"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Ləğv Edildi"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Could not cancel"
-msgstr "Ləğv edilə bilmədi"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Failed"
-msgstr "Tanıtma Bacarılmadı"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "Authentication Required"
-msgstr "Tanıtma Lazımdır"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "TLS not Available"
-msgstr "TLS Mövcud Deyil"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "No such source"
-msgstr "Belə mənbə mövcud deyil"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "Başqa xəta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:103
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Bu ünvan kitabçası açıla bilmədi. Xahiş edirik, cığırın mövcud olduğunu və "
-"üstündəki səlahiyyətlərinizi yoxlayın."
-
-#: addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Bu ünvan kitabçası açıla bilmədi. Ya səhv URI bildirdiniz, ya da LDAP "
-"vericisinə yetişilə bilmir."
-
-#: addressbook/gui/widgets/eab-gui-util.c:115
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"Evolution proqramının bu buraxılışı LDAP verici dəstəyi ilə dərlənməmişdir. "
-"LDAP dəstəkli Evolution üçün aşağıdakı körpüdən OpenLDAP-ı aldıqdan sonra "
-"CVS mənbələrini yenidən dərləməlisiniz."
-
-#: addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Bu ünvan kitabçası açıla bilmədi.  Ya səhv URL bildirdiniz, ya da vericiyə "
-"yetişilə bilmir."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ünvan kitabçası açıla bilmədi"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:168
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:174
-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/widgets/eab-gui-util.c:177
-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ətbiq etməyi rədd etdi."
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "This query did not complete successfully."
-msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
-
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Unut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
-msgid "Error adding list"
-msgstr "Siyahıya əlavə etmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
-msgid "Error adding contact"
-msgstr "Əlaqə əlavə etmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:240
-msgid "Error modifying list"
-msgstr "Siyahı təkmilləşdirmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:240
-msgid "Error modifying contact"
-msgstr "Əlavə təkmilləşdirmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:252
-msgid "Error removing list"
-msgstr "Siyahı çıxartma xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
-msgid "Error removing contact"
-msgstr "Əlaqə silmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:334
-#, 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 yeni pəncərə də açacaqdır.\n"
-"Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:360
-#, 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:364
-msgid "Overwrite"
-msgstr "Üstünə yaz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, 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:437
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:571
-msgid "list"
-msgstr "siyahı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Move contact to"
-msgstr "Əlaqəni daşı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:708
-msgid "Copy contact to"
-msgstr "Əlaqəni köçür"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Move contacts to"
-msgstr "Əlaqələri daşı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:713
-msgid "Copy contacts to"
-msgstr "Əlaqələri köçür"
-
-#: addressbook/gui/widgets/eab-gui-util.c:716
-msgid "Select target addressbook."
-msgstr "Hədəf ünvan kitabçasını seç"
-
-#: addressbook/gui/widgets/eab-gui-util.c:939
-msgid "Multiple VCards"
-msgstr "Çoxlu VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:942
-#, 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:199
-msgid "(none)"
-msgstr "(heç biri)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Birinci Epoçt"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Epoçt 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Epoçt 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Gedişat Seç"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Yeni \"%s\" əlaqəsi yarat"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Ünvanı mövcud \"%s\" əlaqəsinə əlavə et"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Ünvan Kitabçası Sorğulanır..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Əlaqə Məlumatını Düzəlt"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-Poçt Ünvanını Birləşdir"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "və bir dənə başqa əlaqə."
-msgstr[1] "və %d başqa əlaqə."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Tam VCard-ı Göstər"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Kompakt VCard-ı Göstər"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Ünvan kitabçasına qeyd et"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Əlaqə mövcud deyil"
@@ -2754,9 +2433,9 @@ msgstr[1] "%d əlaqə"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Sorğu"
 
@@ -2772,138 +2451,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Bununla başlayan ad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Bununla başlayan Epoçt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Bu kateqoriyada"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Hər hansı bir sahə bunu daxil edir:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Növ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Ünvan Kitabçası"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "VCard olaraq qeyd et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Yeni Əlaqə..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Əlaqələri Axtar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Ünvan Kitabçası Mənbələri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Ötür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Ünvan Kitabçasına Köçür..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Ünvan Kitabçasına Daşı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: 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:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Hazırkı Görünüş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
@@ -2936,6 +2607,8 @@ msgid "Car Phone"
 msgstr "Maşın Telefonu"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kateqoriyalar"
 
@@ -2943,6 +2616,21 @@ msgstr "Kateqoriyalar"
 msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Epoçt"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Epoçt 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Epoçt 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Soyad"
@@ -2979,14 +2667,29 @@ msgstr "Jurnal"
 msgid "Manager"
 msgstr "İdarəçi"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Əl Telefonu"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Ləqəb"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+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
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Quruluş"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Başqa Faks"
@@ -3009,7 +2712,7 @@ msgstr "Radio"
 
 #: 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-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolu"
@@ -3038,29 +2741,21 @@ msgstr "Bölmə"
 msgid "Web Site"
 msgstr "Veb Saytı"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "En"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Hündürlük"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Fokusa Malikdir"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seçili"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Kursora Malikdir"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Sahə"
@@ -3077,7 +2772,11 @@ msgstr "Mətn Modeli"
 msgid "Max field name length"
 msgstr "Maksimal sahə adı uzunluğu"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sütun Eni"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3091,7 +2790,7 @@ msgstr ""
 "\n"
 "Yeni Əlaqə yaratmaq üçün buraya cüt-tıqlayayın."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3101,13 +2800,379 @@ msgstr ""
 "\n"
 "Bu görünüşdə göstəriləcək üzv yoxdur."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sütun Eni"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seçili"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Kursora Malikdir"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(xəritə)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "xəritə"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Üzvləri Sırala"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-poçt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Mövqe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video İclas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "iş"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Bloq"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "şəxsi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Məslək"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Ev səhifəsi"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Müvəffəqiyyət"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Bəkend məşğuldur"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Nüsxə xətdə deyil"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Ünvan Kitabçası mövcud deyil"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "İcazə verilmədi"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Əlaqə tapıla bilmədi"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Əlaqə ID-si onsuz da mövcuddur"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol dəstəklənmir"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Ləğv Edildi"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Ləğv edilə bilmədi"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Tanıtma Bacarılmadı"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Tanıtma Lazımdır"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS Mövcud Deyil"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Belə mənbə mövcud deyil"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Başqa xəta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Bu ünvan kitabçası açıla bilmədi. Xahiş edirik, cığırın mövcud olduğunu və "
+"üstündəki səlahiyyətlərinizi yoxlayın."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Bu ünvan kitabçası açıla bilmədi. Ya səhv URI bildirdiniz, ya da LDAP "
+"vericisinə yetişilə bilmir."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Evolution proqramının bu buraxılışı LDAP verici dəstəyi ilə dərlənməmişdir. "
+"LDAP dəstəkli Evolution üçün aşağıdakı körpüdən OpenLDAP-ı aldıqdan sonra "
+"CVS mənbələrini yenidən dərləməlisiniz."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Bu ünvan kitabçası açıla bilmədi.  Ya səhv URL bildirdiniz, ya da vericiyə "
+"yetişilə bilmir."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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ətbiq etməyi rədd etdi."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Siyahıya əlavə etmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Əlaqə əlavə etmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Siyahı təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Əlavə təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Siyahı çıxartma xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Əlaqə silmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 yeni pəncərə də açacaqdır.\n"
+"Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, 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:305
+msgid "Overwrite"
+msgstr "Üstünə yaz"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "siyahı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Əlaqəni daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Əlaqəni köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Əlaqələri daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Əlaqələri köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Hədəf ünvan kitabçasını seç"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Çoxlu VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, 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:198
+msgid "(none)"
+msgstr "(heç biri)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Birinci Epoçt"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Gedişat Seç"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni \"%s\" əlaqəsi yarat"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Ünvanı mövcud \"%s\" əlaqəsinə əlavə et"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Ünvan Kitabçası Sorğulanır..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Əlaqə Məlumatını Düzəlt"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "E-Poçt Ünvanını Birləşdir"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "və bir dənə başqa əlaqə."
+msgstr[1] "və %d başqa əlaqə."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Tam VCard-ı Göstər"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Kompakt VCard-ı Göstər"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Ünvan kitabçasına qeyd et"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3151,20 +3216,20 @@ msgstr "Evolution VCard ixdalçısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: 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:1000
 msgid "Print contacts"
 msgstr "Əlaqələri çap et"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Əlaqəni çap et"
 
-#: 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.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3349,6 +3414,22 @@ msgstr "Əlaqə Çapı Sınağı"
 msgid "This should test the contact print code"
 msgstr "Bu əlaqə çapını sınayacaqdır"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Fayl açıla bilmir"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ünvan kitabçası yüklənə bilmədi"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ünvan kitabçası açıla bilmədi"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Standart nəticə yerinə çıxış faylı bildir"
@@ -3374,7 +3455,8 @@ msgid "Export in asynchronous mode "
 msgstr "Asinxron modda ixrac et"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3382,7 +3464,8 @@ msgid "NUMBER"
 msgstr "ƏDƏD"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3401,16 +3484,6 @@ msgstr "Normal moddadır, böyüklük seçimi verilməməlidir."
 msgid "Impossible internal error."
 msgstr "Mümkün olmayan daxili xəta."
 
-#: 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
-msgid "Can not open file"
-msgstr "Fayl açıla bilmir"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URL açıla bilmir"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Əsas ünvan kitabçasını yükləmə xətası."
@@ -3427,39 +3500,368 @@ msgstr "Fayl adı bildirilməyib."
 msgid "Unnamed List"
 msgstr "Adsız Siyahı"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Silmə"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Alıcı:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Bu görüşü həqiqətən də ləğv edib silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Həqiqətən də %d vəzifəni silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Həqiqətən də %d jurnal girişini silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "`%s' görüşünü həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Həqiqətən də %d görüşü silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "`%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "`%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "`%s' görüşünü həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "`%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "`%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Görüş"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Dəyişikliklərinizi qeyd etmək istəyirsiniz?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər unudularaq editor "
+"yenilənsin?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Dəyişiklikləri Unut"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "İsmarışı Qeyd Et"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Göndər"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Əgər çıxsanız, bu məktublar Evolution yenidən başladılana dək "
+"göndərilməyəcəkdir."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar ixdalçısı"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Əgər çıxsanız, bu məktublar Evolution yenidən başladılana dək "
+"göndərilməyəcəkdir."
+
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Şifrəni bildir"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Çox Günlü Hadisələri Böl:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Wombat vericisi başladıla bilmədi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Wombat başladıla bilmədi"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot Təqvim əlavələri bloku oxuna bilmədi"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Təqvim və Vəzifələr"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Təqvimlər"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Təqvimi və Vəzifələr"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Təqvim quraşdırma idarəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Təqvim vaxtlaşdırma ismarış nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Təqvim/Vəzifə editoru"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution Təqvim tərkib hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution Vəzifələr tərkib hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Vəzifələr"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Təqvimlər"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Başlanğıc:"
@@ -3557,10 +3959,6 @@ msgstr ""
 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/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Təqvim alarm ilə bildriş xidməti"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo hazırlana bilmədi"
@@ -3701,11 +4099,31 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Tarix səyyahında həftə saylarının göstərilməsi"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "İcmal bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "İzahat bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Şərh bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Mövqe bunu daxil edir"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Oxşar Olmayan"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Təqvim"
 
@@ -3723,8 +4141,8 @@ msgid "Purge events older than"
 msgstr "Bundan köhnə hadisələri sil"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "gün"
 
@@ -3735,7 +4153,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %b %d"
@@ -3783,62 +4201,52 @@ msgstr "Hadisə və görüşmələr yatamaq üçün '%s' təqvimi açıla bilmir
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Hadisə və görüşmələr yatamaq üçün təqvim mövud deyil"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Təqvimlər"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Yeni görüş yarat"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Yeni görüş istəyi yarat"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Yeni tam günlük görüş"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Yeni tam günlük görüş yarat"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Yeni təqvim"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Təqvim"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Təqvim"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Yeni təqvim yarat"
 
@@ -3868,26 +4276,6 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "İcmal bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "İzahat bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Şərh bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Mövqe bunu daxil edir"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Oxşar Olmayan"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Təqvim açılırkən xəta oldu"
@@ -3905,236 +4293,133 @@ msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
-msgid "Audio Alarm Options"
-msgstr "Səsli Alarm Seçimləri"
-
-#: calendar/gui/dialogs/alarm-options.c:475
-msgid "Message Alarm Options"
-msgstr "İsmarış Alarm Seçənəkləri"
-
-#: calendar/gui/dialogs/alarm-options.c:484
-msgid "Email Alarm Options"
-msgstr "Məktubla Alarm Seçimləri"
-
-#: calendar/gui/dialogs/alarm-options.c:493
-msgid "Program Alarm Options"
-msgstr "Proqram Alarm Seçənəkləri"
-
-#: calendar/gui/dialogs/alarm-options.c:509
-msgid "Unknown Alarm Options"
-msgstr "Naməlum Alarm Seçənəkləri"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarm Təkrarlaması"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Göstəriləcək İsmarış:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Göndəriləcək İsmarış"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Səs çal:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Alarmı təkrarla"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Proqramı işə sal: "
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Alıcı:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Bu arqumentlərlə:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
-msgid "dialog1"
-msgstr "dialoq1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Bildirişlər:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "hər əlavə vaxtda"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Vəzifə Siyahısı Seçimləri</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
-msgid "hours"
-msgstr "saat"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Ümumi</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Gedişat/Hadisə"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Təqvim Əlavə Et"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Ə_lavə Et"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "İsmarış yaz"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Əsaslar"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Tarix/Vaxt:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_İsmarışlar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Səs çal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Xatırladıcılar"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Proqram işə sal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Alıcı:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Epoçt göndər"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Mündəricat:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Hesab:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Seçimlər..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Proqram İşə Sal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Alarmı təkrarla"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Göndər"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "əvvəl"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "gün"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "görüşün sonu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "hər əlavə vaxtda"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "dəqiqə"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "iclasın başlanğıcı"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
-msgid "You must specify a location to get the calendar from."
-msgstr "Təqvimin alınacağı ünvanı bildirməlisiniz."
-
-#: calendar/gui/dialogs/calendar-setup.c:178
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "'%s' mənbə mövqeyi düzgün formlanmayıb."
-
-#: calendar/gui/dialogs/calendar-setup.c:193
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "'%s' mənbə mövqeyi webcal mənbəsi deyil."
-
-#: calendar/gui/dialogs/calendar-setup.c:265
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Seçili qrupda onsuzda '%s' adlı mənbə mövcuddur"
-
-#: calendar/gui/dialogs/calendar-setup.c:278
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Təqvim Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Vəzifə Qrupu Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "Rə_ng:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Təqvim Xassələri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Rəng seç"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Uzaq"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Vəzifə Siyahısı Xassələri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Add Calendar"
-msgstr "_Təqvim Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr "_Qrup Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Yeniləmə Aralığı:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr "_Yenilə:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Mənbə URI-si:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr "_Növ:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Gedişat/Hadisə"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Ə_lavə Et"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "həftə"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "%s vaxtı alarm ver"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4234,7 +4519,7 @@ msgid "Display"
 msgstr "Göstər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Fəallaşdır"
 
@@ -4243,8 +4528,8 @@ msgid "Free/Busy Publishing"
 msgstr "Sərbəst/Məşğul Nəşri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4257,8 +4542,8 @@ msgid "Minutes"
 msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4267,8 +4552,8 @@ msgid "S_un"
 msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4281,8 +4566,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:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4295,8 +4580,8 @@ msgid "T_hu"
 msgstr "C_ax"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4309,8 +4594,8 @@ msgid "Time format:"
 msgstr "Vaxt formatı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Çərşənbə Axşamı"
 
@@ -4319,8 +4604,8 @@ msgid "W_eek starts:"
 msgstr "Həftənin _başlanğıcı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -4352,8 +4637,9 @@ msgstr "Aylıq nümayişlərdə həftə sonlarını _sıxışdır"
 msgid "_Day begins:"
 msgstr "Günün _başlanğıcı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 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:43
@@ -4402,157 +4688,187 @@ msgstr "_Çər"
 msgid "before every appointment"
 msgstr "hər görüşdən əvvəl"
 
-#: 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/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Təqvimin alınacağı ünvanı bildirməlisiniz."
 
-#: 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/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "'%s' mənbə mövqeyi düzgün formlanmayıb."
 
-#: 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/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "'%s' mənbə mövqeyi webcal mənbəsi deyil."
 
-#: 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/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Seçili qrupda onsuzda '%s' adlı mənbə mövcuddur"
 
-#: calendar/gui/dialogs/cancel-comp.c:75
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
 msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
 msgstr ""
 
-#: 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/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Təqvim Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Vəzifə Qrupu Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "Rə_ng:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Rəng seç"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Təqvim Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Qrup Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Yenilə:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Növ:"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "həftə"
+
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Bu hadisə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Bu vəzifə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, 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 "
 "editorbağlansın?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, 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:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Bu hadisə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Bu vəzifə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Bu jurnal girişi dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, 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?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, 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?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Yoxlama xətası: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " alıcı "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Qalan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Qalan"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Cism yenilənə bilmədi"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Görüşü Dəyişdir"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal girişi - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Fərqli qeyd et..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Hazırkı buraxılış işlədilə bilmir!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Yoxlama xətası: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " alıcı "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Qalan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Qalan"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Mənbə açıla bilmədi"
@@ -4565,105 +4881,58 @@ msgstr "Hədəf açıla bilmədi"
 msgid "Destination is read only"
 msgstr "Hədəf sırf oxunandır"
 
-#: 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: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: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: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: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: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:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Həqiqətən də %d görüşü silmək istəyirsiniz?"
-msgstr[1] "Həqiqətən də %d görüşü silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Həqiqətən də %d vəzifəni silmək istəyirsiniz?"
-msgstr[1] "Həqiqətən də %d vəzifəni silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Həqiqətən də %d jurnal girişini silmək istəyirsiniz?"
-msgstr[1] "Həqiqətən də %d jurnal girişini silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu üzv silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu üzv silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu üzv silinə bilmədi"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Ünvan kitabçası..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Əlaqələr"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4673,163 +4942,224 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Xatırladıcı"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Vaxtlaşdırma"
 
-#: 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "İstiqamət"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Başlama tarixi olmayan hadisə"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Bitiş tarixi olmayan hadisə"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Başlama tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Başlama vaxtı səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Bitiş vaxtı səhvdir"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "'%s' təqvimi açıla bilmədi."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "hər görüşdən əvvəl"
+msgstr[1] "hər görüşdən əvvəl"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "görüşün sonu"
+msgstr[1] "görüşün sonu"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "hər görüşdən əvvəl"
+msgstr[1] "hər görüşdən əvvəl"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Bütün günlük hadisə"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "hər görüşdən əvvəl"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Məşğul"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "hər görüşdən əvvəl"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Kateqoriyalar..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "hər görüşdən əvvəl"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Vəzifə Siyahısı</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Sinifləndirmə"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Saat</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Gizli"
+msgid "A_ll day event"
+msgstr "_Bütün günlük hadisə"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Tarix & Saat"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Xüsusi Görünüşü Qeyd Et..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "B_oş"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Kateqoriyalar..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Mövqe:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Təqvim:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Xü_susi"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Sinifləndirmə"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "İ_ctimai"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Gizli"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Saadın Göstəriliş Şəkli"
+msgid "L_ocation:"
+msgstr "_Mövqe:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Şəxsi"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "İctimai"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Saadın Göstəriliş Şəkli"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Mü_ndəricat:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Təmizlə"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "İzahat:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Bitiş vaxtı:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Başlama vaxt:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Yoxdur"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Seçili təşkilatçı artıq hesaba malik deyil."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Təşkilatçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Ən az bir iştirakçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Sil"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Çı_xart"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "İştirakçı"
@@ -4865,36 +5195,45 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Vəziyyət"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "_İştirakçı Əlavə Et"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Bildirişlər:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Digər</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Təşkilatçı:"
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Təşkilatçını _Dəyişdir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
-msgstr "Təşkilatçını _Dəyişdir"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Əlaqələr"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Başqalarını _Dəvət Et..."
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Təşkilatçı:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4945,7 +5284,8 @@ msgstr ""
 "istərdiniz?"
 
 #: 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 ""
 "Siz təkrarlanan bir jurnal girişini təkmilləşdirirsiniz, nəyi "
 "təkmilləşdirmək istərdiniz?"
@@ -4966,219 +5306,179 @@ msgstr "Bu və Növbəti Nümunələri"
 msgid "All Instances"
 msgstr "Bütün Nümunələri"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 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:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Təkrar tarixi səhvdir"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "tarixində"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "ilk"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "ikinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "üçüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "dördüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "sonuncu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Başqa Tarix"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "tarixində"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "hadisələr"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Tarix/Saat"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Hər"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Xaric Tutulanlar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Nümayiş"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Təkralanma Qaydası"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Xüsusi təkrarlama"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Düzəlt"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Nümayiş</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Təkrarlama _yoxudr"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
-msgid "_Remove"
-msgstr "Çı_xart"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hər"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Bəsit təkrarlama"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "üçün"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "həmişə"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "ay"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "qədər"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "həftə"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "il"
 
-#: 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 ""
-"Bu hadisə dəyişdirilib, amma qeyd edilməyib.\n"
-"\n"
-"Dəyişiklikləriniz qeyd edilsin?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "Dəyişiklikləri _Unut"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Hadisəni Qeyd Et"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Hədəfi seç"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Hədəf"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Vəzifə Siyahısı"
 
-#: 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: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: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: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:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Məktubların Yazı Növləri</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Bitdi"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Xəbərdarlıqlar</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Bitirilib"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Yüksək"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Fəaliyyətdə"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Alçaq"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Başlamayıb"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Fəaliyyət"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Başa Çatmış Nisbət: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5201,36 +5501,42 @@ msgstr "_Vəziyyət:"
 msgid "_Web Page:"
 msgstr "_Veb Səhifəsi:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Vəzifə"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Tapşırıq"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' içindəki vəzifələr açıla bilmədi."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Gi_zli"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Seçimlər</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Poçtun Silinməsi</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "İzahat:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Qovluq:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Başla_ma tarixi:"
@@ -5239,52 +5545,58 @@ msgstr "Başla_ma tarixi:"
 msgid "_Due date:"
 msgstr "_Bitiş tarixi:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Qrup"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Təqvim seçimləri</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Hər Gün"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Nəşr Tezliyi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Sərbəst/Məşğul Editoru"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Sərbəst/Məşğul Nəşr Mövqeyi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Sərbəst/Məşğul Nəşr Mövqeyi"
+msgid "Free/Busy Editor"
+msgstr "Sərbəst/Məşğul Editoru"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Giriş adı:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Hər Gün"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Şifrə:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Məktub"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Nəşr Tezliyi"
+#, fuzzy
+msgid "_Password:"
+msgstr "Şifrə:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Şifrəni yadda saxla"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_İstifadəçi adı:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "İstifadəçi Nəşrləri"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Hər Həftə"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5366,7 +5678,7 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "Namə'lum işə salma növü üçün %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "%s ünvanını açmaq üçün tıqlayın"
@@ -5375,6 +5687,11 @@ msgstr "%s ünvanını açmaq üçün tıqlayın"
 msgid "Untitled"
 msgstr "Adsız"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Mündəricat:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5386,7 +5703,7 @@ msgstr "Bitiş Tarixi:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Vəziyyət:"
 
@@ -5398,20 +5715,93 @@ msgstr "Vaciblik:"
 msgid "Web Page:"
 msgstr "Veb Səhifəsi:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "İctimai"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Bitiş Tarixi"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Şəxsi"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Başlama Tarixi"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Gizli"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Mündəricat"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Sərbəst"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Məşğul"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Baz."
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Çərş."
+
+#: calendar/gui/e-cal-model-tasks.c:601
+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:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 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:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 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:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Namə'lum"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Təkrarlanan"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Vəzifələndirilmiş"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5457,95 +5847,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Sərbəst"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Məşğul"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Seçili üzvlər silinir"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Üzvlər yenilənir"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Veb Səhifəsini Aç"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Ç_ap et..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: 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:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Köçür"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Yapışdır"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Vəzifə Tə'yin Et"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "iCalendar şəklində ö_tür"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "Bitmiş Olaraq _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Seçili Vəzifələri Bitmiş Olaraq _İşarələ"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Sil"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Seçili Vəzifələri _Sil"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Fərqli qeyd et..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 
@@ -5554,174 +5950,105 @@ msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 msgid "% Complete"
 msgstr "% Bitdi"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Bitdi"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Bitiş tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Vaxt"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Üstünlük"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Başlama tarixi"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Mündəricat"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "İsmarışlar daşınır"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "İsmarışlar köçürülür"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Günlük _Hadisə"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Yeni Görüş"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "_Bugünü Seç"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "Tarixi _Seç..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Nəşr Et"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Təqvimə _Köçür..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Təqvimə _Daşı..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Görüş Planlaşdır..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar şəklində ö_tür..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqiəni Sil"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqiələri Sil"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Qurğular..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Bitiş Tarixi"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Başlama Tarixi"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Namə'lum"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Təkrarlanan"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Vəzifələndirilmiş"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 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.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Xeyir"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Baz."
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Çərş."
-
-#: calendar/gui/e-cal-model-tasks.c:601
-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"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5745,133 +6072,131 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+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.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dəqiqəlik bölmələr"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bəli."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hər gün"
 msgstr[1] "Hər %d gündə"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hər həftə"
 msgstr[1] "Hər %d həftədə"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Həftənin hər müəyyən günündə"
 msgstr[1] "Hər %d həftənin hər müəyyən günündə"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " və "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s günü"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s günü"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hər ay"
 msgstr[1] "hər %d ay"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hər il"
 msgstr[1] "Hər %d il"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "toplam %d dəfə"
 msgstr[1] "toplam %d dəfə"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", bitiş tarixi olaraq "
 
-#: calendar/gui/e-itip-control.c:693
-msgid "<b>Starts:</b> "
-msgstr "<b>Başlayır:</b> "
-
-#: calendar/gui/e-itip-control.c:703
-msgid "<b>Ends:</b> "
-msgstr "<b>Bitir:</b> "
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Starts"
+msgstr "Vəziyyət"
 
-#: calendar/gui/e-itip-control.c:723
-msgid "<b>Completed:</b> "
-msgstr "<b>Başa Çatdı:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:733
-msgid "<b>Due:</b> "
-msgstr "<b>Vaxt:</b> "
+#, fuzzy
+msgid "Due"
+msgstr "Qalan"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar Mə'lumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Namə'lum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5879,301 +6204,286 @@ 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:925
-msgid "<i>None</i>"
-msgstr "<i>Heç biri</i>"
+#: calendar/gui/e-itip-control.c:942
+msgid "Location:"
+msgstr "Mövqe:"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Əvvəlcədən Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Gedişatı seçin:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Yenilə"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Əvvəlcədən qəbul et"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini yenilə"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Ən Son Mə'lumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Görüş Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1200
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1201
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1206
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Görüş Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1211
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Görüş Yenilənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1219
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1227
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1235
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Vəzifə Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1268
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1269
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1274
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Vəzifə Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1279
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Vəzifə Yeniləmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1287
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1295
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1323
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1328
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1333
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Bu məktub düzgün formlanmayıbdır"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Məktub ancaq dəstəklənməyən istəkləri daxil edir."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1509
 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:1535
+#: calendar/gui/e-itip-control.c:1541
 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:1769
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Yeniləmə başa çatdı\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
-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"
-
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Cism səhvdir və yenilənə bilməz\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1813
 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:1837
+#: calendar/gui/e-itip-control.c:1825
 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:1856
-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:1859
-msgid "Object could not be found\n"
-msgstr "Cism tapıla bilmədi!\n"
-
-#: calendar/gui/e-itip-control.c:1862
-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:1865
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti yeniləndi\n"
 
-#: calendar/gui/e-itip-control.c:1868
-msgid "Attendee status could not be updated!\n"
-msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
+#: calendar/gui/e-itip-control.c:1845
+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"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Çıxartma Başa Çatdı"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
@@ -6202,6 +6512,10 @@ msgstr "Təqvim Yüklənir"
 msgid "Loading calendar..."
 msgstr "Təqvim yüklənir..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Təşkilatçı:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Verici İsmarışı:"
@@ -6214,74 +6528,69 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama-tarixi"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "İdarəçilər"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
-msgid "Required Participants"
-msgstr "Məcburi İştirakçılar"
-
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Mənbələr"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 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-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Otaq"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Stul"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 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-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçı"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Qeyri-İştirakçı"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 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-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 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-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Temsilli"
@@ -6290,6 +6599,28 @@ msgstr "Temsilli"
 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:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
@@ -6298,86 +6629,64 @@ msgstr "İş Yerində Deyil"
 msgid "No Information"
 msgstr "Mə'lumat Yoxdur"
 
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Seçimlər"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Seçimlər"
 
-#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:449
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Ancaq _İş Saatlarını Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:459
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
-#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:474
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Yenilə"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Avtomarik Seç"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:539
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Bütün Adamlar və Mənbələr"
 
-#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:548
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Bütün _Adamlar və Bir Mənbə"
 
-#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:557
+#, fuzzy
+msgid "_Required people"
 msgstr "_Məcburi Adamlar"
 
-#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:566
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Məcburi Adamlar və _Bir Mənbə"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "İclas _başlama saatı:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "İclas _bitiş saatı:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s üçün şifrəni bildir"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6386,125 +6695,51 @@ msgstr ""
 "%s-da xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Vəzifələrin yüklənməsi"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtı açılır"
 
-#: calendar/gui/e-tasks.c:709
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"%s açılırkən xəta:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:730
-msgid "Loading tasks"
-msgstr "Vəzifələrin yüklənməsi"
-
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Geri alma"
 
-#: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Vəzifələr"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Üzvlər yenilənir"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılır"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Silmə"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Təqvim və Vəzifələr"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Təqvimi və Vəzifələr"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Təqvim quraşdırma idarəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Təqvim vaxtlaşdırma ismarış nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Təqvim/Vəzifə editoru"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution Təqvim tərkib hissəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution Vəzifələr tərkib hissəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Təqvimlər"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Vəzifələr"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -6649,7 +6884,7 @@ msgid "On The Web"
 msgstr "Vebdə"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6660,7 +6895,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "'%s' təqvimi daşına bilmədi."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "'%s' vəzifələri daşına bilmədi."
@@ -6850,10 +7085,6 @@ msgstr "Seçili ay (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Seçili il (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Vəzifə"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6884,7 +7115,7 @@ msgid "Contacts: "
 msgstr "Əlaqələr: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Çap Nümayişi"
 
@@ -6896,69 +7127,64 @@ msgstr "Üzvü Çap Et"
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Yeni Vəzifə Siyahısı"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d vəzifə"
 msgstr[1] "%d vəzifə"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seçilidir"
 msgstr[1] ", %d seçilidir"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Vəzifələrin yenilənməsi bacarılmadı."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Yeni vəzifə qrupu"
 
-#: calendar/gui/tasks-component.c:813
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Vəzifə Qrupu"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Yeni vəzifə qrupu yarat"
 
@@ -8635,69 +8861,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "'%s'-dan səhv ismarış axımı alındı:'%s'"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Qovluqlar sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Süzgəc oxuma xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Süzgəc işə salma xətası: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Növbə qovluğu açıla bilmədi"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Növbə qovluğu həll edilə bilmədi"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d ismarışı alınır (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "İsmarış açıla bilmir"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d ismarışında xəta yarandı"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Qovluq sinxronlaşdırılır"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Alınan ismarış: %d / %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d / %d ismarışında iflas etdi"
@@ -8719,37 +8945,6 @@ msgstr "İstifadəçi bayrağına səhv arqumentlər"
 msgid "Error executing filter search: %s: %s"
 msgstr "Süzgəc axtarışı işə salma xətası: %s: %s"
 
-#: camel/camel-folder.c:653
-#, 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:1259
-#, 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:1299
-#, 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:1416
-msgid "Moving messages"
-msgstr "İsmarışlar daşınır"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "İsmarışlar köçürülür"
-
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Spam və Spam Olmayan məktubların öyrənilməsi"
-
-#: camel/camel-folder.c:1695
-msgid "Filtering new message(s)"
-msgstr "Yeni məktub(lar) süzülür"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8780,20 +8975,56 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorğu aparılır: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, 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:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "İsmarışlar daşınır"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "İsmarışlar köçürülür"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Xəbərdarlıq"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Yeni məktub(lar) süzülür"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8804,15 +9035,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid bildirişi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg şifrə istəyi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8821,27 +9052,28 @@ 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:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ləğv edildi."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, 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:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8852,61 +9084,81 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, 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:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "İmzalama mə'lumat yaradıla bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg icra edilə bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg icra edilə bilmədi."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "İsmarış imzası təsdiqlənə bilmədi: səhv ismarış formatı"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Şifrələmə məlumatı yarana bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Bu, digital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Şifrələnmiş məzmun"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "İsmarış məzmunu oxuna bilmədi"
 
+#: 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: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: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:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' qıfıllana bilmədi"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8929,26 +9181,6 @@ msgstr "fcntl(2) istifadə edilərək qıfıl faylı alına bilmədi: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alına bilmədi: %s"
 
-#: 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: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: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:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' qıfıllana bilmədi"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9191,7 +9423,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:1212
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -9272,55 +9504,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:275
+#: camel/camel-service.c:271
 #, 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:279
+#: camel/camel-service.c:275
 #, 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:283
+#: camel/camel-service.c:279
 #, 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:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "%s tapılır"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ad axtarışında iflas: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, 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:798
+#: camel/camel-service.c:794
 #, 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:801
+#: camel/camel-service.c:797
 #, 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:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Ünvan tapılır"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Qovşaq axtarışı iflas etdi: qovşaq tapılmadı"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Qovşaq axtarışı iflas etdi: namə'lum səbəb"
 
@@ -9392,7 +9624,7 @@ msgstr "Şifrələmə vəsiqəsi əlavə edilə bilmir"
 msgid "Cannot add CMS SignerInfo"
 msgstr "CMS imzalayan məlumatı əlavə edilə bilmir"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Kodlama məzmunu yaradıla bilmir"
 
@@ -9473,7 +9705,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Təkcə vəsiqəli ismarışdır, vəsiqələr idxal edildi və yoxlandı"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "İmza daycestləri tapıla bilmir"
 
 #: camel/camel-smime-context.c:651
@@ -9486,47 +9719,49 @@ msgid "Decoder failed"
 msgstr "Decoder iflas etdi"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "`%s' üçün vəsiqə tapıla bilmir"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "'%s' üçün vəsiqə tapıla bilmir"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "CMS ismarışı yaradıla bilmədi"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "CMS ismarışı yaradıla bilmir"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "CMS EnvelopedData yaradıla bilmədi"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "CMS EnvelopedData ilişdirilə bilmədi"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "CMS data üzvü ilişdirilə bilmədi"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "CMS RecipientInfo yaradıla bilmədi"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "CMS RecipientInfo əlavə edilə bilmədi"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Şifrələyənin məzmunu yaradıla bilmir"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Şifrələyiciyə məlumat əlavə edilə bilmədi"
@@ -9548,40 +9783,41 @@ msgstr "düymələri idxal et: hazır deyil"
 msgid "export keys: unimplemented"
 msgstr "düymələri ixrac et: hazır deyil"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alına bilmir: Mənbədə səhv əməliyyat"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "`%s' qovluğu yaradıla bilmir: onsuz da mövcuddur"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Mənbədə səhv əməliyyat"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Qovluq yaradıla bilmir: %s: qovluq mövcuddur"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Zibil"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -9701,7 +9937,7 @@ msgstr "Açar istifadəsi vəsiqə imzalamasını dəstəkləmir"
 msgid "Error in application verification"
 msgstr "Tə'minat təsdiqləməsində xəta"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9714,11 +9950,11 @@ msgstr ""
 "Barmaq izi:            %s\n"
 "İmza:                    %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "HÖKMLÜ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "HÖKMSÜZ"
 
@@ -9742,7 +9978,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9757,7 +9993,7 @@ msgstr ""
 "\n"
 "Qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9766,7 +10002,7 @@ msgstr ""
 "Vəsiqə problemi: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9775,7 +10011,7 @@ msgstr ""
 "Səhv vəsiqə domeni: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9784,7 +10020,7 @@ msgstr ""
 "Sertifikatın vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9793,7 +10029,7 @@ msgstr ""
 "Vəsiqə Ləğvi siyahısının vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "`%s' URL-si oxuna bilmədi"
@@ -9812,12 +10048,12 @@ msgstr "%s içində %s bənzəri ismarış yoxdur"
 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:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
@@ -9836,8 +10072,8 @@ msgid "Checking for new mail"
 msgstr "Yeni poçt yoxlanır"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Bütün qovluqlarda yeni poçtu yoxla"
 
@@ -9858,327 +10094,56 @@ msgstr "Ünvan Kitabçası Və Təqvim"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Poçta SOAP Portu:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise vericilərinə yetişmək üçün"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
-#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Şifrə"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: 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/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Yoxlama siyahısı"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "%s IMAP vericisindən gözlənilməz cavab: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "`%s' qovluğu seçilə bilmir: Səhv poçt qutusu adı"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "`%s' qovluğu seçilə bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "%s vericisi gözlənilməz şəkildə bağlantını kəsdi: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "BYE cavabı alındı"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Bayraqlar '%s' qovluğuna sinxronlaşdırıla bilmir: Naməlum"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Bayraqlar '%s' qovluğuna sinxronlaşdırıla bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "'%s' qovluğu silinə bilmir: Naməlum"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "'%s' qovluğu silinə bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Qovluqlar"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Ancaq qeydiyyatdan keçmiş qovluqları göstər"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Ad boşluğu"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Bu seçim IMAPv4rev1vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP vericisi"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 vericisinə bağlana bilmədi (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL mövcud deyil"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Bağlantı ləğv edildi"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
-msgid "Unknown error"
-msgstr "Naməlum xəta"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün səhvdir"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "`%s' qovluğu yaradıla bilmir: Səhv poçt qutusu adı"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "`%s' qovluğu yaradıla bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "`%s' qovluğu silinə bilmir: Xüsusi qovluq"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "`%s' qovluğu silinə bilmir: Səhv poçt qutusu adı"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "`%s' qovluğu silinə bilmir: Səhv ad"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
-msgstr "Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "`%s' qovluğuna abunə oluna bilmir: Səhv poçt qutusu adı"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "`%s' qovluğuna abunə oluna bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "`%s' qovluğundan abunəlik ləğv edilə bilmir: Səhv poçt qutusu adı"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "`%s' qovluğundan abunəlik ləğv edilə bilmir: Səhv əmr"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "%s IMAP vericisindən gözlənilməz cavab: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Məlumat yoxdur"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "%s vericisi gözlənilməz şəkildə bağlantını kəsdi: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Naməlum xəta"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10238,13 +10203,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "İsmarış alına bilmədi: %s."
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: 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"
@@ -10254,15 +10212,15 @@ msgstr ""
 "   %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Belə ismarış yoxdur"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcud deyil"
 
@@ -10271,7 +10229,23 @@ msgstr "Bu ismarış hazırda mövcud deyil"
 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:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -10309,6 +10283,27 @@ msgstr ""
 msgid "Command:"
 msgstr "Əmr:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Qovluqlar"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Ancaq qeydiyyatdan keçmiş qovluqları göstər"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+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:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Ad boşluğu"
+
 #: 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 süzgəcləri tətbiq et"
@@ -10329,43 +10324,92 @@ msgstr "IMAP"
 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-store.c:650
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "%s IMAP vericisi"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, 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:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 vericisinə bağlana bilmədi (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL mövcud deyil"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Bağlantı ləğv edildi"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, 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:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 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:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL danışıqları bacarılmadı"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1268
 #, 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:1252
+#: camel/providers/imap/camel-imap-store.c:1278
 #: 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:1275
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, 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:1289
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10376,30 +10420,262 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün səhvdir"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 
-#: camel/providers/imap/camel-imap-store.c:1970
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "`%s' qovluğu yaradıla bilmir: qovluq mövcuddur."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Naməlum qonşu qovluq: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "%s IMAP vericisindən gözlənilməz cavab: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "IMAP vericisindən gözlənilməz cavab: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "`%s' qovluğu seçilə bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "`%s' qovluğu seçilə bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "%s vericisi gözlənilməz şəkildə bağlantını kəsdi: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "BYE cavabı alındı"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Bayraqlar '%s' qovluğuna sinxronlaşdırıla bilmir: Naməlum"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Bayraqlar '%s' qovluğuna sinxronlaşdırıla bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "'%s' qovluğu silinə bilmir: Naməlum"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "'%s' qovluğu silinə bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Bu seçim IMAPv4rev1vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "`%s' qovluğu yaradıla bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "`%s' qovluğu yaradıla bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "`%s' qovluğu silinə bilmir: Xüsusi qovluq"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "`%s' qovluğu silinə bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "`%s' qovluğu silinə bilmir: Səhv ad"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "`%s' qovluğu silinə bilmir: Xüsusi qovluq"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "`%s' qovluğu yaradıla bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "`%s' qovluğu yaradıla bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "`%s' qovluğuna abunə oluna bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "`%s' qovluğuna abunə oluna bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "`%s' qovluğundan abunəlik ləğv edilə bilmir: Səhv poçt qutusu adı"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "`%s' qovluğundan abunəlik ləğv edilə bilmir: Səhv əmr"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "%s IMAP vericisindən gözlənilməz cavab: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Məlumat yoxdur"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "%s vericisi gözlənilməz şəkildə bağlantını kəsdi: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10427,20 +10703,20 @@ msgid "Index message body data"
 msgstr "İsmarışların məzmun məlumatını indekslə"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "poçt qutusu:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10496,7 +10772,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10560,60 +10836,85 @@ 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:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Gələnlər qutusu"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, 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:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$s"
+
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Səhv ismarış məzmunu"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "`%s' qolvuğu alına bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' qolvuğu alına bilmir: qovluq mövcud deyil."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "`%s' qovluğu yarana bilmir: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' qovluğu alına bilmir: poçt qutusu qovluğu deyil."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' qovluğu silinə bilmədi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "poçt qutusu qovluğu deyil"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:355
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu oxuna bilmədi: %s"
@@ -10660,27 +10961,18 @@ msgstr "Məktub əlavəsi ləğv edildi"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox faylına əlava edilə bimir: %s: %s"
 
-#: 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 ""
-"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
-"   %3$s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 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:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "İsmarış quruluşu bacarılmadı: Məktub qutusu xəsərlidir?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Bu adda qovluq yaradıla bilmir."
 
@@ -10710,30 +11002,30 @@ msgstr "`%s' normal fayl deyil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyil. Silinmədi."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s qovluğu yaradıla bilmədi: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Qovluq yaradıla bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Qovluq onsuz da mövcuddur"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Bildirilən yeni qovluq adı səhvdir."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s qovluğu %s adı ilə yenidən adlandırıla bilmədi: %s"
@@ -10924,7 +11216,7 @@ msgstr ""
 "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
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Xahiş edirik %s@%s hesabı üçün NNTP şifrənizi bildirin"
@@ -10941,18 +11233,10 @@ msgstr "İstifadəçi adı vericiyə göndərilə bilmədi"
 msgid "Server rejected username/password"
 msgstr "Verici istifadəçi adı/şifrəni rədd etdi"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: 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-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10961,66 +11245,56 @@ msgstr "İstifadəçi ləğv etdi"
 msgid "Cannot get message %s: %s"
 msgstr "%s ismarışı alına bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: 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-folder.c:201
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Əməliyyat bacarılmadı: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11041,28 +11315,32 @@ msgstr ""
 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."
+msgstr ""
+"Bu seçim NNTP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət quracaqdır."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP əmri iflas etdi: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s salamı oxuna bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, 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:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s vasitəsilə USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11070,72 +11348,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Bağlanma xətası: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Belə qovluq yoxdur: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Tanıtma lazımdır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Qrup alına bilmədi: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Əlaqə mövcud deyil"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP əmri iflas etdi: %s"
+msgid "No such folder: %s"
+msgstr "Belə qovluq yoxdur: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni ismarışlaryoxlanır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Naməlum verici cavabı: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "IMAP vericisindən gözlənilməz cavab: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "GnuPG-dən gözlənilməyən cavab alındı: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Ləğv etməni işlət"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat bacarılmadı: %s"
@@ -11183,7 +11462,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:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11214,20 +11493,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "%s POP vericisinə bağlana bilmədi (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, 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:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, 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:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11236,28 +11520,29 @@ 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:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, 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:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, 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:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, 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:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
-msgstr "%1$sXahiş edirik, %3$s qovşağındakı @%2$s hesabı üçün POP şifrənizi bildirin"
+msgstr ""
+"%1$sXahiş edirik, %3$s qovşağındakı @%2$s hesabı üçün POP şifrənizi bildirin"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11266,13 +11551,22 @@ msgstr ""
 "%s POP vericisinə bağlana bilmədi.\n"
 "Şifrə göndərmə xətası : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"%s POP vericisinə bağlana bilmədi.\n"
+"Şifrə göndərmə xətası : %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, 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:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11326,7 +11620,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:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11404,7 +11698,8 @@ msgstr "Sorğulanan məktub gedişatı ləğv edildi; yer həddi keçilib"
 
 #: 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:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -11465,7 +11760,8 @@ msgstr "%s SMTP vericisi istənən %s tanıtma növünü dəstəkləmir."
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s on host %s"
-msgstr "%1$sXahiş edirik, %3$s qovşağındakı @%2$s hesabı üçün SMTP şifrənizi bildirin"
+msgstr ""
+"%1$sXahiş edirik, %3$s qovşağındakı @%2$s hesabı üçün SMTP şifrənizi bildirin"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
@@ -11478,93 +11774,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP vericisi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s vasitəsilə SMTP məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "İsmarış göndrərilə bilmir: xidmətlə bağlı deyil."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "İsmarış göndrərilə bilmir: göndərənin ünvanı səhvdir."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "İsmarış göndərilir"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "İsmarış göndrərilə bilmədi: alıcı bildirilməyib."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "İsmarış göndrərilə bilmədi: bir ya da daha çox səhv alıcı"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Qarşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "HELO əmri iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Tanıtması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: 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:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "AUTH əmri iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 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:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM əmri iflas etdi: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM əmri iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCTP TO əmri iflas etdi: %s: məktub göndərilmədi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA əmri iflas etdi %s: məktub göndərilmədi"
@@ -11572,26 +11868,26 @@ msgstr "DATA əmri iflas etdi %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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "DATA əmri iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "RSET əmri iflas etdi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT əmri iflas etdi: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "QUIT əmri iflas etdi"
 
@@ -11610,19 +11906,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ilişdirilmiş fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 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:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "İlişdirilmiş fayl əlavə et..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl ilişdir"
 
@@ -11654,94 +11950,6 @@ 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.c:704
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Göndərilən ismarış imzalana bilmir: Bu hesab üçün heç bir imza vəsiqəsi seşilməyib"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Göndərilən ismarış şifrələnə bilmir: Bu hesab üçün heç bir imza vəsiqəsi seşilməyib"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Fayl açıla bilmədi"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Editordan ismarış alına bilmir"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Adsız İsmarış"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Faylı aç"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
-msgid "Autogenerated"
-msgstr "Avtomatik yarat"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "İmza:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "İsmarış yaz"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Tərtib pəncərəsi yaradıla bilmir:\n"
-"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir.\n"
-"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:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Yollanacaq hədəf"
@@ -11822,19 +12030,94 @@ msgstr "Göndəriləcək qovluqları seçmək üçün buraya tıqlayın"
 msgid "Attach file(s)"
 msgstr "Fayl(lar) ilişdir"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Göndərilən ismarış imzalana bilmir: Bu hesab üçün heç bir imza vəsiqəsi "
+"seşilməyib"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Göndərilən ismarış şifrələnə bilmir: Bu hesab üçün heç bir imza vəsiqəsi "
+"seşilməyib"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Fayl açıla bilmədi"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Editordan ismarış alına bilmir"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Adsız İsmarış"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Faylı aç"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Avtomatik yarat"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "İmza:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "İsmarış yaz"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Ötürülmüş ismarış - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Orijinal ismarışı ilişdir"
+msgstr[1] "Orijinal ismarışı ilişdir"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "`${0}' faylını bu ismarışa ilişdirə bilməzsiniz."
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "`${0}' reqular deyil və ismarışla göndərilə bilməz."
 
 #. mail-composer:attach-directory primary
@@ -11848,104 +12131,138 @@ msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
-"Bu qovluğun məzmununu ilişdirmək üçün ya qovluqdakı faylları tək tək ilişdirin, "
-"ya da qovluqdan arxiv yaradıb onu ilişdirin."
+"Bu qovluğun məzmununu ilişdirmək üçün ya qovluqdakı faylları tək tək "
+"ilişdirin, ya da qovluqdan arxiv yaradıb onu ilişdirin."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "İsmarış yaradıla bilmədi."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Səbəbi: \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Tamamlanmamış ismarışlar tapıldı"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Tamamlanmamış ismarışları bərpa etmək istəyirsinizmi?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Evolution proqramı siz məktub yazarkən iflas etmişdi. "
-"Bu ismarışı bərpa edərək qaldığınız yerdən davam edə bilərsiniz."
+"Evolution proqramı siz məktub yazarkən iflas etmişdi. Bu ismarışı bərpa "
+"edərək qaldığınız yerdən davam edə bilərsiniz."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Bərpa Etmə"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Bərpa Et"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "\"{0}\" avtomatik qeyd faylına qeyd edilə bilmədi."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Avtomatik qeyd etmə xətası, səbəb: \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Dəyişiklikləri Unut"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "İsmarışı Qeyd Et"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "İsmarış yaradıla bilmədi."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "\"{0}\" imza faylı oxuna bilmədi."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Səbəb: \"${1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Bütün hesablar silindi."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "İsmarış yaradıla bilmədi."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Tərtib pəncərəsi yaradıla bilmir:\n"
+"Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Tərtib pəncərəsi yaradıla bilmir:\n"
+"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir.\n"
+"Xahiş edirik, gtkhtml və ləbgtkhtml tə'minatlarının\n"
+"düzgün buraxılışlarına malik olduğunuzdan əmin olun.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution Groupware Dəsti"
@@ -12057,7 +12374,8 @@ msgstr ""
 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:249
 msgid ""
@@ -12240,10 +12558,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Müqayisə ediləcək vaxtı seçin"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Süzgəc Qaydaları"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12269,99 +12583,118 @@ msgstr "Fayl adını bildirməlisiniz."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "\"{0}\" faylı mövcud deyil ya da düzgün fayl deyil."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Əksik qovluq."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Qovluğu bildirməlisiniz."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Səhv qaydalı ifadə \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "\"{1}\" qaydalı ifadəsi dərlənə bilmədi."
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Əksik ad."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Bu süzgəcə bir ad verməlisiniz."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Bu vFolder-a bir ad verməlisiniz."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "\"{0}\" adı onsuz da mövcuddur."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Xahiş edirik başqa ad seçin."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Heç bir mənbə seçilməyib."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr "Ən az bir qovluğu mənbə olaraq seçməlisiniz."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Faylı seç"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Bu zaman</b> "
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Vacib"
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
-msgid "Select Folder"
-msgstr "Qovluğu Seç"
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Ediləcəklər"
 
-#: filter/filter.glade.h:1
-msgid "    "
-msgstr "    "
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "Daha Sonra"
 
-#: filter/filter.glade.h:2
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Sınaq"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Qayda adı:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Əgər</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "bütün kriteriyalar uyğun gəlirsə"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Gedişatları işə sal"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "Əlaqəli olan hamısı"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "Cavablar"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "Cavablar və cavablananlar"
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "İlgəkləri daxil et"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "gələn"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "gedən"
+
+#: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Süzgəc Qaydaları</b>"
 
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder Mənbələri</b>"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Bununla müqayisə et"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Gələn"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12369,7 +12702,7 @@ msgstr ""
 "Bu ismarışın tarixi burada göstərdiyiniz ilə\n"
 "müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12377,7 +12710,7 @@ msgstr ""
 "Bu ismarışın tarixi süzgəcin işlədiyi vaxt\n"
 "ilə müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12385,490 +12718,439 @@ msgstr ""
 "Bu ismarışın tarixi süzgəcin işlədiyi vaxt\n"
 "hazırkı tarix ilə müqayisə ediləcəkdir."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr "indiki vaxta nəzərən müddət"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr "əvvəl"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "saniyə"
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "təkcə xüsusi qovluqlar"
-
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:18
 msgid "the current time"
 msgstr "indiki vaxt"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:19
 msgid "the time you specify"
 msgstr "bildirdiyininiz vaxt"
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "bütün fəal uzaq qovluqlarla"
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "il"
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "bütün yerli və fəal uzaq qovluqlarla"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Qayda Əlavə Et"
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "bütün yerli qovluqlarla"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Qaydanı Dəyişdir"
 
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "il"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Qayda adı"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Vacib"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Ediləcəklər"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr ""
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Daha Sonra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Sınaq"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Qayda adı:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Elektronik məktub hesablarnızı buradan quraşdırın"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Əgər</b> "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Məktub"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "bütün kriteriyalar uyğun gəlirsə"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Poçt hesabları quraşdırma idarəsi"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Məktub tərkib hissəsi"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Gedişatları işə sal"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Məktub tərtib edicisi"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Əlaqəli olan hamısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Məktub tərtib edicisi quraşdırma idarəsi"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Cavablar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Poçt xassələri idarəsi"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Cavablar və cavablananlar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Məktub"
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "İlgəkləri daxil et"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poçt Hesabları"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "gələn"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "gedən"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Məktub"
+
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
+msgstr "[Ön qurğulu]"
+
+#: mail/em-account-prefs.c:472
+msgid "Account name"
+msgstr "Hesab adı"
+
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
+msgstr "Protokol"
+
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
+msgstr "Adsız"
+
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
+msgstr "Dil(lər)"
+
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
+msgstr "İmza skripti əlavə et"
+
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr "İmza(lar)"
+
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Ötürülülən Məktub --------"
+
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
+msgstr "naməlum yollayan"
+
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Süzgəc Qaydaları"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Qovluğu Seç"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Xalı Sazla"
 
-#: filter/libfilter-i18n.h:3
+#: mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Rəng Seç"
 
-#: filter/libfilter-i18n.h:4
+#: mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Xal Seç"
 
-#: filter/libfilter-i18n.h:5
+#: mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "İlişdirilmiş Fayllar"
 
-#: filter/libfilter-i18n.h:6
+#: mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Biip"
 
-#: filter/libfilter-i18n.h:7
+#: mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "daxil edirsə"
 
-#: filter/libfilter-i18n.h:8
+#: mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Qovluğa Köçür"
 
-#: filter/libfilter-i18n.h:9
+#: mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Alınma tarixi"
 
-#: filter/libfilter-i18n.h:10
+#: mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Göndərilmə tarixi"
 
-#: filter/libfilter-i18n.h:12
+#: mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Silinən"
 
-#: filter/libfilter-i18n.h:13
+#: mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "bunu daxil etmirsə"
 
-#: filter/libfilter-i18n.h:14
+#: mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "bununla sonlanmırsa"
 
-#: filter/libfilter-i18n.h:15
+#: mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "mövcud deyilsə"
 
-#: filter/libfilter-i18n.h:16
+#: mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "nəticə alınmırsa"
 
-#: filter/libfilter-i18n.h:17
+#: mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "oxşamırsa"
 
-#: filter/libfilter-i18n.h:18
+#: mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "bununla başlamırsa"
 
-#: filter/libfilter-i18n.h:19
+#: mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Mövcud Deyildirsə"
 
-#: filter/libfilter-i18n.h:20
+#: mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Layihə"
 
-#: filter/libfilter-i18n.h:21
+#: mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "bununla sonlanırsa"
 
-#: filter/libfilter-i18n.h:22
+#: mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Mövcuddursa"
 
-#: filter/libfilter-i18n.h:23
+#: mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "mövcuddursa"
 
-#: filter/libfilter-i18n.h:24
+#: mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "İfadə"
 
-#: filter/libfilter-i18n.h:25
+#: mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Tamamla"
 
-#: filter/libfilter-i18n.h:27
+#: mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "bərabərdir"
 
-#: filter/libfilter-i18n.h:28
+#: mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "bundan sonra isə"
 
-#: filter/libfilter-i18n.h:29
+#: mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "bundan əvvəl isə"
 
-#: filter/libfilter-i18n.h:30
+#: mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "Bayraqlı isə"
 
-#: filter/libfilter-i18n.h:31
+#: mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "bundan böyükdürsə"
 
-#: filter/libfilter-i18n.h:32
+#: mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "bundan kiçikdirsə"
 
-#: filter/libfilter-i18n.h:33
+#: mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "bərabər deyilsə"
 
-#: filter/libfilter-i18n.h:34
+#: mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "bayraqlı deyilsə"
 
-#: filter/libfilter-i18n.h:36
+#: mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Spam Sınağı"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
 
-#: filter/libfilter-i18n.h:38
+#: mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Məktublaşma qrupu"
 
-#: filter/libfilter-i18n.h:39
+#: mail/em-filter-i18n.h:39
 msgid "Message Body"
 msgstr "İsmarış Məzmunu"
 
-#: filter/libfilter-i18n.h:40
+#: mail/em-filter-i18n.h:40
 msgid "Message Header"
 msgstr "İsmarış Başlığı"
 
-#: filter/libfilter-i18n.h:41
+#: mail/em-filter-i18n.h:41
 msgid "Message is Junk"
 msgstr "İsmarış Spam-dır"
 
-#: filter/libfilter-i18n.h:42
+#: mail/em-filter-i18n.h:42
 msgid "Message is not Junk"
 msgstr "İsmarış Spam deyil"
 
-#: filter/libfilter-i18n.h:43
+#: mail/em-filter-i18n.h:43
 msgid "Move to Folder"
 msgstr "Qovluğa Daşı"
 
-#: filter/libfilter-i18n.h:44
+#: mail/em-filter-i18n.h:44
 msgid "Pipe to Program"
 msgstr "Proqrama Göndər"
 
-#: filter/libfilter-i18n.h:45
+#: mail/em-filter-i18n.h:45
 msgid "Play Sound"
 msgstr "Səs Çal"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Oxu"
 
-#: filter/libfilter-i18n.h:47
+#: mail/em-filter-i18n.h:47
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: filter/libfilter-i18n.h:48
+#: mail/em-filter-i18n.h:48
 msgid "Regex Match"
 msgstr "Qaydalı İfadə Nəticələri"
 
-#: filter/libfilter-i18n.h:49
+#: mail/em-filter-i18n.h:49
 msgid "Replied to"
 msgstr "Cavab verilən"
 
-#: filter/libfilter-i18n.h:50
+#: mail/em-filter-i18n.h:50
 msgid "returns"
 msgstr "nəticə alınarsa"
 
-#: filter/libfilter-i18n.h:51
+#: mail/em-filter-i18n.h:51
 msgid "returns greater than"
 msgstr "bundan böyük nəticə alınarsa"
 
-#: filter/libfilter-i18n.h:52
+#: mail/em-filter-i18n.h:52
 msgid "returns less than"
 msgstr "bundan kiçik nəticə alınarsa"
 
-#: filter/libfilter-i18n.h:53
+#: mail/em-filter-i18n.h:53
 msgid "Run Program"
 msgstr "Proqram İşə Sal"
 
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Xal"
 
-#: filter/libfilter-i18n.h:55
+#: mail/em-filter-i18n.h:55
 msgid "Sender"
 msgstr "Göndərən"
 
-#: filter/libfilter-i18n.h:56
+#: mail/em-filter-i18n.h:56
 msgid "Set Status"
 msgstr "Vəziyyəti Seç"
 
-#: filter/libfilter-i18n.h:57
+#: mail/em-filter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Böyüklük (kB)"
 
-#: filter/libfilter-i18n.h:58
+#: mail/em-filter-i18n.h:58
 msgid "sounds like"
 msgstr "buna oxşayırsa"
 
-#: filter/libfilter-i18n.h:59
+#: mail/em-filter-i18n.h:59
 msgid "Source Account"
 msgstr "Mənbə Hesabı"
 
-#: filter/libfilter-i18n.h:60
+#: mail/em-filter-i18n.h:60
 msgid "Specific header"
 msgstr "Xüsusi başlıq"
 
-#: filter/libfilter-i18n.h:61
+#: mail/em-filter-i18n.h:61
 msgid "starts with"
 msgstr "bununla başlayırsa"
 
-#: filter/libfilter-i18n.h:63
+#: mail/em-filter-i18n.h:63
 msgid "Stop Processing"
 msgstr "Oxumağı Dayandır"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
+#: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Mövzu"
 
-#: filter/libfilter-i18n.h:65
+#: mail/em-filter-i18n.h:65
 msgid "Unset Status"
 msgstr "Vəziyyəti Geri Al"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Qayda Əlavə Et"
-
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Qaydanı Dəyişdir"
-
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Qayda adı"
-
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Xal Qaydaları"
-
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Məzmun bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Məzmun bunu daxil etməsin"
-
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Məzmun ya da mövzu bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "İsmarış bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Alıcılar bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Göndərən bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Mövzu bunu daxil etsin"
-
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Mövzu bunu daxil etməsin"
-
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtual _Qovluqlar"
-
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "Ə_lavə Et"
-
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VQovluq mənbəsi"
-
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
-msgstr "[Ön qurğulu]"
-
-#: mail/em-account-prefs.c:472
-msgid "Account name"
-msgstr "Hesab adı"
-
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
-msgstr "Protokol"
-
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
-msgstr "Adsız"
-
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
-msgstr "Dil(lər)"
-
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
-msgstr "İmza skripti əlavə et"
-
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
-msgstr "İmza(lar)"
-
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Ötürülülən Məktub --------"
-
-#: mail/em-composer-utils.c:1499
-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-composer-utils.c:1509
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d tarixində, saat %H:%M %%+05d radələrində, %%s yazmışdır ki:"
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Bu zaman</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Axtarışdan _Virtual Qovluq Yarat..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Qovluq xassələri"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Xassələr"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Qovluq Adı"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Toplam ismarış"
-
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Oxunmamış ismarışlar"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Toplam ismarış"
+msgstr[1] "Toplam ismarış"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Oxunmamış ismarışlar"
+msgstr[1] "Oxunmamış ismarışlar"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12878,385 +13160,416 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Create New Folder"
 msgstr "Yeni Qovluq Yarat"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri bildirin:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 msgid "Create"
 msgstr "Yarat"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Qovluq _adı:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VQovluqlar"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Yüklənir..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s qovluğu daşınır"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s qovluğu köçürülür"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "İsmarışlar üst səviyyəyə daşına bilmir"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçür"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Daşı"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "_Daşımağı Ləğv Et"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "_Köçür"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' qovluğu yaradılır"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Qovluq yarat"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Qovluğu Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Görünüş"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "_Yeni Pəncərədə Aç"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Köçür"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Daşı"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Yeni Qovluq..."
 
-#: mail/em-folder-tree.c:2558
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Xassələr..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
-msgid "VFolders"
-msgstr "VQovluqlar"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Gələnlər qutusu"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
-msgid "Loading..."
-msgstr "Yüklənir..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
-msgid "Mail"
-msgstr "Məktub"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Xassələr"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Yaz"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Yaz"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Yaz"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Ö_tür"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Bitirilmiş olaraq işarələ"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Sil"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Oxun_muş olaraq işarələ"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "_Spam olaraq işarələ"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Spam _olmayan olaraq işarələ"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Süzgəcləri _Tətbiq Et"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "Spam-ı _Süz"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "_Mövzuya görə VQovluğa"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara görə VQovluğa"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma _Qrupuna görə VQovluğa"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "_Mövzuya görə süzgəclə"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "_Göndərənə görə süzgəclə"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıya görə süzgəclə"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupuna görə süzgəclə"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Ön qurğulu"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Körpünün Ünvanını _Köçür"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "%s əlaqəsinə məktub yazmaq üçün tıqlayın"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Göndərən"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Alıcı"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarix"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Xəbər Qrupları"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s ilişdirilmiş fayl"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME ismarışı oxuna bilmədi: Naməlum xəta"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "multipart/encrypted üçün dəstəklənməyən şifrələmə növü"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ismarışı oxuna bilmədi. Mənbə olaraq göstərilir."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Dəstəklənməyən imza formatı"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Vəsiqəni yoxlama xətası"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Naməlum vəsiqəni yoxlama xətası"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' alınır"
+msgid "Matches: %d"
+msgstr "Nəticələr: %d"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 msgid "Unsigned"
 msgstr "İmzalanmamış"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmamişdır. Onun original olduğu təsdiq edilə "
+"bilmir."
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "Düzgün imza"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Bu ismarış digital olaraq imzalanmışdır və düzgündür, bu da ismarışın "
+"təsdiqlənmiş mənbədən gəldiyini göstərir."
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "Səhv imza"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "İmza düzgündür amma yollayan təsdiq edilə bilmir"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr "Düzgün imza, göndərən təsdiq edilə bilmir"
+
+#: mail/em-format-html-display.c:644
+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:650 mail/em-format-html.c:568
 msgid "Unencrypted"
 msgstr "Şifrələnməmiş"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "Şifrələnmiş, zəif"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "Şiflələnmiş"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "Şiflələnmiş, güclü"
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Vəsiqəni Göstər"
+
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr "Bu vəsiqə göstərilə bilən deyil"
+
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p tarixində tamamlanıb"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Gecikmiş işlər:"
+
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
+msgstr "_Daxili Olaraq Göstər"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "_Gizlət"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Səhifə: %d / %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' alınır"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "İmza düzgündür amma yollayan təsdiq edilə bilmir"
+
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Xəsərli xarici proqram parçası."
@@ -13290,9 +13603,35 @@ msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə)"
 msgid "Formatting message"
 msgstr "İsmarış şəkkilləndirilir"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Göndərən"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Alıcı"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Poçt proqramı"
 
@@ -13306,102 +13645,43 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "Nəticələr: %d"
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Bu ismarış digital olaraq imzalanmamişdır. Onun original olduğu təsdiq edilə "
-"bilmir."
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Bu ismarış digital olaraq imzalanmışdır və düzgündür, bu da ismarışın təsdiqlənmiş "
-"mənbədən gəldiyini göstərir."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr "Düzgün imza, göndərən təsdiq edilə bilmir"
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-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:656
-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.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarix"
 
-#: mail/em-format-html-display.c:757
-msgid "_View Certificate"
-msgstr "_Vəsiqəni Göstər"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Xəbər Qrupları"
 
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
-msgstr "Bu vəsiqə göstərilə bilən deyil"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s ilişdirilmiş fayl"
 
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p tarixində tamamlanıb"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME ismarışı oxuna bilmədi: Naməlum xəta"
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Gecikmiş işlər:"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "multipart/encrypted üçün dəstəklənməyən şifrələmə növü"
 
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
+#: mail/em-format.c:1279
+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-display.c:1088
-msgid "_View Inline"
-msgstr "_Daxili Olaraq Göstər"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Dəstəklənməyən imza formatı"
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "_Gizlət"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Vəsiqəni yoxlama xətası"
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Səhifə: %d / %d"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Naməlum vəsiqəni yoxlama xətası"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13423,7 +13703,7 @@ msgstr "Həftədə bir dəfə"
 msgid "Once per month"
 msgstr "Ayda bir dəfə"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13431,82 +13711,82 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "`%s' yeni qovluğu yaradıla bilmir: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "`%s' qovluğu `%s' ünvanına köçürülə bilmir: %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "`%s' ünvanındakı mövcud poçt qutuları axtarıla bilmir: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "`%s' POP keep-on-server məlumatı açıla bilmədi: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "`%s' POP3 keep-on-server məlumat cərgəsi yaradıla bilmədi: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Fərqli Qeyd Et..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "adsiz_ismaris.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Arxa plan olaraq _döşə"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Göndərənə _cavab yaz"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Körpünü Səyyahda _Aç"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "_İsmarış göndər..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Ünvan Kitabçasına Ə_lavə Et"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ilə aç..."
@@ -13519,7 +13799,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Qeydiyyatda"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Qovluq"
 
@@ -13553,11 +13833,23 @@ msgid "Add address"
 msgstr "Ünvan əlavə et"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "%s ünvanından məktublar"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtual _Qovluqlar"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "Ə_lavə Et"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VQovluq mənbəsi"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Avtomatik körpü aşkarı"
@@ -13789,7 +14081,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "İstifadəçi qovluğu silmək istədiyində təsdiq istə"
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "İstifadəçi məktubu mövzusuz göndərmək istədiyində təsdiq istə"
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -13810,7 +14103,9 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Alıcı və Cc alıcıları bildirilməyən ismarış yollamağa çalışdığında təsdiq istə"
+msgstr ""
+"Alıcı və Cc alıcıları bildirilməyən ismarış yollamağa çalışdığında təsdiq "
+"istə"
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
@@ -13822,7 +14117,8 @@ msgstr "Mətnlərdəki körpüləri aşkar et və onları əvəz et."
 
 #: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
-msgstr "Mətnlərdəki gülücükləri aşkar et və onları emosiya rəsmləri ilə əvəz et."
+msgstr ""
+"Mətnlərdəki gülücükləri aşkar et və onları emosiya rəsmləri ilə əvəz et."
 
 #: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
@@ -14010,76 +14306,48 @@ msgstr ""
 msgid "spamd port"
 msgstr "spamd portu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Elektronik məktub hesablarnızı buradan quraşdırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Məktub"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Poçt hesabları quraşdırma idarəsi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Məktub tərkib hissəsi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm idxalçısı"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Məktub tərtib edicisi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail idxalçısı"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Məktub tərtib edicisi quraşdırma idarəsi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 idxalçısı"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Poçt xassələri idarəsi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine idxalçısı"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poçt Hesabları"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox idxalçısı"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Məktub"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 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:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "İdxal edilir..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
@@ -14101,53 +14369,27 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Hədəf qovluq:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "İçinə idxal ediləcək qovluğu seçin"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' idxal edilir"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Poçt qutusu idxal edilir"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox idxalçısı"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14257,15 +14499,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_İstifadəçi adı:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Cığır:"
 
@@ -14293,78 +14535,84 @@ msgstr "%s məktublaşma qrupu"
 msgid "Add Filter Rule"
 msgstr "Süzgəc Qaydası Əlavə Et"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d silinən"
+msgid_plural "%d deleted"
+msgstr[0] "%d silinən"
+msgstr[1] "%d silinən"
 
-#: mail/mail-component.c:463
-#, c-format
+#: mail/mail-component.c:461
+#, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d spam"
+msgid_plural "%d junk"
+msgstr[0] "%d spam"
+msgstr[1] "%d spam"
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d layihə"
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d layihə"
+msgstr[1] "%d layihə"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d göndərilən"
+msgid_plural "%d sent"
+msgstr[0] "%d göndərilən"
+msgstr[1] "%d göndərilən"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d göndərilməyən"
+msgid_plural "%d unsent"
+msgstr[0] "%d göndərilməyən"
+msgstr[1] "%d göndərilməyən"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d toplam"
+msgid_plural "%d total"
+msgstr[0] "%d toplam"
+msgstr[1] "%d toplam"
 
-#: mail/mail-component.c:496
-#, c-format
+#: mail/mail-component.c:494
+#, fuzzy, c-format
 msgid ", %d unread"
-msgstr ", %d oxunmamış"
+msgid_plural ", %d unread"
+msgstr[0] ", %d oxunmamış"
+msgstr[1] ", %d oxunmamış"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Yeni Məktub"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Məktub"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Yeni məktub yaz"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Yeni Poçt Qovluğu"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Poçt _Qovluğu"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "yeni poçt qovluğu yarat"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Xidmətin Yoxlanması"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Vericiyə bağlanır..."
-
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Şəxsiyyət"
 
@@ -14376,7 +14624,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Poçtun Alınması"
 
@@ -14390,7 +14638,7 @@ msgstr ""
 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:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Poçtun Göndərilməsi"
 
@@ -14400,7 +14648,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
@@ -14413,227 +14661,240 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Xidmətin Yoxlanması"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Vericiyə bağlanır..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Dəstəklənən Növləri _Yoxla "
 
-#: mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Nümayiş</b>"
-
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>Evolution proqramının bu inşasında SSL dəstəyi yoxdur</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_İmzalar</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Dillər</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Hesab Məlumatı</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Xəbərdarlıqlar</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tanıdma Növü</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Tanıdma</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Yeni Məktubların Yoxlanması</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Məktubların Yazılması</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Qurğular</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Ön Qurğulu Davranış</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Poçtun Silinməsi</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Göstərilən Məktub _Başlıqları</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Süzgəc Seçimləri</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Ümumi</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiket və Rənglər</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Rəsmlərin Yüklənməsi</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Məktubların Göstərilməsi</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Məktubların Yazı Növləri</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Yeni Məktub Bildirişi</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Seçimə Bağlı Məlumat</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Seçimlər</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Çap Edilən Yazı Növləri</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Lazımi Məlumat</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Etibarlı MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Təhlükəsizlik</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Göndərilən və Layihə İsmarışlar</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Şifrələnmiş məktub göndərildiyi vaxt məktubu _mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Hesab Editoru"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Yeni _İmza Əlavə Et..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "_Skript Əlavə Et"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Şifrələnmiş məktub göndərildiyi vaxt məktubu _mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Bu ünvana həmişə məktubun _nüsxəsini (cc) yolla:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 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:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Bu hesab işlədildiyində bütün göndərilən məktubları _imzala"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 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:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Orijinal ismarışı ilişdir"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "İlişdirilmiş fayl"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Yeni məktubları _avtomatik olaraq yoxlama aralığı"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Yeni məktub alındığında _bip səsi çıxart"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Hərf dəstəsi:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "Dəstəklənən Növləri _Yoxla "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Gələn Məktubları Yoxla"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Gələn məktubların Spam olduğunu yoxla"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Mətn yazıldığında imlanı _yoxla"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Səhv imlalı mətnin _rəngi:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Rənglər"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14649,265 +14910,267 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Ön _qurğulu"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Ön qurğulu hərf _kodlaması:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Ön qurğular"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Orijinal ismarışı sitatlama"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 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:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Başa çatdı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Layihələr _Govluğu:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Epoçt Hesabları"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "_Epoçt Ünvanı:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Şifrələmə _vəsiqəsi:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Bələdçisi"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "_Sabit-aralıqlı en:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Yazı Növü Qurğuları"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "İsmarışları _HTML olaraq şəkilləndir"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML Məktub"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Başlıqlar"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _işıqlandır:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "İlgəkləri daxil et"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Poçt Qurğuları"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Məktub qutusu mövqeyi"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "İsmarış Tərtib Edicisi"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 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:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Açar ID-si:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 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:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail poçt qovluğu"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Orijinal ismarışı sitatlandır"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Şifrəni yadda _saxla"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Cavablama-Ünvanı:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Alış Seçimləri"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Şifrəni yadda _saxla"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Standart Yazı Növü:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 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:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 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:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Seç..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Göndərilən _İsmarışlar Qovluğu:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıdmanı məcbur qılır"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "İmzalama _vəsiqəsi:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "İ_mza:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "İmzalar"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Fayl adı bildir:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "İmlanı Yoxla"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standart Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Növ:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 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:144
+#: mail/mail-config.glade.h:147
 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:146
+#: mail/mail-config.glade.h:149
 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:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Dəyişən-en:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14917,92 +15180,199 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_İmza Əlavə Et"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "İ_nternetdən rəsmləri həmişə yüklə"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Göndərilən məktubları digital olaraq i_mzala (ön qurğulu olaraq)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni məktub alındığında bildirmə"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "Yollayan şəxs ünvan kitabçasında varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Təkcə _Yerli Sınaqlar"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Bu hesabı ön qurğulu hesabım _et"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "İsmarışları oxunmuş olaraq işarələmə _vaxtı:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "İ_nternetdən rəsmləri qətiyyən yükləmə"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 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ə"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 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:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Cavab _tərzi:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Etibarlı bağlantı (SSL) işlət:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 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:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "rəng"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "izahat"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder Mənbələri</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digital İmza</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Şifrələmə</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Qəbul Edildi"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Başa çatmış"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Böyük Kiçik Hərfə Həssas"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "İsmarışda Axtar"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Axtar:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Tamamlamaq Üçün Bayraqla"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Qovluq Qeydiyyatları"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Açar Razılığı"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Heç Biri Seçilməyib"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Verici:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Təhlükəsizlik Mə'lumatı"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Tamamlamaq üçün seçdiyiniz ismarışlar aşağıdadır.\n"
+"Xahiş edirik \"Bayraq\" menyusundan Tamamlama gedişatını seçin."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Qəbul edilən lisenziyaların siyahısı"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Vaxtı:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bayraq:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Qeydiyyatdan _Keç"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Qeydiyyatdan Çı_x"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "təkcə xüsusi qovluqlar"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "bütün fəal uzaq qovluqlarla"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "bütün yerli və fəal uzaq qovluqlarla"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "bütün yerli qovluqlarla"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -15010,10 +15380,11 @@ msgstr "Səhv tanıtma"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr ""
+msgstr "%s SMTP vericisi istənən %s tanıtma növünü dəstəkləmir."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15040,15 +15411,16 @@ msgid ""
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"Xahiş edirik aşağıdakı alıcıların HTML şəklində məktub ala bildiklərindən "
-"və istədiklərindən əmin olun:\n"
+"Xahiş edirik aşağıdakı alıcıların HTML şəklində məktub ala bildiklərindən və "
+"istədiklərindən əmin olun:\n"
 "{0}\n"
 "Yenə də göndərilsin?"
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Göndər"
+msgstr "Göndər"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15089,7 +15461,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
@@ -15109,7 +15482,9 @@ msgstr "Ön qurğulu layihələr qovluğu istifadə edilsinmi?"
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
-msgstr "Bu hesabın layihələr qovluğu açıla bilmədi. Sistemin layihə qovluğu işlədilsin?"
+msgstr ""
+"Bu hesabın layihələr qovluğu açıla bilmədi. Sistemin layihə qovluğu "
+"işlədilsin?"
 
 #: mail/mail-errors.xml.h:41
 msgid "Use _Default"
@@ -15120,7 +15495,9 @@ msgstr "Ö_n Qurğulusunu İşlət"
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
-msgstr "\"{0}\" qovluğundakı bütün silinmiş məktubları həmişəlik silmək istəyirsinizmi?"
+msgstr ""
+"\"{0}\" qovluğundakı bütün silinmiş məktubları həmişəlik silmək "
+"istəyirsinizmi?"
 
 #. mail:ask-expunge secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
@@ -15136,7 +15513,8 @@ msgstr "_Həmişəlik Sil"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "Bütün qovluqlardaki silinmiş ismarışları həmişəlik silmək istəyirsinizmi?"
+msgstr ""
+"Bütün qovluqlardaki silinmiş ismarışları həmişəlik silmək istəyirsinizmi?"
 
 #: mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
@@ -15149,14 +15527,18 @@ msgstr "Göndərilməmiş məktublarınız var, yenə də çıxmaq istəyirsiniz
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "Əgər çıxsanız, bu məktublar Evolution yenidən başladılana dək göndərilməyəcəkdir."
+msgstr ""
+"Əgər çıxsanız, bu məktublar Evolution yenidən başladılana dək "
+"göndərilməyəcəkdir."
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "\"{0}\" mövzulu məktubunuz göndərildiyi ünvana çatmadı."
 
 #. mail:camel-exception secondary
@@ -15175,8 +15557,9 @@ msgstr "{0} sırasında xəta."
 
 #. mail:async-error secondary
 #: mail/mail-errors.xml.h:64
+#, fuzzy
 msgid "{1}."
-msgstr ""
+msgstr "{1}"
 
 #. mail:async-error-nodescribe primary
 #: mail/mail-errors.xml.h:66
@@ -15188,14 +15571,6 @@ msgstr "Əməliyyat aparılırkən xəta."
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15211,11 +15586,6 @@ msgstr "Süzgəc mə'lumatını yükləmə xətası."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "\"{0}\" qovluğuna qeyd edilə bilmir."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15232,12 +15602,6 @@ msgstr "Qeyd etmə qovluğu yaradıla bilmədi, səbəbi: \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Müvəqqəti qeyd etmə qovluğu yaradıla bilmədi."
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Səbəbi: \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15289,8 +15653,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "\"{0}\" qovluğu \"{1}\" qovluğuna daşına bilmir."
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15299,8 +15664,9 @@ msgstr ""
 
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
+#, fuzzy
 msgid "Because \"{2}\"."
-msgstr ""
+msgstr "Səbəbi: \"{1}\"."
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
@@ -15334,8 +15700,9 @@ msgstr "\"{1}\" mənbəsi açıla bilmir"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "və bir dənə başqa əlaqə."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15363,8 +15730,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Silmə"
+msgstr "_Geri Gətir"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15393,6 +15761,7 @@ msgstr "Dəyişikliklər nəzərə alınmasın?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Dəyişikliklərinizi qeyd etmək istəyirsiniz?"
 
@@ -15419,13 +15788,15 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "\"{0}\" qovluğu silinə bilmir."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
+#, fuzzy
 msgid "vFolders automatically updated."
-msgstr ""
+msgstr "Poçt süzgəcləri avtomatik olaraq yeniləndi."
 
 #. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
@@ -15462,13 +15833,41 @@ msgstr ""
 "    \"{1}\"\n"
 "Onlar yeniləndilər."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Əksik qovluq."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Qovluğu bildirməlisiniz."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Bu vFolder-a bir ad verməlisiniz."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Heç bir mənbə seçilməyib."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr "Ən az bir qovluğu mənbə olaraq seçməlisiniz."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15476,41 +15875,37 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "Ü_stünə yaz"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Əlavə Et"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "İşləyir"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Qovluq Süzgəcdən Keçirilir"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Göndərmə süzgəcləri tətbiq edilə bilmədi: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15519,115 +15914,115 @@ 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:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Toplam %2$d məktubdan %1$d dənəsi göndərilə bilmədi"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu qeyd edilir"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' hesabı qeyd edilir"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d ismarış alınır"
 msgstr[1] "%d ismarış alınır"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d ismarış qeyd edilir"
 msgstr[1] "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15636,7 +16031,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15645,11 +16040,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15658,45 +16053,21 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Böyük Kiçik Hərfə Həssas"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "İsmarışda Axtar"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Axtar:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital İmza</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Şifrələmə</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Təhlükəsizlik Mə'lumatı"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Ləğv edilir..."
@@ -15732,24 +16103,24 @@ msgstr "Yenilənir..."
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün şifrəni bildirin"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Şifrəni Bildirin"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni _yadda saxla"
 
@@ -15804,79 +16175,79 @@ msgstr "%s üçün vFolder-lar yenilənir: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' üçün vFolder-lar yenilənir"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Cavab verilmiş"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Daha Alçaq"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Daha Yüksək"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Dünən: %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -15944,49 +16315,49 @@ msgstr "Hamısına cavab yaz"
 msgid "Review"
 msgstr "İcmal"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Tamamlamaq Üçün Bayraqla"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Məzmun bunu daxil etsin"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Başa çatmış"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Məzmun bunu daxil etməsin"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Tamamlamaq üçün seçdiyiniz ismarışlar aşağıdadır.\n"
-"Xahiş edirik \"Bayraq\" menyusundan Tamamlama gedişatını seçin."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Məzmun ya da mövzu bunu daxil etsin"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Vaxtı:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "İsmarış bunu daxil etsin"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bayraq:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Alıcılar bunu daxil etsin"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Qovluq Qeydiyyatları"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Göndərən bunu daxil etsin"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Heç Biri Seçilməyib"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Mövzu bunu daxil etsin"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Verici:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Mövzu bunu daxil etməsin"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Qeydiyyatdan _Keç"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Qabığı"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Qeydiyyatdan Çı_x"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Sınağı"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Sınaq Tərkib Hissəsi"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16025,49 +16396,41 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "mail"
-msgstr "poçt"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Proqramın İnkişafçıları"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+msgid "Whether the toolbar should be visible."
+msgstr ""
 
-#: shell/e-shell.c:744
-msgid "Uknown system error."
-msgstr "Naməlum sistem xətası."
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
 
-#: shell/e-shell.c:1101
-msgid "Invalid arguments"
-msgstr "Səhv arqumentlər"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "mail"
+msgstr "poçt"
 
-#: shell/e-shell.c:1103
-msgid "Cannot register on OAF"
-msgstr "OAF-a qeyd edilə bilmir"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Fəal Bağlantılar</b>"
 
-#: shell/e-shell.c:1105
-msgid "Configuration Database not found"
-msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Fəal Bağlantılar"
 
-#: shell/e-shell.c:1107
-msgid "Generic error"
-msgstr "Ümumi xəta"
+#: shell/e-active-connection-dialog.glade.h:3
+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"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16120,7 +16483,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "İdxalçını seç"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s faylı mövcud deyil"
@@ -16148,31 +16511,32 @@ msgstr ""
 "%s idxal edilir\n"
 "İdxal edilən üzv 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Fayl adı:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Faylı seç"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Fayl _növü:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Daha _köhnə proqramlardan verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "_Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16180,25 +16544,25 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Ağıllı İdxalçılar Başladılır"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "`%s' faylı üçün idxalçı yoxdur"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "İdxalçı icra edilə bilmədi."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_İdxal Et"
 
@@ -16243,178 +16607,103 @@ msgstr "Qovluq adı \"#\" hərfini daxil edə bilməz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-window.c:336
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
-
-#: shell/e-shell-window.c:343
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution xətdən çıxma fəaliyyətindədir."
-
-#: shell/e-shell-window.c:349
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
-
-#: shell/e-shell-window.c:621
-#, c-format
-msgid "Switch to %s"
-msgstr "%s vəziyyətinə keç"
-
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Sisteminizdə GNOME Pilot vasitələri qurulu deyil."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy qurulu deyil."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy işə salına bilmədi."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Evolution Haqqında"
+#: shell/e-shell-window-commands.c:322
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "İşarələmə qutusu"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
 
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Yeni"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution xətdən çıxma fəaliyyətindədir."
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Namə'lum xəta."
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
 
-#: shell/evolution-shell-component-utils.c:118
+#: shell/e-shell-window.c:637
 #, 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 "Switch to %s"
+msgstr "%s vəziyyətinə keç"
 
-#: shell/evolution-shell-component-utils.c:125
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, 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"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Yeni Sınaq"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Sınaq"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Yeni sınaq üzvü yarat"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Fəal Bağlantılar</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Fəal Bağlantılar"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-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"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Təqvim:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "Ə_laqələr: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Məktub:"
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Vəzifələr:"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Naməlum sistem xətası."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Qovluq _növü:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Səhv arqumentlər"
 
-#: 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ç"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF-a qeyd edilə bilmir"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Hesab:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Qovluq Adı:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Ümumi xəta"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_İstifadəci:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Yeni"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Sazlama Yardımçısı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fayllar İdxal Edilir"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Vaxt zolağı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Xoş Gəldiniz"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16428,7 +16717,7 @@ msgstr ""
 "\n"
 "Xahiş edirik, davam etmək üçün \"Sonrakı\" düyməsinə basın. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16439,17 +16728,17 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Qabığı"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Yeni Sınaq"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Sınağı"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Sınaq"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Sınaq Tərkib Hissəsi"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Yeni sınaq üzvü yarat"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16510,7 +16799,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri idxal edə bilər:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16530,7 +16819,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16538,39 +16827,39 @@ msgstr ""
 "Təşəkkür Edirik!\n"
 "Ximian Evolution Komandası\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Bunu bir daha demə"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Xətdən qopuq modda başla"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Xətdə modunda başla"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Bütün evolution tərkib hissələrini bağlanmaya məcbur et"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16650,30 +16939,52 @@ msgstr ""
 "\n"
 "Təfərruatlar üçün Yardıma tıqlayın."
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "İdxal ediləcək vəsiqəni seç..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Vəsiqə Adı"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Məqsədlər"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Bitiş Tarixi"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-Poçt Ünvanı"
 
@@ -16715,6 +17026,11 @@ msgstr ""
 "Nəşriyyatçı:\n"
 "  Mövzu: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL Alıcı Vəsiqəsi"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Vəsiqənin Hissəsi Deyil>"
@@ -16769,7 +17085,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Vəsiqə"
 
@@ -16789,19 +17105,23 @@ msgstr "Ümumi Ad (CN)"
 msgid "Contact Certificates"
 msgstr "Əlaqə Vəsiqələri"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "\"%s\"-ə bu səbəblərlə güvənmək istəyirsinizmi?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Ancaq lazımsız pəncərə"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Düzəlt"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Epoçt Vəsiqəsi Təsdiqi"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Epoçtu Alanın Vəsiqəsi"
@@ -16834,249 +17154,262 @@ msgstr "Quruluş Bölümü (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Barmaq İzi"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Alıcı Vəsiqəsi"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Verici Vəsiqəsi"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Epoçt istifadəçilərini təsdiqləmək üçün bu vəsiqə sahibinə güvən."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
-msgstr "Proqram təminatını inkişafçılarını təsdiqləmək üçün bu vəsiqə sahibinə güvən."
+msgstr ""
+"Proqram təminatını inkişafçılarını təsdiqləmək üçün bu vəsiqə sahibinə güvən."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Veb saytlarını təsdiqləmək üçün bu vəsiqə sahibinə güvən."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Göstər"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Vəsiqəni Göstər"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Sizə yeni Vəsiqə Sahibinə (CA) güvənmə sualı verildi."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Siz sizi təsdiqləyən bu şirkətlərin vəsiqələrinə maliksiniz:"
 
-#: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Siz bu vəsiqə şirkətlərini təsdiqləyən vəsiqələrə maliksiniz:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Siz bu şəxsləri təsdiqləyən vəsiqələrə maliksiniz:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Vəsiqələriniz"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Vəsiqə onsuz da mövcuddur"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "İmzalama"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Şiflələnmiş"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Buraxılış"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Buraxılış 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Buraxılış 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Buraxılış 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA Şifrələməsi İlə PKCS #1 MD2"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA Şifrələməsi İlə PKCS #1 MD5"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA Şifrələməsi İlə PKCS #1 SHA-1"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Şifrələməsi"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Vəsiqə Açar İstifadəsi"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape Vəsiqə Növü"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Üzv Tanıdıcısı (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Alqoritm Tanıdıcısı"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Alqoritm Parametrləri"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Mövzunun İctimai Açar Məlumatı"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Mövzunun İctimai Açar Alqoritmi"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Mövzunun İctimai Açarı"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Xəta: uzantı həll edilə bilmədi"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Üzv İmzalayanı"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Vəsiqəsi Təsdiqi"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Epoçt Vəsiqəsi Təsdiqi"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "İmzalama"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Açar Şifrələnməsi"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Data Şifrələnməsi"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Açar Razılığı"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Vəsiqə İmzalayan"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL İmzalayan"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritik"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Kritik Olmayan"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Uzantılar"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Vəsiqə İmza Alqoritması"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Çıxaran"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Çıxarana Məxsus ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Mövzuya Məxsus ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Vəsiqə İmzası Xətası"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Vəsiqə onsuz da mövcuddur"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Fayl Şifrəsi"
@@ -17216,9 +17549,9 @@ msgstr "Hazırkı əlaqəni göstər"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Gedişatlar"
 
@@ -17377,7 +17710,7 @@ msgstr "_Bağla"
 #: 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
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Bağla"
 
@@ -17390,7 +17723,7 @@ msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
 #: 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:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Ana vasitə çubuğu"
 
@@ -17433,7 +17766,7 @@ msgstr "Bu üzvü diskə qeyd et"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fayl"
 
@@ -17622,7 +17955,8 @@ msgid "Hide _Read Messages"
 msgstr "_Oxunmuş İsmarışları Gizlə"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Üstünə çızıq çəkmək yerinə silinmiş ismarışları gizlə"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17647,7 +17981,8 @@ msgstr "İl_gəyi Seç"
 
 #: 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ç"
+msgstr ""
+"Ancaq hazırda seçili olmayan ismarışlar olmaq üzərə bütün ismarışları seç"
 
 #: ui/evolution-mail-list.xml.h:16
 msgid "Select all messages in the same thread as the selected message"
@@ -17689,16 +18024,6 @@ msgstr "Seçimi _Tərs Çevir"
 msgid "_Threaded Message List"
 msgstr "İlgək_lənmiş İsmarış Siyahısı"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "Bu pəncərəni bağla"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "_Bağla"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Yollayanı Ünvan Kitabçasına Ə_lavə Et"
@@ -17749,7 +18074,8 @@ msgstr "Bu alıcıların ismarışlarını süzgəcdən keçirmək üçün qayda
 
 #: 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ı süzgəcdən keçirmək üçün qayda yarat"
+msgstr ""
+"Bu məktublaşma qrupundakı ismarışları süzgəcdən keçirmək üçün qayda yarat"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
@@ -18091,7 +18417,7 @@ msgstr "Ə_vvəlki İsmarış"
 msgid "_Quoted"
 msgstr "_Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Vasitələr"
 
@@ -18099,6 +18425,16 @@ msgstr "_Vasitələr"
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Bu pəncərəni bağla"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Bağla"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "İlişdir"
@@ -18181,10 +18517,6 @@ msgstr "Hazırkı faylı fərqli ad altında qeyd et"
 msgid "Save the message in a specified folder"
 msgstr "İsmarışı bildirilən qovluğa qeyd et"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Göndər"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18388,106 +18720,120 @@ msgid "_Open Task"
 msgstr "_Vəzifə Aç"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution Haqqında..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Evolution Haqqında"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolution qurğularını dəyişdir"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Bu qovluğun xassələrini dəyişdir"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Bu qovluğu göstərən yeni pəncərə yarat"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Çı_x"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _TSS"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Proqramdan çıx"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Ş_ifrələri Unut"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 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ə"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Başqa proqramlardan mə'lumatları idxal et"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Yeni _Pəncərə"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Qurğuları..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Göndər / Al"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Növbədəki məktubları göndər və yenilərini al"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Pilot qurğularını sazla"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Ximian Evolution haqqında mə'lumat göstər"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Xəta Raportu Göndər"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportu Göndər"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy ilə xəta raportu göndər"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Xətdən qopuq modda işlədiyimizi bildir."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _TSS"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Ana vasitə çubuğu"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian Evolution _Haqqında..."
+msgid "Toggle whether we are working offline."
+msgstr "Xətdən qopuq modda işlədiyimizi bildir."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution Haqqında"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Cəld Yardım"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Pəncərə"
 
@@ -18556,7 +18902,7 @@ msgid "With _Status"
 msgstr "_Vəziyyət İlə"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -18710,28 +19056,29 @@ msgstr "Başqa..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution Xətası"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Evolution Xəbərdarlığı"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr "Evolution Mə'lumatı"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr "Evolution Sorğusu"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:417
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">Daxili xəta, naməlum xəta '%s' istənildi</span>"
 
 #: widgets/misc/e-expander.c:181
@@ -18755,8 +19102,8 @@ msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
 msgstr ""
-"Seçili isə, altı cızılı xarakterdən sonrakının mnemonik sürətləndirici düyməsi"
-"olaraq qəbul edilməsini göstərir"
+"Seçili isə, altı cızılı xarakterdən sonrakının mnemonik sürətləndirici "
+"düyməsiolaraq qəbul edilməsini göstərir"
 
 #: widgets/misc/e-expander.c:205
 msgid "Spacing"
@@ -18867,13 +19214,474 @@ msgstr "\"{0}\" faylı qeyd edilə bilmir."
 msgid "Cannot open file \"{0}\"."
 msgstr "\"{0}\" faylı açıla bilmir."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% başa çatdı)"
 
+#~ msgid "Login name:"
+#~ msgstr "Giriş adı:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "İstifadəçi Nəşrləri"
+
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP vericisinə bağlanma xətası"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kök DSE üstündə sorğu həyata keçirilə bilmədi"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Sxem məlumatını alma xətası"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Dəstəklənən Bazaları _Göstər "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Bağlanır"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Ayırılan _adı:"
+
+#~ msgid "Email address:"
+#~ msgstr "Epoçt ünvanı:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution sizi vericiyə tanıtmaq üçün DN istifadə edəcək"
+
+#~ msgid "One"
+#~ msgstr "Bir"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Axtarışın əhatə _sahəsi: "
+
+#~ msgid "Searching"
+#~ msgstr "Axtarılır"
+
+#~ msgid "Sub"
+#~ msgstr "Alt"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "BU seçim axtarışın nə vaxtla icra ediləcəyini bildirir."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "SSL/TLS _işlət:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Göstərilən ad:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port nömrəsi:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Axtarış bazası:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Verici adı:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Vaxt Dolması (dəqiqə):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "bağlanma-səkməsi"
+
+#~ msgid "general-tab"
+#~ msgstr "ümumi-səkmə"
+
+#~ msgid "searching-tab"
+#~ msgstr "axtarış-səkməsi"
+
+#~ msgid "Job title:"
+#~ msgstr "Məslək:"
+
+#~ msgid "Webcam:"
+#~ msgstr "Veb Kamerası:"
+
+#~ msgid "item7"
+#~ msgstr "üzv7"
+
+#~ msgid "item8"
+#~ msgstr "üzv8"
+
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aşağıdakı girişlər səhvdir:\n"
+#~ "\n"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "əlaqə-siyahısı-editoru"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Siyahını VCard Olaraq Qeyd Et"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "%s qeyd edilirkən xəta yarandı: %s"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URL açıla bilmir"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Wombat başladıla bilmədi"
+
+#~ msgid "C_alendar"
+#~ msgstr "_Təqvim"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Səsli Alarm Seçimləri"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "İsmarış Alarm Seçənəkləri"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Məktubla Alarm Seçimləri"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Proqram Alarm Seçənəkləri"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Naməlum Alarm Seçənəkləri"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarm Təkrarlaması"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Göstəriləcək İsmarış:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Göndəriləcək İsmarış"
+
+#~ msgid "Play sound:"
+#~ msgstr "Səs çal:"
+
+#~ msgid "Run program:"
+#~ msgstr "Proqramı işə sal: "
+
+#~ msgid "With these arguments:"
+#~ msgstr "Bu arqumentlərlə:"
+
+#~ msgid "Basics"
+#~ msgstr "Əsaslar"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Tarix/Vaxt:"
+
+#~ msgid "Reminders"
+#~ msgstr "Xatırladıcılar"
+
+#~ msgid "_Options..."
+#~ msgstr "_Seçimlər..."
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Təqvim Xassələri"
+
+#~ msgid "Remote"
+#~ msgstr "Uzaq"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Vəzifə Siyahısı Xassələri"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Yeniləmə Aralığı:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Mənbə URI-si:"
+
+#~ 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?"
+
+#~ 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?"
+
+#~ 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?"
+
+#~ 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?"
+
+#~ msgid "Addressbook..."
+#~ msgstr "Ünvan kitabçası..."
+
+#~ msgid "Reminder"
+#~ msgstr "Xatırladıcı"
+
+#~ msgid "B_usy"
+#~ msgstr "_Məşğul"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Gizli"
+
+#~ msgid "Date & Time"
+#~ msgstr "Tarix & Saat"
+
+#~ msgid "F_ree"
+#~ msgstr "B_oş"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Xü_susi"
+
+#~ msgid "Pu_blic"
+#~ msgstr "İ_ctimai"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "_İştirakçı Əlavə Et"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Başqalarını _Dəvət Et..."
+
+#~ msgid "Preview"
+#~ msgstr "Nümayiş"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Təkralanma Qaydası"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Xüsusi təkrarlama"
+
+#~ msgid "_Modify"
+#~ msgstr "_Düzəlt"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Təkrarlama _yoxudr"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Bəsit təkrarlama"
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Bu hadisə dəyişdirilib, amma qeyd edilməyib.\n"
+#~ "\n"
+#~ "Dəyişiklikləriniz qeyd edilsin?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "Dəyişiklikləri _Unut"
+
+#~ msgid "Save Event"
+#~ msgstr "Hadisəni Qeyd Et"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Görüş mə'lumatı yaradıldı. Göndərilsin?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Görüş mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Vəzifə tapşırma mə'lumatı yaradıldı. Göndərilsin?"
+
+#~ 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?"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Bitdi"
+
+#~ msgid "Progress"
+#~ msgstr "Fəaliyyət"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Gi_zli"
+
+#~ msgid "Folder:"
+#~ msgstr "Qovluq:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Başlayır:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Bitir:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Başa Çatdı:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Vaxt:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Heç biri</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA sistemində bir xəta baş verdi\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Cism tapıla bilmədi!\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
+
+#~ msgid "_Options"
+#~ msgstr "_Seçimlər"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "İclas _başlama saatı:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "İclas _bitiş saatı:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s açılırkən xəta:\n"
+#~ " %s"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Spam və Spam Olmayan məktubların öyrənilməsi"
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "`%s' üçün vəsiqə tapıla bilmir"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "CMS ismarışı yaradıla bilmədi"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Şifrələyənin məzmunu yaradıla bilmir"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Bağlanma xətası: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Qrup alına bilmədi: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Naməlum verici cavabı: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Tərtib pəncərəsi yaradıla bilmir:\n"
+#~ "HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir."
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Səbəb: \"${1}\"."
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Xal Qaydaları"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr ""
+#~ "%a, %Y-%m-%d tarixində, saat %H:%M %%+05d radələrində, %%s yazmışdır ki:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Qovluq Adı"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Xassələr..."
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Gələn Məktubları Yoxla"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Təkcə _Yerli Sınaqlar"
+
+#~ msgid "Working"
+#~ msgstr "İşləyir"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Proqramın İnkişafçıları"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Fayl adı:"
+
+#~ msgid "Checkbox"
+#~ msgstr "İşarələmə qutusu"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Namə'lum xəta."
+
+#~ 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 ""
+#~ "%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 "C_alendar:"
+#~ msgstr "_Təqvim:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "Ə_laqələr: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Məktub:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Vəzifələr:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Qovluq _növü:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Başqa İstifadəçinin Qovluğunu Aç"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Qovluq Adı:"
+
+#~ msgid "_User:"
+#~ msgstr "_İstifadəci:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "\"%s\"-ə bu səbəblərlə güvənmək istəyirsinizmi?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Vəsiqəni Göstər"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Sizə yeni Vəsiqə Sahibinə (CA) güvənmə sualı verildi."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution Haqqında..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian Evolution _Haqqında..."
diff --git a/po/be.po b/po/be.po
index 166c738926..6eaa3036cb 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\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"
@@ -20,16 +20,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Кніга адрэсаў \"Эвалюцыі\""
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Кантакты: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Акно \"Эвалюцыі\""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -55,35 +45,256 @@ msgstr "карткі"
 msgid " card"
 msgstr "1 картка"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Кантакты: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Акно \"Эвалюцыі\""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Курсор ня быў загружаны\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Збой аўтарызацыі на паслужніку LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Немагчыма атрымаць групу: %s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Немагчыма загрузіць %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Адсутнічае катэгорыя рэдактара."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Захаваць у кнізе адрэсаў"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Памылка загрузкі дапомнай кнігі адрэсаў."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Памылка заданага пошуку"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Жадаеце захаваць зьмены?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Адмовіць"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "і адна іншая картка."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Памылка пад час даданьня карткі"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Адрэса дапомнае сынхранізацыі:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Немагчыма загрузіць %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня адрэсаў Пілёта"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Далучацца да паслужніка LDAP ананімна"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Збой аўтарызацыі.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Тэчкі аўтазавяршэньня"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Кантакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Ід сэртыфіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Кантакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Кніга адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
+
+#: 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 "Evolution folder settings configuration control"
+msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -118,7 +329,7 @@ msgstr "Новы кантакт:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Кантакты: "
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -143,15 +354,15 @@ msgid "Migrating `%s':"
 msgstr "Зандаваньне %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -160,22 +371,22 @@ msgid "Personal"
 msgstr "Пэрсанальнае"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Тэчкі аўтазавяршэньня"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -183,58 +394,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Уласьцівасьці..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Кантакты"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Далучацца да паслужніка LDAP ананімна"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Збой аўтарызацыі.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -254,63 +474,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Тэчкі аўтазавяршэньня"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Кантакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "_Ід сэртыфіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Кніга адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
-
-#: 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 "Evolution folder settings configuration control"
-msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -318,7 +481,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -327,8 +490,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -354,6 +516,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Аўтарызацыя"
@@ -403,13 +566,11 @@ msgid "Anonymously"
 msgstr "Ананімна"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Асноўнае"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэталі"
 
@@ -676,34 +837,26 @@ msgid "cards"
 msgstr "карткі"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "хвіліны"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "Выдаліць усё"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Выдаліць усё"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Прагляд сьпіса кантактаў"
@@ -718,7 +871,7 @@ msgid "Send HTML Mail?"
 msgstr "Даслаць ліст у фармаце HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Дадаць да кантактаў"
 
@@ -726,15 +879,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Выбар кантактаў з кнігі адрэсаў"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -761,6 +922,11 @@ msgstr "_Катэгорыя:"
 msgid "_Find"
 msgstr "Пошук"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "По_шук"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -807,9 +973,8 @@ msgid "<b>Work</b>"
 msgstr "Працоўны тыдзень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -834,7 +999,6 @@ msgid "Birthday:"
 msgstr "_Дзень народзінаў:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Ка_ляндар:"
@@ -850,15 +1014,15 @@ msgid "Company:"
 msgstr "Прадпрыемства"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Кантакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Рэдактар кантактаў"
 
@@ -968,8 +1132,8 @@ msgstr "Адрэса Web-старонкі:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -991,44 +1155,28 @@ msgid "_File under:"
 msgstr "Назва файла:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "Паслужнік:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэтыя кантакты?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэты кантакт?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Адрэса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Можа рэдагавацца"
 
@@ -2010,141 +2158,133 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Даслаць паведамленьне"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Сьпіс бяз назвы"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Ёра"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Група"
+msgid "Service"
+msgstr "Паслуга гатова"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Мейсца:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Імя карыстальніка:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Хатні"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Іншы"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Ёра"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Група"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Крыніца"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новы кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Палі у якія можна пісаць"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Зьменена"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Гэты кантакт належыць наступным катэгорыям:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Хатні"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Недапушчальная дата вяртаньня"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Памылковая мэта"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Адмовіць"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Даслаць паведамленьне"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Паслуга гатова"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Мейсца:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Імя карыстальніка:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Хуткае даданьне кантакта"
@@ -2162,6 +2302,22 @@ msgstr "Поўнае імя:"
 msgid "E-_mail:"
 msgstr "Э. пошта:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы ўпэўненыя што жадаеце\n"
+"выдаліць гэтыя кантакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Вы ўпэўненыя што жадаеце\n"
+"выдаліць гэты кантакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрэса _2:"
@@ -2288,48 +2444,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Выбар кантактаў з кнігі адрэсаў"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Удзельнікі"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Выдаліць выбраныя элемэнты са сьпіса укладаньняў"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Вылучаны"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Хаваць адрэсы пад час адпраўкі пошты ў гэты сьпіс"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Назва сьпіса:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Пазначце э. пошту ці перацягніце кантакт у сьпіс ніжэй:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "рэдактар сьпісу кантактаў"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "дыялёг1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Кніга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Гэта новы сьпіс"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Патрабаваныя ўдзельнікі"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Захаваць сьпіс як Візытоўку (VCard)"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Зьменены кантакт:"
@@ -2368,11 +2545,414 @@ msgstr ""
 "у гэтае тэчцы. Усё адно жадаеце дадаць?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Адмысловы пошук"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Паказаць кантакты"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Кантакты"
+msgstr[1] "Кантакты"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Запыт"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Памылка атрыманьня прагляду кнігі"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Мадэля"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Памылка пад час зьмены карткі"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Назва пачынаецца з"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "Э. пошта пачынаецца з"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Катэгорыя"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Любое поле ўтрымлівае"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Адмысловае..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Тып"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Кніга адрэсаў"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Захаваць як візытоўку (VCard)"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Новы кантакт..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Новы сьпіс кантактаў..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Пераход у тэчку..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Імпарт..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Пошук кантактаў..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Крыніцы кнігі адрэсаў..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Усталёўкі \"Пілёта\"..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Пераслаць кантакт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Даслаць паведамленьне кантактанае асобе"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Друк"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Друкаваць паштоўку"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Кніга адрэсаў..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Кніга адрэсаў..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Выразаць"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Капіяваць"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Уставіць"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Бягучы выгляд"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Любая катэгорыя"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Памочнік"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Тэлефон памочніка"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Працоўны факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Працоўны тэлефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Працоўны тэлефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Тэлефон зваротнага выкліку"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Тэлефон у аўтамабіле"
+
+#: 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:3
+msgid "Categories"
+msgstr "Катэгорыі"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Тэлефон установы"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Э. пошта"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Э. пошта 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Э. пошта 3"
+
+#: 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
+#, fuzzy
+msgid "Given Name"
+msgstr "Назва поля"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Хатні факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Хатні тэлефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Хатні тэлефон 2"
+
+#: 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.etspec.h:22
+msgid "Manager"
+msgstr "Мэнаджар"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мабільны тэлефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Мянушка"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Заўвага"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Офіс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Установа"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Іншы Fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Іншыя тэлефоны"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Пэйджар"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Першасны тэлефон"
+
+#: 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:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Тэлекс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Пасада"
+
+#: 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 "І-нэт пляцоўка"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Шырыня"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Вышыня"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Мае засяроджаньне"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Поле"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Назва поля"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Мадэль тэкста"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Максымальная даўжыня поля імя"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Шырыня слупка"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Адсутнічаюць запісы для прагляду.\n"
+"\n"
+"Падвойны клік тутака створыць новы кантакт."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Адсутнічаюць запісы для прагляду."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Адаптар"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Вылучаны"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Мае курсор"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2384,117 +2964,90 @@ msgid "map"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Удзельнікі"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Установа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Бостан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Група"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #, fuzzy
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Праца"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Більбао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мабільны тэлефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Пэрсанальнае"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Заўвага"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "Паса_да:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Э. пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Хатні факс"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Пасьпяхова"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Сховішча знаходзіцца ў адлучаным стане"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Новы сьпіс кантактаў"
@@ -2502,74 +3055,74 @@ msgstr "Новы сьпіс кантактаў"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картка ня адшукана"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ід карткі ужо існуе"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Пратакол не падтрымліваецца"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Адменена"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Збой аўтарызацыі"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Патрабуе аўтарызацыю"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Няма гэткага паведамленьня"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Іншая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2578,7 +3131,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Праверце, што шлях існуе\n"
 "і што у вас ёсьць неабходныя правы доступа."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2587,7 +3140,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2599,7 +3152,7 @@ msgstr ""
 "перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
 "усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2608,7 +3161,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2621,7 +3174,7 @@ msgstr ""
 "ці абмяжуйце памер адказу кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2633,48 +3186,48 @@ msgstr ""
 "пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Запыт ня быў пасьпяхова выкананы."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Памылка пад час даданьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Памылка пад час даданьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Памылка рэдагаваньня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Памылка выдаленьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Памылка выдаленьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2683,7 +3236,7 @@ msgstr ""
 "Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
 "Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2692,49 +3245,49 @@ msgstr ""
 "%s ужо існуе\n"
 "Жадаеце перапісаць?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Перапісаць"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "сьпіс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перамясьсціць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Капіяваць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перамясьсціць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Капіяваць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Выбар кантактаў з кнігі адрэсаў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Шматлікія VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -2744,48 +3297,38 @@ msgstr "VCard для %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(няма)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Першасная Э. пошта"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Э. пошта 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Э. пошта 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Выбраць дзеяньне"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Стварыць новы кантакт \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Дадаць адрэсу да кантакта \"%s\", які ўжо існуе"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Запыт да кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Рэдагаваньне кантактных зьвестак"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Аб'яднаць адрэсы Э. пошты"
 
@@ -2811,377 +3354,6 @@ msgstr "Захаваць кантакт як візытоўку (VCard)"
 msgid "Save in addressbook"
 msgstr "Захаваць у кнізе адрэсаў"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Паказаць кантакты"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Кантакты"
-msgstr[1] "Кантакты"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Запыт"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Памылка атрыманьня прагляду кнігі"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Мадэля"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Памылка пад час зьмены карткі"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Назва пачынаецца з"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "Э. пошта пачынаецца з"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Катэгорыя"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Любое поле ўтрымлівае"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Адмысловае..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Тып"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Кніга адрэсаў"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Захаваць як візытоўку (VCard)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Новы кантакт..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Новы сьпіс кантактаў..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Пераход у тэчку..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Імпарт..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Пошук кантактаў..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Крыніцы кнігі адрэсаў..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Усталёўкі \"Пілёта\"..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Пераслаць кантакт"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Даслаць паведамленьне кантактанае асобе"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Друк"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Друкаваць паштоўку"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Кніга адрэсаў..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Кніга адрэсаў..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Выразаць"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Капіяваць"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Уставіць"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Бягучы выгляд"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Любая катэгорыя"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Памочнік"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Тэлефон памочніка"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Працоўны факс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Працоўны тэлефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Працоўны тэлефон 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Тэлефон зваротнага выкліку"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Тэлефон у аўтамабіле"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Катэгорыі"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Тэлефон установы"
-
-#: 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
-#, fuzzy
-msgid "Given Name"
-msgstr "Назва поля"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Хатні факс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Хатні тэлефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Хатні тэлефон 2"
-
-#: 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.etspec.h:22
-msgid "Manager"
-msgstr "Мэнаджар"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Мянушка"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Офіс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Іншы Fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Іншыя тэлефоны"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Пэйджар"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Першасны тэлефон"
-
-#: 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:234
-#: 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:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Тэлекс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Пасада"
-
-#: 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 "І-нэт пляцоўка"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Шырыня"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Вышыня"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Мае засяроджаньне"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Вылучаны"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Мае курсор"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Поле"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Назва поля"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Мадэль тэкста"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Максымальная даўжыня поля імя"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Адсутнічаюць запісы для прагляду.\n"
-"\n"
-"Падвойны клік тутака створыць новы кантакт."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Адсутнічаюць запісы для прагляду."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Адаптар"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Шырыня слупка"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Выгляд карткі"
@@ -3224,6 +3396,11 @@ msgstr "Імпарт візытовак \"Эвалюцыі\"."
 msgid "VCard (.vcf, .gcrd)"
 msgstr "Візытоўка (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Друк паштоўкі"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3235,11 +3412,6 @@ msgstr "Друкаваць вылучаныя кантакты"
 msgid "Print contact"
 msgstr "Друкаваць вылучаныя кантакты"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Друк паштоўкі"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 пт. Tahoma"
@@ -3426,6 +3598,23 @@ msgstr "_Сьпіс кантактаў"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Немагчыма адкрыць паведамленьне"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Немагчыма загрузіць %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Неатрымалася адкрыць кнігу адрэсаў"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3483,23 +3672,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Нутраная памылка"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Немагчыма адкрыць паведамленьне"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Немагчыма загрузіць %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Неатрымалася адкрыць кнігу адрэсаў"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Памылка загрузкі дапомнай кнігі адрэсаў."
@@ -3516,40 +3688,367 @@ msgstr "Назва файла не пазначана."
 msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не выдаляць"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Даслаць на:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Вы упэўненыя у тым, што жадаеце адмяніць і выдаліць гэтую сустрэчу?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Сустрэча"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Жадаеце захаваць зьмены?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абнавіць рэдактар?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Адкінуць зьмены"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Захаваць паведамлеьне як..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Даслаць"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Праграма лакальнага каляндара \"Эвалюцыі\""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Пазначце пароль"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Падзяліць шматдзённыя падзеі:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Неатрымалася запусьціць паслужнік wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Неатрымалася запусьціць wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня каляндару \"Пілёта\""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Дапомны прыярытэт:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня заданьняў \"Пілёта\""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Каляндар і заданьні"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Каляндар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Каляндар і заданьні \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Заданьні"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Каляндар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Запускаецца:"
@@ -3644,10 +4143,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Неатрымалася ініцыялізаваць Bonobo"
@@ -3796,9 +4291,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Паказаць нумары тыдняў у навігатары па датах"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Агульныя зьвесткі утрымліваюць"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Апісаньне ўтрымлівае"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Камэнтар утрымлівае"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Апісаньне ўтрымлівае"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Іншая пошта"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3822,8 +4338,8 @@ msgid "Purge events older than"
 msgstr "вяртае менш за"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "дні"
 
@@ -3834,7 +4350,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3884,68 +4400,56 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Каляндар"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Новая сустрэча"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Сустрэча"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Нарада"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Стварыць запыт новае нарады"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Новая сустрэча на увесь дзень"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Сустрэча на увесь _дзень"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "Ка_ляндар:"
+msgid "Cale_ndar"
+msgstr "Каляндар"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Стварыць новую тэчку"
@@ -3976,27 +4480,6 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Агульныя зьвесткі утрымліваюць"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Апісаньне ўтрымлівае"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Камэнтар утрымлівае"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Апісаньне ўтрымлівае"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Іншая пошта"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Памылка пад час адкрыцьця каляндара"
@@ -4014,226 +4497,132 @@ msgstr "Адсутнічаюць правы на адкрыцьцё калянд
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Парамэтры нагадваньня гукам"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Парамэтры паведамленьняў нагадваньня"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Парамэтры нагадваньня праз пошту"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Парамэтры праграмы нагадваньня"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Парамэтры невядомага нагадваньня"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Паўтор нагадваньня"
+msgid "<b>Alarm</b>\t"
+msgstr "Інфармацыя календара"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Адлюстраваньне паведамленьняў"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Паведамленьне для адпраўкі"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Граць гук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Паўтор нагадваньня"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Запусьціць праграму:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Даслаць на:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "З гэткімі аргумэнтамі:"
+msgid "<b>Options</b>"
+msgstr "Апісаньне:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "дыялёг1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Нагадваньні"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "дадатковы час кожныя"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Сыгналы"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "гадзіны"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Стварыць паведамленьне"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Дадаць"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Асноўнае"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Дата/Час:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Паведамленьні"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Граць гук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Нагадваньне"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Запусьціць праграму"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Даслаць на:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Даслаць пошту"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Агульныя зьвесткі:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Уліковы запіс:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Парамэтры..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Запусьціць праграму:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Паўтор нагадваньня"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Даслаць"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "пасьля"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "перад"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "дзень(дзён)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "канец сустрэчы"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "дадатковы час кожныя"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "гадзіна (ы)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "гадзіны"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "хвіліна(ы)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "пачатак сустрэчы"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Вы мусіце пазначыць назву файла."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Новая Калядонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Зьпіс заданьняў"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Колеры"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Выбярыце колер"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Новая Калядонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Дадаць групу..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Абнавіць"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тып:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Дадаць"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "тыдні"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Сыгналы"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4351,7 +4740,7 @@ msgid "Free/Busy Publishing"
 msgstr "Запыт \"Вольны/Заняты\""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Пятніца"
@@ -4365,7 +4754,7 @@ msgid "Minutes"
 msgstr "Хвіліны"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Панядзелак"
@@ -4375,7 +4764,7 @@ msgid "S_un"
 msgstr "Няд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
@@ -4389,7 +4778,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Паказаць нумары тыдняў у навігатары па датах"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Нядзеля"
@@ -4403,7 +4792,7 @@ msgid "T_hu"
 msgstr "Чцв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Чацьвер"
@@ -4417,7 +4806,7 @@ msgid "Time format:"
 msgstr "Фармат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Аўторак"
@@ -4427,7 +4816,7 @@ msgid "W_eek starts:"
 msgstr "Тыдзень пачынаецца з:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Серада"
@@ -4461,7 +4850,8 @@ msgstr "Сьціснуць выходныя ў праглядзе месяца"
 msgid "_Day begins:"
 msgstr "Дзень пачынаецца:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4511,6 +4901,80 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перад кожнай сустрэчай"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Вы мусіце пазначыць назву файла."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Новая Калядонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Зьпіс заданьняў"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Колеры"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Выбярыце колер"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Новая Калядонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Дадаць групу..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Абнавіць"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тып:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "тыдні"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Гэтая падзея была выдалена."
@@ -4555,80 +5019,74 @@ msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абн
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Памылка зацьверджаньня: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " да "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Патрэба "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Умоўленае"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Немагчыма абнавіць аб'ект"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Рэдагаваньне сустрэчы"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Сустрэча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Заданьне - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запіс часопіса - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Захаваць як..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Немагчыма атрымаць бягучую вэрсыю!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Памылка зацьверджаньня: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " да "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Патрэба "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Умоўленае"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4696,8 +5154,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Элемэнт не можа быць выдалена з-за памылкі corba"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Кніга адрэсаў..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Кантакты..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4707,164 +5166,222 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Сустрэча"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Нагадваньне"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Інфармацыя"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Нарада"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Дата пачатку памылковая"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Дата завяршэньня памылковая"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Час пачатку памылковы"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Час заканчэньня памылковы"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "перад кожнай сустрэчай"
+msgstr[1] "перад кожнай сустрэчай"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "канец сустрэчы"
+msgstr[1] "канец сустрэчы"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "перад кожнай сустрэчай"
+msgstr[1] "перад кожнай сустрэчай"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Падзея _усяго дня"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "перад кожнай сустрэчай"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Заняты"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "перад кожнай сустрэчай"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Катэгорыі..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "перад кожнай сустрэчай"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Інфармацыя календара"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Клясыфікацыя"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Дата й час"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Сакрэтнае"
+msgid "A_ll day event"
+msgstr "Падзея _усяго дня"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Дата/Час:"
+msgid "C_ustomize..."
+msgstr "Захаваць прагляд карыстальніка..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Вольны"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Катэгорыі..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Мейсца:"
+msgid "Cale_ndar:"
+msgstr "Ка_ляндар:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Прыватнае"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Клясыфікацыя"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Пу_блічнае"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Сакрэтнае"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Паказаць дату як"
+msgid "L_ocation:"
+msgstr "Мейсца:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Прыватнае"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Публічнае"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Паказаць дату як"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "А_гулам:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Сыгналы"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Апісаньне:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Час заканчэньня:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Час пачатку:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Няма"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Неабходны арганізатар."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Патрабуе хаця б аднаго удзельніка."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "Вы_даліць"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Выдаліць"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4903,36 +5420,45 @@ msgid "Member"
 msgstr "Удзельнік"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Удзельнік"
+msgid "<b>Attendees</b>"
+msgstr "<b>Пачынаецца:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+msgid "<b>Organizer</b>"
+msgstr "<b>Умоўлена:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Зьмяніць арганізатара"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Арганізатар:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Кантакты..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Зьмяніць арганізатара"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Арганізатар:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5009,154 +5535,146 @@ msgstr "Гэты й будучы экзэмпляры"
 msgid "All Instances"
 msgstr "Усе экзэмпляры"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Гэтая сустрэча мае правілы паўтору, якія ня могуць быць адрэдагаваныя у "
 "\"Эвалюцыі\"."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Недапушчальная дата вяртаньня"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "першы"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "другі"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "трэці"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "чыцьверты"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "апошні"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Іншая дата"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "дзень"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "выпадкі"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата/Час:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Кожны"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Выключэньні"
+msgid "<b>Exceptions</b>"
+msgstr "Апісаньне:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Прыклад:"
+msgid "<b>Preview</b>"
+msgstr "Перадпрагляд"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Правіла вяртаньня"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Вяртаньне вызначаецца карыстальнікам"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Зьмяненьне"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Бяз вяртаньня"
+msgid "<b>Recurrence</b>"
+msgstr "Вяртаньне"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Выдаліць"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Кожны"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Простае вяртаньне"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Рэдагаваць сустрэчу"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "для"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "назаўсёды"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "месяц(ы)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "пакуль"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "тыдзень(і)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "год(гады)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Выдаліць гэтую тэчку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Дата заканчэньня выкананьня памылковая"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Паведамленьне, якое адлюстроўваецца:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% Завершана"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Паведамленьне, якое адлюстроўваецца:"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Выканана"
 
@@ -5168,8 +5686,8 @@ msgstr "Высокі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Выконваецца"
@@ -5181,23 +5699,22 @@ msgid "Low"
 msgstr "Нізкі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Нармальны"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не распачаты"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Выконваецца"
+msgid "P_ercent complete:"
+msgstr "Адсоткі выкананьня: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5222,37 +5739,42 @@ msgstr "_Стан:"
 msgid "_Web Page:"
 msgstr "Адрэса Web-старонкі:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Заданьне"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Прызначэньне"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Умоўленая дата памылковая"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Сакрэтна"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Паведамленьне, якое адлюстроўваецца:"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Паведамленьне, якое адлюстроўваецца:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Апісаньне:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_Тэчка:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5263,60 +5785,58 @@ msgstr "Дата пачатку:"
 msgid "_Due date:"
 msgstr "_Умоўленая дата:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
+msgid "_Group:"
+msgstr "Група"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Інфармацыя календара"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Дзень"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Інфармацыя \"Вольны/Заняты\""
+msgid "<b>Publishing _Location</b>"
+msgstr "Запыт \"Вольны/Заняты\""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Запыт \"Вольны/Заняты\""
+msgid "Free/Busy Editor"
+msgstr "Інфармацыя \"Вольны/Заняты\""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Назва сьпіса:"
+msgid "_Daily"
+msgstr "Дзень"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Пароль"
+msgid "_Manual"
+msgstr "Мэнаджар"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Пароль"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Запомніць гэты пароль"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Імя карыстальніка:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Тыдзень"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5398,7 +5918,7 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невядомага тыпу трэггера"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Клікніце каб дадаць заданьне"
@@ -5407,6 +5927,11 @@ msgstr "Клікніце каб дадаць заданьне"
 msgid "Untitled"
 msgstr "Бяз назвы"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Агульныя зьвесткі:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5420,7 +5945,7 @@ msgstr "_Умоўленая дата:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Стан:"
 
@@ -5434,20 +5959,93 @@ msgstr "_Прыярытэт:"
 msgid "Web Page:"
 msgstr "Адрэса Web-старонкі:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Публічнае"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Дата завяршэньня"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Прыватнае"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Дата пачатку"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Сакрэтнае"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Агульныя зьвесткі"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Вольны"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Заняты"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Геаграфічнае разьмяшчэньне мусіць быць пазначана ў фармаце:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Так"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Не"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Невядома"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Паўтор"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Прызначана"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5493,96 +6091,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Вольны"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заняты"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Выдаленьне вылучаных аб'ектаў"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Абнаўленьне аб'ектаў"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Адкрыць"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Адкрыць паведамленьне"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Захаваць _як..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Друкаваць..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вы_разаць"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Капіяваць"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Прызначыць заданьне"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Перадаслаць як iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "Пазначыць як выкананае"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Пазначыць вылучаныя заданьні як выкананыя"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "Вы_даліць"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Выдаліць вылучаныя заданьні"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Захаваць як..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Клікніце каб дадаць заданьне"
 
@@ -5591,181 +6195,112 @@ msgstr "Клікніце каб дадаць заданьне"
 msgid "% Complete"
 msgstr "% Завершана"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Выкананьне"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Дата выкананьня"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Умоўленая дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Прыярытэт"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Дата пачатку"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Агульныя зьвесткі"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Сартаваньне заданьняў"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Перамяшчэньне паведамленьняў"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Капіяваньне паведамленьняў"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Новая _сустрэча..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вылучыць абмеркаваньне тэмы"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Выдаліць..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Капіяваць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перамясьціць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Усталёўкі..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Дата завяршэньня"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата пачатку"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Невядома"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Паўтор"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Прызначана"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Так"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Геаграфічнае разьмяшчэньне мусіць быць пазначана ў фармаце:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5789,36 +6324,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "дзяленьні %02i хвіліны"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "дзяленьні %02i хвіліны"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5885,37 +6420,36 @@ msgid ", ending on "
 msgstr ", сканчаецца на "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Пачынаецца:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Сканчаецца:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Стан"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b> Выканана</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Энід"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Умоўлена:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Умоўленае"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Зьвесткі iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Памылка iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Невядомая пэрсона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5923,305 +6457,285 @@ msgstr ""
 "<br>Калі ласка, прагледзьце наступную інфармацыю, і выбярыце дзеяньне з мэню "
 "ніжэй."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Няма</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Мейсца:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прынята"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Выбраць дзеяньне:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Абнавіць"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Прыняць"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Прыняць для спробы"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Адхіліць"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Абнавіць стан удзельнікаў"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> разьмясьціў(ла) зьвесткі аб нарадзе."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запытваецца вашае прысутнасьці на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Плян нарады"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жадае далучыць да распачатае нарады."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> запытвае апошнюю інфармацыю па нарадзе."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Запыт на абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> мае адказ на запыт нарады."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Адказ па нарадзе"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> мае адмяніць нараду."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Адмена нарады"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> мае даслаць неінтэлегентнае паведамленьне."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Дрэннае паведамленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> мае апублікаваць зьвесткі аб заданьні."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пытаецца %s аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пытаецца вас аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Плян заданьня"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> жадае дадаць да распачатага заданьня."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жадае атрымаць апошнія зьвесткі па заданьні."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Запыт на абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> мае адказ на заданьне."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Адказ на заданьне"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> мае адмяніць заданьне."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Адмена заданьня"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Дрэннае паведамленьне па заданьні"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> мае апублікаваць інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> патрабуе ад вас інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Запыт \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> мае адказаць на запыт аб інфармацыі \"Заняты/Вольны\"."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Адказ на \"Заняты/Вольны\""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Дрэннае паведамленьне \"Вольны /Заняты\""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Падобна што паведамленьне не было правільна сфармавана"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Паведамленьне утрымлівае толькі запыты, якія не падтрымліваюцца."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Укладаньне ня ўтрымлівае рэчаіснага паведамленьня каляндара"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Аб'ект нерэчаісны і ня будзе абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Адбылася памылка ў сыстэме CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Аб'ект адсутнічае\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Стан удзельніка ня можа быць абноўлены!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Элемэнт ня можа быць дасланы!\n"
 
@@ -6250,6 +6764,10 @@ msgstr "Загрузка каляндара"
 msgid "Loading calendar..."
 msgstr "Загрузка каляндара..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Арганізатар:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Паведамленьне паслужніка:"
@@ -6266,11 +6784,6 @@ msgstr "дата-пачатку"
 msgid "Chair Persons"
 msgstr "Кіраўнікі"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Патрабаваныя ўдзельнікі"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Дадатковыя ўдзельнікі"
@@ -6338,6 +6851,28 @@ msgstr "Дэлегаваны"
 msgid "In Process"
 msgstr "У выкананьні"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Пакінуу офіс"
@@ -6346,98 +6881,64 @@ msgstr "Пакінуу офіс"
 msgid "No Information"
 msgstr "Зьвесткі адсутнічаюць"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Парамэтры"
+msgid "O_ptions"
+msgstr "Парамэтры"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Адлюстроўваць толькі _працоўныя часы"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Паказаць паменшанае"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Аб_навіць \"Вольны/Заняты\""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Аўтавыбар"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Усе людзі й рэсурсы"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Усе людзі й адзін рэсурс"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Патрабаваныя людзі"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Патрабаваныя людзі й адзін рэсурс"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Час пачатку нарады:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Час заканчэньня нарады:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6446,120 +6947,53 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Адкрыцьцё заданьняў %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Памылка на %s\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Адкрыцьцё заданьняў %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Заданьні"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Абнаўленьне аб'ектаў"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Сустрэчы не заплянаваны."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Адкрыць у %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Каляндар і заданьні"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Каляндар і заданьні \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Сродак кіраваньня каляндаром \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Праглядальнік паведамленьня плянаваньня каляндара \"Эвалюцыі\""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Каляндар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Заданьні"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Красавік"
@@ -6899,10 +7333,6 @@ msgstr "Вылучаны месяц (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Вылучаны год (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Заданьне"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6933,7 +7363,7 @@ msgid "Contacts: "
 msgstr "Кантакты: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
@@ -6962,7 +7392,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Заданьні адсутнічаюць"
 msgstr[1] "Заданьні адсутнічаюць"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6983,35 +7413,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Заданьне"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Стварыць новае заданьне"
@@ -8690,69 +9114,69 @@ msgstr "Падрыхтоўка тэчкі \"%s\" для аўтаномнае п�
 msgid "You must be working online to complete this operation"
 msgstr "Вы мусіце працаваць у далучаным стане для завяршэньня гэтае апэрацыі"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Недапушчальная плыня паведамленьня атрымана ад %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Сынхранізацыя тэчак"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Памылка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Памылка выкананьня фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Неатрымалася адкрыць тэчку спула"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Неатрымалася апрацаваць тэчку спула"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Атрыманьне паведамленьня %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Немагчыма адкрыць паведамленьне"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збой на паведамленьні %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Сынхранізацыя тэчкі"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Атрыманьне паведамленьня %d з %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збой на паведамленьні %d з %d"
@@ -8774,44 +9198,6 @@ msgstr "Недапушчальныя аргумэнты для user-tag"
 msgid "Error executing filter search: %s: %s"
 msgstr "Памылка выкананьня пошуку фільтра: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Перамяшчэньне паведамленьняў"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Капіяваньне паведамленьняў"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Папярэджаьне"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Атрыманьне %d паведамленьняў"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8857,7 +9243,45 @@ msgstr "(супадае ўсе) патрабуе адзінага лягічна
 msgid "Performing query on unknown header: %s"
 msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Апэрацыя не падтрымліваецца: пошук па ідэнтыфікатары карыстальніка: для %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Перамяшчэньне паведамленьняў"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Капіяваньне паведамленьняў"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Папярэджаьне"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Атрыманьне %d паведамленьняў"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8868,15 +9292,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Памылка пад час апрацоўкі падказкі gpg userid."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Памылка пад час апрацоўкі запыту парольнае фразы gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8885,32 +9309,32 @@ msgstr ""
 "Вам патрэбны пароль каб разблякаваць ключ для\n"
 "карыстальніка: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Адменена."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Збой пад час разблякаваньня сакрэтнага ключа: пазначана 3 некарэктныя "
 "парольныя фразы."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Нечаканы адказ ад GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Неатрымліваецца зашыфраваць гэтае паведамленьне: Невызначаны карэктныя "
 "атрымоўцы."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8921,69 +9345,89 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збой у GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Збой выкананьня gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Збой выкананьня gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Цела індэкса утрымлівае"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
+
+#: 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\": памылка пратакола з блякавальнікам"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Неатрымалася заблякаваць \"%s\""
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9006,26 +9450,6 @@ msgstr "Неатрымалася атрымаць lock карыстаючыся
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неатрымалася атрымаць lock карыстаючыся flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
-
-#: 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\": памылка пратакола з блякавальнікам"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Неатрымалася заблякаваць \"%s\""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9274,7 +9698,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -9361,55 +9785,55 @@ msgstr "POP да SMTP аўтарызацыя, карыстаючыся не POP
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Збой кампіляцыі сталага выразу: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" патрабуе кампанэнт імя карыстальніка"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" патрабуе кампанэнт вузла"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" патрабуе кампанэнт шляху"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Вызначэньне: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Памылка ў вызначэньні назвы: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Вызначэньня адрэсы вузла не адбылося: прычына невядома"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Вызначэньня адрэсы вузла не адбылося:  %s:  вузел адсутнічае"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Вызначэньня адрэсы вузла не адбылося: %s: прычына невядома"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Вызначэньне адрэсы"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Вызначэньня адрэсы вузла не адбылося: адсутнічае вузел"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Вызначэньня адрэсы вузла не адбылося: прычына невядома"
 
@@ -9485,7 +9909,7 @@ msgstr "_Ід сэртыфіката:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
@@ -9581,7 +10005,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Рэдагаваць подпіс"
 
 #: camel/camel-smime-context.c:651
@@ -9596,49 +10020,48 @@ msgstr "Збой каманды IMAP: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Неатрымалася адшукаць сэртыфікат для \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Неатрымліваецца адшукаць агульны альгарытм."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Стварыць правіла з паведамленьня"
+msgid "Cannot create CMS Message"
+msgstr "Немагчыма адкрыць паведамленьне"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Немагчыма адкрыць паведамленьне"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Немагчыма ўкласьці файл %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Немагчыма ўкласьці файл %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Немагчыма адкрыць паведамленьне"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9685,7 +10108,8 @@ msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
@@ -9694,8 +10118,8 @@ msgstr "Неатрымалася зьмяніць назву тэчкі: %s: н�
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Чэрвень"
@@ -9816,7 +10240,7 @@ msgstr "Выкарыстаньне ключа не падтрымлівае по
 msgid "Error in application verification"
 msgstr "Памылка ў дастасаваньні праверкі сапраўднасьці"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9829,11 +10253,11 @@ msgstr ""
 "Адбітак пальца:       %s\n"
 "Подпіс:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ДОБРА"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "КЕПСКА"
 
@@ -9857,7 +10281,7 @@ msgstr ""
 "Усёроўна жадаеце прыняць ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9872,7 +10296,7 @@ msgstr ""
 "\n"
 "Жадаеце прыняць?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9881,7 +10305,7 @@ msgstr ""
 "Праблема з сэртыфікатам: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9890,7 +10314,7 @@ msgstr ""
 "Дрэнны дамэн сэртыфікату: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9899,7 +10323,7 @@ msgstr ""
 "Сэртыфікат састарэў: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9908,7 +10332,7 @@ msgstr ""
 "Сьпіс вяртаньня сэртыфіката састарэў: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Немагчыма разабраць URL \"%s\""
@@ -9932,7 +10356,7 @@ msgstr "Немагчыма капіяваць ці перамясьціць па
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
@@ -9953,8 +10377,8 @@ msgid "Checking for new mail"
 msgstr "Праверка новае пошты"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Праверка новае пошты ўва ўсіх тэчках"
 
@@ -9989,8 +10413,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10011,324 +10435,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Густая дымка"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Паслужнік нечакана адключыўся: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Тэчкі"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Паказываць толькі запытаныя тэчкі"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Перавызначыць прапанаваную паслужнікам прастору назваў для тэчак"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Прастора назваў"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
-"незашыфраванага пароля."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Паслужнік IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "паслуга IMAP для %s на %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS адсутнічае"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Далучэньне адмененае"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Невядомая памылка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Немагчыма далучыцца да паслужніка POP %s: Запытаны мэханізм аўтарызацыі не "
-"падтрымліваецца."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Прадпрыемства"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Заданьні адсутнічаюць"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Паслужнік нечакана адключыўся: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Невядомая памылка"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10397,7 +10525,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10472,6 +10600,27 @@ msgstr "Збой далучэньня да паслужніка LDAP"
 msgid "Command:"
 msgstr "Прадпрыемства"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Тэчкі"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Паказываць толькі запытаныя тэчкі"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Перавызначыць прапанаваную паслужнікам прастору назваў для тэчак"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Прастора назваў"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10496,43 +10645,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Паслужнік IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "паслуга IMAP для %s на %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS адсутнічае"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Далучэньне адмененае"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Пашырэньне SSL/TLS не падтрымліваецца."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Збой узгадненьня SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ідэнтыфікацыя тыпа %s не падтрымліваецца"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sКалі ласка, увядзіце пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10543,30 +10742,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Паслужнік нечакана адключыўся: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Немагчыма дадаць паведамленьне да тэчкі mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
+"незашыфраванага пароля."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Немагчыма далучыцца да паслужніка POP %s: Запытаны мэханізм аўтарызацыі не "
+"падтрымліваецца."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Прадпрыемства"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Заданьні адсутнічаюць"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Паслужнік нечакана адключыўся: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10729,18 +11180,26 @@ msgstr "Немагчыма захаваць вынік: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Неатрымалася дадаць паведамленьне да выніку: прычына невядома"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Атрыманае"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Даданьне паведамленьня да тэчкі паштовага каталёга адменена"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі паштовага каталёга: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10756,38 +11215,38 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Нерэчаісны зьмест паведамленьня"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Тэчка \"%s\" не існуе."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не зьяўляецца паштовым каталёгам."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
@@ -10795,11 +11254,11 @@ msgstr ""
 "Немагчыма выдаліць тэчку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "не зьяўляецца паштовым каталёгам"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11396,20 +11855,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Немагчыма далучыцца да паслужніка POP %s (порт %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Збой далучэньня да паслужніка POP %s у рэжыме бясьпекі: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Немагчыма далучыцца да паслужніка POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11418,28 +11882,28 @@ msgstr ""
 "Немагчыма далучыцца да паслужніка POP %s: Запытаны мэханізм аўтарызацыі не "
 "падтрымліваецца."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Уваход на паслужнік POP неадбыўся %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Неадбыўся ўваход на паслужнік POP %s: памылка пратакола SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sКалі ласка пазначце пароль POP для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11448,7 +11912,16 @@ msgstr ""
 "Немагчыма далучыцца да паслужніка POP %s.\n"
 "Памылка адпраўкі пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Немагчыма далучыцца да паслужніка POP %s.\n"
+"Памылка адпраўкі пароля: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Няма гэткае тэчкі \"%s\""
@@ -11665,99 +12138,99 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-паслужнік %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Дастаўка пошты SMTP праз %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Немагчыма даслаць паведамленьне: ня пазначаны атрымоўцы."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Немагчыма даслаць паведамленьне: памылковая адрэса адпраўляльніка."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Адпраўка паведамленьня"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Немагчыма даслаць паведамленьне: ня пазначаны атрымоўцы."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Неатрымліваецца даслаць паведамленьне: пазначаны адзін ці некалькі "
 "некарэктных атрымоўцаў"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Вітаньне SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Аўтарызацыя SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Памылка стварэньня аб'екта аўтарызацыі SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Адмоўны адказ ідэнтыфікацыі ад паслужніка.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на MAIL FROM: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на RCPT TO: %s: пошта не даслана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ня атрымалася"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Перавышаны час чаканьня адказу на DATA: %s: пошта не даслана"
@@ -11765,28 +12238,28 @@ msgstr "Перавышаны час чаканьня адказу на DATA: %s:
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Збой каманды IMAP: %s"
@@ -11850,103 +12323,6 @@ msgstr "Тып MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Прапаноўваць аўтаматычнае адлюстраваньне укладаньня"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Немагчыма адкрыць паведамленьне"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Паведамленьне бяз назвы)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Адкрыцьцё файла"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Створана аўтаматычна"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Подпіс:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Стварыць паведамленьне"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Немагчыма стварыць акно рэдактара.\n"
-"Немагчыма актывізаваць кіраваньне выбарам адрэсы."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Немагчыма стварыць акно рэдактара.\n"
-"Немагчыма актывізаваць кампанэнт рэдактара HTML.\n"
-"Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
-"gtkhtml і libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Неатрымалася стварыць акно рэдактара:\n"
-"Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Рэдактар утрымлівае цэла паведамленьня ў фармаце (не тэксьце), які "
-"нельга рэдагаваць.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Мейсца прызначэньня"
@@ -12029,17 +12405,94 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Немагчыма адкрыць паведамленьне"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Паведамленьне бяз назвы)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Адкрыцьцё файла"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Створана аўтаматычна"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Подпіс:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Стварыць паведамленьне"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Перадасланае паведамленьне - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Укласьці арыгінальнае паведамленьне"
+msgstr[1] "Укласьці арыгінальнае паведамленьне"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Рэдактар утрымлівае цэла паведамленьня ў фармаце (не тэксьце), які "
+"нельга рэдагаваць.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Укласьці файл у паведамленьне"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12057,54 +12510,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Неатрымалася стварыць канал: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Наступнае нечытанае паведамленьне"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Жадаеце захаваць зьмены?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Не імпартаваць"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Выдаліць"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Памылка захаваньня лычак."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Увага: Зьмененае паведамленьне"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12112,60 +12579,77 @@ msgid ""
 msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Адкінуць зьмены"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Захаваць паведамлеьне як..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Неатрымалася стварыць канал: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вы мусіце наладзіць уліковы запіс\n"
 "да таго як стварыць паведамленьне."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Неатрымалася стварыць канал: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Немагчыма стварыць акно рэдактара.\n"
+"Немагчыма актывізаваць кіраваньне выбарам адрэсы."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Немагчыма стварыць акно рэдактара.\n"
+"Немагчыма актывізаваць кампанэнт рэдактара HTML.\n"
+"Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
+"gtkhtml і libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12463,11 +12947,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Выбраць час для параўнаньня"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Правілы філтра"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12496,19 +12975,8 @@ msgstr "Вы мусіце пазначыць назву файла."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Выдаленьне тэчкі %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Вы мусіце пазначыць тэчку."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12516,161 +12984,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Прызначэньне"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Вы мусіце назваць фільтар."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Небыў выбраны паслужнік"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Выбар файла"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Умоўлена:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Выбраць тэчку"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Правілы філтра"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Крыніцы віртуальных тэчак"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Параўнаць з"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Атрыманыя"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Дата паведамленьня будзе параўнана з\n"
-"12 гадзінамі пазначанай даты."
-
-#: filter/filter.glade.h:8
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Дата паведамленьня будзе параўнана з\n"
-"12 гадзінамі пазначанай даты."
-
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Дата паведамленьня будзе параўнана з\n"
-"12 гадзінамі пазначанай даты."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "час адносна бягучага"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "раней"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "месяцы"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "сэкундаў"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "толькі пазначаныя тэчкі"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "бягучы час"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "пазначаны вамі час"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "з усімі актыўнымі адаленымі тэчкамі"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "з усімі лакальнымі й актыўнымі аддаленымі течкамі"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "з усімі лакальнымі тэчкамі"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "гады"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важнае"
 
@@ -12740,6 +13084,73 @@ msgstr "атрыманае"
 msgid "outgoing"
 msgstr "дасланае"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правілы філтра"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Параўнаць з"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Атрыманыя"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дата паведамленьня будзе параўнана з\n"
+"12 гадзінамі пазначанай даты."
+
+#: filter/filter.glade.h:6
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дата паведамленьня будзе параўнана з\n"
+"12 гадзінамі пазначанай даты."
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дата паведамленьня будзе параўнана з\n"
+"12 гадзінамі пазначанай даты."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "час адносна бягучага"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "раней"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "месяцы"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "сэкундаў"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "бягучы час"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "пазначаны вамі час"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "гады"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Дадаць правіла"
@@ -12752,60 +13163,73 @@ msgstr "Рэдагаваць правіла"
 msgid "Rule name"
 msgstr "Назва правіла"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Правіла падліку"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Лік"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Перавагі рэдактара паведамленьняў"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Цэла ўтрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
+"паведамленьняў"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Цела ня ўтрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Цела ці тэма ўтрымліваюць"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Паведамленьне ўтрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Пошта \"Эвалюцыі\""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "\"Атрымоўцы\" утрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Адпраўляльнік утрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Кампанэнт пошты \"Эвалюцыі\""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Тэма ўтрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Тема ня ўтрымлівае"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Віртуальныя тэчкі"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Дадаць"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Пошта"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "Перавагі пошты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Пошта:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12838,51 +13262,313 @@ msgstr "_Дадаць подпіс"
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Правілы філтра"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Выбраць тэчку"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Падправіць лік"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Зьвязаць колер"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Прызначыць лік"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Укладаньні"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Сыгнал"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "утрымлівае"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Капіяваць у тэчку"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Дата атрыманьня"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Дата адпраўленьня"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Выдаленае"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ня ўтрымлівае"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "не сканчаецца на"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ня існуе"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "не вяртае"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "не гучыць як"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "не пачынаецца на"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Неіснуе"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Чарнавік"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "сканчаецца на"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Існуе"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "існуе"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Выраз"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Падняцца вышэй"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "гэта"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "пасьля"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "перад"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "пазначана"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "больш за"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "менш за"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "ня гэта"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "не пазначана"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Чэрвень"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Адмеціна"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Сьпіс рассылкі"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Цела паведамленьня"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Загаловак паведамленьня"
+
+#: mail/em-filter-i18n.h:41
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
+msgid "Message is Junk"
+msgstr "Паведамленьні"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Пазначыць як важнае"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Перамясьціць у тэчку"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Выйсьці з праграмы"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Граць гук"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Чытаньне"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Атрымоўцы"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Супадзеньне стал.выраза"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Адказана на"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "вяртае"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "вяртае больш за"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "вяртае менш за"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Запусьціць праграму:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Лік"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Адпраўляльнік"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Усталяваць стан"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Памер (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "гукі як"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Крыніца рахунка"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Спэцыфічны загаловак"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "пачынаецца з"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Спыніць апрацоўку"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тэма"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Адмяніць папярэдні стан"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Умоўлена:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Стварыць _віртуальную тэчку вынікаў пошуку..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Уласьцівасьці шрыфта"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Уласьцівасьці"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "Назва _тэчкі:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Даведачнае паведамленьне"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Даведачнае паведамленьне"
+msgstr[1] "Даведачнае паведамленьне"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Наступнае нечытанае паведамленьне"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Наступнае нечытанае паведамленьне"
+msgstr[1] "Наступнае нечытанае паведамленьне"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12892,414 +13578,435 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Create New Folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Пазначце дзе стварыць тэчку:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Назва тэчкі:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Віртуальныя тэчкі"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Перамясьціць"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Адмяніць заданьне"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Капіяваць"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Выгляд"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Адкрыць у новым акне"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Капіяваць..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "Пера_мясьціць..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Новая тэчка..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Зьмяніць _назву"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Уласьцівасьці..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Зьмяніць назву..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Віртуальныя тэчкі"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Атрыманае"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Пошта"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Уласьцівасьці"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Друк"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Перадаслаць"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Падняцца вышэй..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Выкананы сьцяг"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Ачысьціць сьцяг"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Пазначыць як чытанае"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Пазначыць як неважнае"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Вярнуць"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Адмеціна"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Ужыць фільтары"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правілы філтра"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Віртуальная тэчка па тэме"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Віртуальная тэчка па атрымоўцы"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Віртуальная тэчка па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Фільтар па тэме"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Фільтар па атрымоўцы"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Дапомна"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скапіяваць спасылку"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клікніце каб дадаць заданьне"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Ад каго"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Супадзеньні:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Адказаць на"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Прызначана"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Каму"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+"тоеснасьць."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Копія"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Сх.копія"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
+"тоеснасьць."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Тэма"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Рэдагаваць подпіс"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s укладаньне"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+msgid "Unencrypted"
+msgstr "Перарвана"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Тэма не падтрымліваецца"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Немагчыма праверыць подпіс"
+msgid "Encrypted"
+msgstr "Кадаваньне PGP"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Немагчыма праверыць подпіс"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Атрыманьне паведамленьня %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Прызначана"
+msgid "_View Certificate"
+msgstr "_Ід сэртыфіката:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Рэдагаваць подпіс"
+msgid "This certificate is not viewable"
+msgstr "Сэртыфікат яшчэ не зацьверджаны"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Рэдагаваць подпіс"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Пратэрмінавана:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Перарвана"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Убудаваны прагляд"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Кадаваньне PGP"
+msgid "_Hide"
+msgstr "Схаваць"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Аркуш %d з %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Атрыманьне паведамленьня %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13336,9 +14043,35 @@ msgstr "Указальнік на невядомыя вонкавыя даньн
 msgid "Formatting message"
 msgstr "Перамяшчэньне паведамленьняў"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Ад каго"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Адказаць на"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Каму"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Копія"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Сх.копія"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Паштавік"
 
@@ -13352,110 +14085,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Супадзеньні:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
-"тоеснасьць."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
-"тоеснасьць."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Ід сэртыфіката:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s укладаньне"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Сэртыфікат яшчэ не зацьверджаны"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "да %B %d, %Y, %l:%M %P"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Пратэрмінавана:"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "да %B %d, %Y, %l:%M %P"
+msgid "Unsupported signature format"
+msgstr "Тэма не падтрымліваецца"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Убудаваны прагляд"
+msgid "Error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Схаваць"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Аркуш %d з %d"
+msgid "Unknown error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13574,7 +14244,7 @@ msgstr "Даслаць паве_дамленьне ў сьпіс..."
 msgid "_Add to Addressbook"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
@@ -13589,7 +14259,7 @@ msgstr "Паслужнік не падтрымлівае звесткі схем
 msgid "Subscribed"
 msgstr "Падпісацца"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Тэчка"
 
@@ -13626,11 +14296,24 @@ msgid "Add address"
 msgstr "Адрэса"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Ліст ад %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Віртуальныя тэчкі"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Дадаць"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Крыніца віртуальнае тэчкі"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14126,66 +14809,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Імпарт"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Перавагі рэдактара паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
-"паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Пошта \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Кампанэнт пошты \"Эвалюцыі\""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Імпарт у \"Эвалюцыю\" з Elm"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Уліковыя запісы пошты"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Імпарт у \"Эвалюцыю\" з mbox"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Перавагі пошты"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Пошта:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14247,34 +14897,6 @@ msgstr "Імпартаваньне"
 msgid "Importing mailbox"
 msgstr "Імпартаваньне файлаў"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Імпарт у \"Эвалюцыю\" з Elm"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Імпарт у \"Эвалюцыю\" з mbox"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14422,80 +15044,86 @@ msgstr "%s сьпіс рассылкі"
 msgid "Add Filter Rule"
 msgstr "Дадаць правіла фільтра"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d выбраныя"
+msgid_plural "%d deleted"
+msgstr[0] "%d выбраныя"
+msgstr[1] "%d выбраныя"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d недасланыя"
+msgid_plural "%d junk"
+msgstr[0] "%d недасланыя"
+msgstr[1] "%d недасланыя"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Чарнавікі"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Чарнавікі"
+msgstr[1] "Чарнавікі"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d дасланыя"
+msgid_plural "%d sent"
+msgstr[0] "%d дасланыя"
+msgstr[1] "%d дасланыя"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d недасланыя"
+msgid_plural "%d unsent"
+msgstr[0] "%d недасланыя"
+msgstr[1] "%d недасланыя"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d агулам"
+msgid_plural "%d total"
+msgstr[0] "%d агулам"
+msgstr[1] "%d агулам"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d недасланыя"
+msgid_plural ", %d unread"
+msgstr[0] "%d недасланыя"
+msgstr[1] "%d недасланыя"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Фільтары пошты"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Праверка паслугі"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Далучэньне да паслужніка..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "сапраўдны"
@@ -14550,16 +15178,24 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Праверка паслугі"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Далучэньне да паслужніка..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Перадпрагляд"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14836,7 +15472,7 @@ msgstr "Не цытавацьь зыходнае паведамленьне"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не падпісываць запыты на нараду (для сумяшчальнасьці з Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Зроблена"
 
@@ -15200,6 +15836,117 @@ msgstr "колер"
 msgid "description"
 msgstr "апісаньне"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Крыніцы віртуальных тэчак"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Прынята"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "За_вершана"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Улічваць рэгістар"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Пошук у паведамленьні"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Пошук:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Пазначыць як \"Да выкананьня\""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Тэчка з падпіскамі"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Не вылучана"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "Паслужнік:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Зьвесткі аб уліковым запісе"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Уліковыя запісы пошты"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Умоўлена да:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Сьцяг:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Падпісацца"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Адмовіцца ад падпіскі"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "толькі пазначаныя тэчкі"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "з усімі актыўнымі адаленымі тэчкамі"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "з усімі лакальнымі й актыўнымі аддаленымі течкамі"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "з усімі лакальнымі тэчкамі"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15408,14 +16155,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15520,8 +16259,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Немагчыма перамясьціць тэчку: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15571,8 +16311,9 @@ msgstr "Не атрымалася адкрыць падзеленую тэчку
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "і адна іншая картка."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15601,8 +16342,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Не выдаляць"
+msgstr "Вярнуць з выдаленага"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15666,8 +16408,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Немагчыма выдаліць тэчку:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15709,13 +16454,44 @@ msgstr ""
 "    \"%s\"\n"
 "І быдзе абноўлена."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Выдаленьне тэчкі %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Вы мусіце пазначыць тэчку."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Небыў выбраны паслужнік"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15723,16 +16499,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перапісаць"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Асьпэн"
@@ -15892,7 +16668,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15901,46 +16677,21 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Улічваць рэгістар"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Пошук у паведамленьні"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Пошук:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Зьвесткі аб уліковым запісе"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Адмена..."
@@ -15976,24 +16727,24 @@ msgstr "Абнаўленьне..."
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
@@ -16050,15 +16801,15 @@ msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
@@ -16122,7 +16873,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
@@ -16178,10 +16929,6 @@ msgstr "Перадаслаць"
 msgid "No Response Necessary"
 msgstr "Можна не адказваць"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Чытаньне"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Адказаць"
@@ -16194,48 +16941,51 @@ msgstr "Адказаць усім"
 msgid "Review"
 msgstr "Праверыць"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Пазначыць як \"Да выкананьня\""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Цэла ўтрымлівае"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "За_вершана"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Цела ня ўтрымлівае"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Цела ці тэма ўтрымліваюць"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Умоўлена да:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Паведамленьне ўтрымлівае"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Сьцяг:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "\"Атрымоўцы\" утрымлівае"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Тэчка з падпіскамі"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Адпраўляльнік утрымлівае"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Не вылучана"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Тэма ўтрымлівае"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "Паслужнік:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Тема ня ўтрымлівае"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Падпісацца"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Абалонка \"Эвалюцыі\""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Адмовіцца ад падпіскі"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "\"Эвалюцыя\""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16304,31 +17054,20 @@ msgstr ""
 msgid "mail"
 msgstr "Э. пошта"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Невядомая памылка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Недапушчальныя аргумэнты"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Неатрымалася зарэгістраваць на OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Актыўныя далучэньні"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Адсутніча канфігурацыя базы даньняў"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Актыўныя далучэньні"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Звычайная памылка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Націсьніце \"Так\" каб закрыць гэтыя далучэньні й працаваць у адлучаным "
+"рэжыме"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16511,30 +17250,6 @@ msgstr "Назва тэчкі ня мусіць ўтрымліваць сымб�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' і '..' зарэзэрваваныя назвы тэчак."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у адлучаным рэжыме."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у далучаным рэжыме."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Даслаць на %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Сродкі GNOME для сувязі з \"Пілётам\" не ўсталяваныя на гэтае сыстэме."
@@ -16552,115 +17267,94 @@ msgstr "\"Bug buddy\" не ўсталяваны."
 msgid "Bug buddy could not be run."
 msgstr "\"Bug buddy\" не запушчаны."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Група"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Далучаны рэжым"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Адлучаны рэжым"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Пазначальнік"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Стварыць"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Новае заданьне"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Тэст"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у адлучаным рэжыме."
 
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Стварыць новае заданьне"
+msgid "Evolution is in the process of going offline."
+msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Актыўныя далучэньні"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Актыўныя далучэньні"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Націсьніце \"Так\" каб закрыць гэтыя далучэньні й працаваць у адлучаным "
-"рэжыме"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "Ка_ляндар:"
+"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у далучаным рэжыме."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Кантакты: "
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Даслаць на %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Пошта:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Заданьні:"
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Невядомая памылка"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Т_ып тэчкі:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Недапушчальныя аргумэнты"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Адкрыць іншую тэчку карыстальніка"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Неатрымалася зарэгістраваць на OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Уліковы запіс:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Адсутніча канфігурацыя базы даньняў"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Назва _тэчкі:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Звычайная памылка"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Імя карыстальніка:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Стварыць"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Дапаможнік усталёўкі \"Эвалюцыі\""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Імпартаваньне файлаў"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Часавая зона "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Вітаем"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16674,7 +17368,7 @@ msgstr ""
 "\n"
 "Калі ласка, клікніце кнопку \"Наперад\" каб працягнуць. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16686,19 +17380,20 @@ msgstr ""
 "\n"
 "Клікніце кнопку \"Ужыць\" каб захаваць вашыя усталёўкі. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Абалонка \"Эвалюцыі\""
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Новае заданьне"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "\"Эвалюцыя\""
+msgid "_Test"
+msgstr "Тэст"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
+msgid "Create a new test item"
+msgstr "Стварыць новае заданьне"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16764,7 +17459,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "\"Эвалюцыя\" можа імпартаваць даньні з наступных файлаў:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16784,7 +17479,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16793,39 +17488,39 @@ msgstr ""
 "Дзякуй\n"
 "Каманда распрацоўшчыкаў \"Эвалюцыі Ximian\"\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Не пытацца ў наступны раз."
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Запуск у адлучаным рэжыме"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Запуск у далучаным рэжыме"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Прымусова выключыць усе кампанэнты \"Эвалюцыі\""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Даслаць вывад адладкі усіх кампанэнтаў у файле."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "\"Эвалюцыя\""
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16900,6 +17595,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17165,6 +17882,12 @@ msgstr "_Ід сэртыфіката:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Ід карткі ужо існуе"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17394,12 +18117,6 @@ msgstr "Тэма %s"
 msgid "Certificate Signature Value"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Ід карткі ужо існуе"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17543,8 +18260,8 @@ msgstr "Прагледзіць бягучы кантакт"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Дзеяньні"
@@ -18031,16 +18748,6 @@ msgstr "_Інвертаваць вылучэньне"
 msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Закрыць гэтае акно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Закрыць"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18457,6 +19164,16 @@ msgstr "Інструмэнты"
 msgid "_Undelete"
 msgstr "Вярнуць з выдаленага"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрыць гэтае акно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Закрыць"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Укласьці"
@@ -18539,10 +19256,6 @@ msgstr "Захаваць бягучы файл пад іншай назвай"
 msgid "Save the message in a specified folder"
 msgstr "Захаваць паведамленьне ў пазначанай тэчцы"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Даслаць"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19124,7 +19837,7 @@ msgid "Evolution Query"
 msgstr "Агульныя зьвесткі \"Эвалюцыі\""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19288,27 +20001,277 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Назва сьпіса:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "рэдактар сьпісу кантактаў"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Захаваць сьпіс як Візытоўку (VCard)"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Група"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Неатрымалася запусьціць wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Ка_ляндар:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Парамэтры нагадваньня гукам"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Парамэтры паведамленьняў нагадваньня"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Парамэтры нагадваньня праз пошту"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Парамэтры праграмы нагадваньня"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Парамэтры невядомага нагадваньня"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Паўтор нагадваньня"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Адлюстраваньне паведамленьняў"
+
+#~ msgid "Message to Send"
+#~ msgstr "Паведамленьне для адпраўкі"
+
+#~ msgid "Play sound:"
+#~ msgstr "Граць гук:"
+
+#~ msgid "Run program:"
+#~ msgstr "Запусьціць праграму:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "З гэткімі аргумэнтамі:"
+
+#~ msgid "Basics"
+#~ msgstr "Асноўнае"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Дата/Час:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Нагадваньне"
+
+#~ msgid "_Options..."
+#~ msgstr "_Парамэтры..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Кніга адрэсаў..."
+
+#~ msgid "Reminder"
+#~ msgstr "Нагадваньне"
+
+#~ msgid "B_usy"
+#~ msgstr "_Заняты"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Сакрэтнае"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Дата/Час:"
+
+#~ msgid "F_ree"
+#~ msgstr "_Вольны"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Прыватнае"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Пу_блічнае"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Удзельнік"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Выключэньні"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Прыклад:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правіла вяртаньня"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Вяртаньне вызначаецца карыстальнікам"
+
+#~ msgid "_Modify"
+#~ msgstr "_Зьмяненьне"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Бяз вяртаньня"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Простае вяртаньне"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% Завершана"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Выконваецца"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Сакрэтна"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_Тэчка:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Пачынаецца:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Сканчаецца:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b> Выканана</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Умоўлена:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Няма</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Адбылася памылка ў сыстэме CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Аб'ект адсутнічае\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Стан удзельніка ня можа быць абноўлены!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
+#~ msgid "_Options"
+#~ msgstr "_Парамэтры"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Час пачатку нарады:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Час заканчэньня нарады:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Памылка на %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Неатрымалася адшукаць сэртыфікат для \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Стварыць правіла з паведамленьня"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Неатрымалася стварыць акно рэдактара:\n"
+#~ "Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Правіла падліку"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Назва _тэчкі:"
+
+#~ msgid "_Rename"
+#~ msgstr "Зьмяніць _назву"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Уласьцівасьці..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Пазначальнік"
+
+#~ msgid "C_alendar:"
+#~ msgstr "Ка_ляндар:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Кантакты: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Пошта:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Заданьні:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Т_ып тэчкі:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Адкрыць іншую тэчку карыстальніка"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Назва _тэчкі:"
+
+#~ msgid "_User:"
+#~ msgstr "_Імя карыстальніка:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Збой далучэньня да паслужніка LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Збой аўтарызацыі на паслужніку LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Немагчыма выканаць запыт да карэннага DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Памылка атрыманьня зьвестак схемы"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  _Адлюстраваць базы, якія падтрымліваюцца"
 
@@ -19381,9 +20344,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Webcam:"
 #~ msgstr "Старонка"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Адсутнічае катэгорыя рэдактара."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19440,9 +20400,6 @@ msgstr "%s (%d%% завершана)"
 #~ "Падзея што будзе выдалена гэта сустрэча, ці паведаміць пра яе адмену "
 #~ "іншым?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Вы упэўненыя у тым, што жадаеце адмяніць і выдаліць гэтую сустрэчу?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19460,46 +20417,15 @@ msgstr "%s (%d%% завершана)"
 #~ "Запіс часопіса які будзе выдалены апублікаваны, ці жадаеце даслаць "
 #~ "паведамленьне пра адмену?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Вы упэўнены што жадаеце выдаліць гэтае заданьне бяз назвы?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса бяз назвы?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
-#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
-#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
-#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Запрасіць іншых..."
 
@@ -19531,10 +20457,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Немагчыма атрымаць групу: %s"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Памылка аўтазахаваньня паведамленьня: %s\n"
@@ -19558,179 +20480,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Невядомы адказ паслужніка: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Падправіць лік"
-
-#~ msgid "Assign Color"
-#~ msgstr "Зьвязаць колер"
-
-#~ msgid "Assign Score"
-#~ msgstr "Прызначыць лік"
-
-#~ msgid "Attachments"
-#~ msgstr "Укладаньні"
-
-#~ msgid "Beep"
-#~ msgstr "Сыгнал"
-
-#~ msgid "contains"
-#~ msgstr "утрымлівае"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Капіяваць у тэчку"
-
-#~ msgid "Date received"
-#~ msgstr "Дата атрыманьня"
-
-#~ msgid "Date sent"
-#~ msgstr "Дата адпраўленьня"
-
-#~ msgid "Deleted"
-#~ msgstr "Выдаленае"
-
-#~ msgid "does not contain"
-#~ msgstr "ня ўтрымлівае"
-
-#~ msgid "does not end with"
-#~ msgstr "не сканчаецца на"
-
-#~ msgid "does not exist"
-#~ msgstr "ня існуе"
-
-#~ msgid "does not return"
-#~ msgstr "не вяртае"
-
-#~ msgid "does not sound like"
-#~ msgstr "не гучыць як"
-
-#~ msgid "does not start with"
-#~ msgstr "не пачынаецца на"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Неіснуе"
-
-#~ msgid "Draft"
-#~ msgstr "Чарнавік"
-
-#~ msgid "ends with"
-#~ msgstr "сканчаецца на"
-
-#~ msgid "Exist"
-#~ msgstr "Існуе"
-
-#~ msgid "exists"
-#~ msgstr "існуе"
-
-#~ msgid "Expression"
-#~ msgstr "Выраз"
-
-#~ msgid "Follow Up"
-#~ msgstr "Падняцца вышэй"
-
-#~ msgid "is"
-#~ msgstr "гэта"
-
-#~ msgid "is after"
-#~ msgstr "пасьля"
-
-#~ msgid "is before"
-#~ msgstr "перад"
-
-#~ msgid "is Flagged"
-#~ msgstr "пазначана"
-
-#~ msgid "is greater than"
-#~ msgstr "больш за"
-
-#~ msgid "is less than"
-#~ msgstr "менш за"
-
-#~ msgid "is not"
-#~ msgstr "ня гэта"
-
-#~ msgid "is not Flagged"
-#~ msgstr "не пазначана"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Чэрвень"
-
-#~ msgid "Mailing list"
-#~ msgstr "Сьпіс рассылкі"
-
-#~ msgid "Message Body"
-#~ msgstr "Цела паведамленьня"
-
-#~ msgid "Message Header"
-#~ msgstr "Загаловак паведамленьня"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Паведамленьні"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Пазначыць як важнае"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Перамясьціць у тэчку"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Выйсьці з праграмы"
-
-#~ msgid "Play Sound"
-#~ msgstr "Граць гук"
-
-#~ msgid "Recipients"
-#~ msgstr "Атрымоўцы"
-
-#~ msgid "Regex Match"
-#~ msgstr "Супадзеньне стал.выраза"
-
-#~ msgid "Replied to"
-#~ msgstr "Адказана на"
-
-#~ msgid "returns"
-#~ msgstr "вяртае"
-
-#~ msgid "returns greater than"
-#~ msgstr "вяртае больш за"
-
-#~ msgid "returns less than"
-#~ msgstr "вяртае менш за"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Запусьціць праграму:"
-
-#~ msgid "Sender"
-#~ msgstr "Адпраўляльнік"
-
-#~ msgid "Set Status"
-#~ msgstr "Усталяваць стан"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Памер (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "гукі як"
-
-#~ msgid "Source Account"
-#~ msgstr "Крыніца рахунка"
-
-#~ msgid "Specific header"
-#~ msgstr "Спэцыфічны загаловак"
-
-#~ msgid "starts with"
-#~ msgstr "пачынаецца з"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Спыніць апрацоўку"
-
-#~ msgid "Unset Status"
-#~ msgstr "Адмяніць папярэдні стан"
-
 #~ msgid "Working"
 #~ msgstr "Праца"
 
@@ -19939,10 +20688,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Finished"
 #~ msgstr "Скончана"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Група"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20469,9 +21214,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "component"
 #~ msgstr "Сустрэча"
 
-#~ msgid "Alarms"
-#~ msgstr "Сыгналы"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Геаграфічнае разьмяшчэньне"
 
@@ -21012,10 +21754,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Немагчыма стварыць каталёг %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Выбар кантактаў з кнігі адрэсаў"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "_Дзень народзінаў:"
 
@@ -21084,22 +21822,10 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Інфармацыя календара"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Інфармацыя календара"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Клясыфікацыя"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Дата й час"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Апісаньне:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Пачынаецца:</b> "
 
@@ -21494,9 +22220,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Атрыманьне вынікаў пошуку з паслужніка LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Памылка заданага пошуку"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Сховішча знаходзіцца ў адлучаным стане"
@@ -21631,9 +22354,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Праграма лакальнай/LDAP кнігі адрэсаў \"Эвалюцыі\""
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Праграма лакальнага каляндара \"Эвалюцыі\""
-
 #, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Праграма лакальнай/LDAP кнігі адрэсаў \"Эвалюцыі\""
@@ -21734,9 +22454,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Use Score"
 #~ msgstr "Выкарыстоўвае лік"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Курсор ня быў загружаны\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Тэчка якая утрымлівае кантактную інфармацыю"
 
@@ -23086,9 +23803,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Emporia"
 #~ msgstr "Эмпорыя"
 
-#~ msgid "Enid"
-#~ msgstr "Энід"
-
 #~ msgid "Ephrata"
 #~ msgstr "Эфарата"
 
@@ -23972,10 +24686,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Мальта"
 
 #, fuzzy
-#~ msgid "Managua"
-#~ msgstr "Мэнаджар"
-
-#, fuzzy
 #~ msgid "Manassas"
 #~ msgstr "Арканзас"
 
@@ -25592,10 +26302,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Паўднёвая Афрыка"
 
 #, fuzzy
-#~ msgid "Southend"
-#~ msgstr "Даслаць"
-
-#, fuzzy
 #~ msgid "South Marsh Island"
 #~ msgstr "Маршалавы выспы"
 
@@ -27103,9 +27809,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "View the selected folder"
 #~ msgstr "Прагляд вылучанае тэчкі"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Капіяваць..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Панэля _тэчак"
 
@@ -27115,27 +27818,18 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Ісьці да _тэчкі..."
 
-#~ msgid "_Move..."
-#~ msgstr "Пера_мясьціць..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Новая тэчка"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Выдаліць іншыя тэчкі карыстальніка"
 
-#~ msgid "_Rename..."
-#~ msgstr "Зьмяніць назву..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панэля лычак"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Лычка..."
 
-#~ msgid "Information"
-#~ msgstr "Інфармацыя"
-
 #~ msgid "Error"
 #~ msgstr "Памылка"
 
@@ -27447,9 +28141,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "_Clear Flag"
 #~ msgstr "_Ачысьціць сьцяг"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Кантакты..."
-
 #~ msgid "_Delete Mapping"
 #~ msgstr "_Выдаліць мапаваньне"
 
diff --git a/po/bg.po b/po/bg.po
index 1149674cbb..5b6de9eb8e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-06 12:49+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -24,16 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Адресна книга на Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Контакти:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Прозорец на Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -59,35 +49,256 @@ msgstr "карти"
 msgid " card"
 msgstr "1 карта"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Прозорец на Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Курсорът не може да бъде зареден\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Неуспех в идентифицирането пред LDAP сървъра"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Сървърът отговори с неподдържани основи за търсене"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Този сървър не поддръжа LDAPv3 информация"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+"Грешна информация при трасиране:\n"
+"%s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Този сървър не поддръжа LDAPv3 информация"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Не мога да заредя %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Редактор на категории не е наличен"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Записва в адресната книга"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Грешка при зареждането на адресна книга"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Грешка при търсенето"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Искате ли да съхраните промените?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Не записва"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "е една друга карта."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Не мога да получа съобщение от редактора"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Грешка при добавяне на карта"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Адрес за Синхронизация по Подразбиране:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Не мога да заредя %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Неуспешно удостоверяване на идентичността\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Папки за автоматично завършване"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВъведете парола за·%s·(потребител·%s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Сертифициран ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Адресна книга на Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Компонент за Адресната книга на Evolution"
+
+#: 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 "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -120,7 +331,7 @@ msgstr "Нов Контакт"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Контакт"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -145,15 +356,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -162,22 +373,22 @@ msgid "Personal"
 msgstr "Личен"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Папки за автоматично завършване"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -185,58 +396,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Изтрива"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Свойства..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Неуспешно удостоверяване на идентичността\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВъведете парола за·%s·(потребител·%s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -256,61 +476,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Папки за автоматично завършване"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "_Сертифициран ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Адресна книга на Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Компонент за Адресната книга на Evolution"
-
-#: 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 "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -318,7 +483,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -327,8 +492,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -354,6 +518,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Удостоверение"
@@ -402,13 +567,11 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основни"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детайли"
 
@@ -629,34 +792,26 @@ msgid "cards"
 msgstr "карти"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минути"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "Премахва всички"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Премахва всички"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Преглед на Списъка с Контактите"
@@ -671,7 +826,7 @@ msgid "Send HTML Mail?"
 msgstr "Изпращане на HTML поща?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Добавя към контактите"
 
@@ -679,15 +834,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Избор на Контакт от Адресната книга"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -714,6 +877,11 @@ msgstr "К_атегория:"
 msgid "_Find"
 msgstr "Намира"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Търсене"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -759,9 +927,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Започва:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -788,7 +955,6 @@ msgid "Birthday:"
 msgstr "Дата на ра_ждане:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "К_алендар:"
@@ -804,15 +970,15 @@ msgid "Company:"
 msgstr "Компания"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Редактор за Контакти"
 
@@ -921,8 +1087,8 @@ msgstr ""
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -946,42 +1112,28 @@ msgid "_File under:"
 msgstr "Име на файл:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Време"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Сигурни ли сте, че искате\n"
-"да изтриете този контакт?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Адрес"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Редактируем"
 
@@ -1960,138 +2112,130 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Айдахо"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Група"
+msgid "Service"
+msgstr "Обслужването е готово"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Местоположение:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Преименува"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Домашен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Друг"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Айдахо"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Група"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Източник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Нов Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Полета за писане"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Променени"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Този контакт принадлежи на следните категории:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Моля, изберете от следните опции"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Грешно съдържание на съобщение"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Не записва"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Обслужването е готово"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Местоположение:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Преименува"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Бързо добавяне на контакт"
@@ -2109,6 +2253,20 @@ msgstr "Пълно _Име:"
 msgid "E-_mail:"
 msgstr "_Ел. Поща:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Сигурни ли сте, че искате\n"
+"да изтриете този контакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2235,48 +2393,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Избор на Контакт от Адресната книга"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Членове"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Изтрива избраните обекти от списъка на прикачени"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Избрани"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Скрива адресите когато изпраща поща до този списък"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Фамилия:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Редактор за Контакти"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Книга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Е Нов Списък"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Членове"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Съхрани Списък като VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Променен Контакт:"
@@ -2315,435 +2494,11 @@ msgstr ""
 "в тази папка. Искате ли да я добавите въпреки това?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Допълнително търсене"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-#, fuzzy
-msgid "map"
-msgstr "Амапала"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "Членове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-поща"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Бостън"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Група"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#, fuzzy
-msgid "Fax"
-msgstr "Сл. Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Работа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-#, fuzzy
-msgid "Blog"
-msgstr "Болоня"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мобилен Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Личен"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Бележка"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "_Титла:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Електронна поща"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "Домашен Факс"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Успех"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Книгата с адреси не съществува"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Нов списък с контакти"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Отказан достъп"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "Картата не е намерена"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Карта ID вече съществува"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Протокола на се подържа"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Прекратено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не мога да създам програмен канал: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Идентификацията неуспешна"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Изисква идентификация"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Няма такова съобщение"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Друга грешка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Не мога да отворя тази адресна книга. Проверете\n"
-"дали пътя съществува и дали имате права за достъп."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"В тази версия на Еволюшън не е компилирана поддръжка на\n"
-"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
-"програмата от CVS след като сте изтеглили и инсталирали \n"
-"OpenLDAP от хипервръзката отдолу.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Не мога да отворя тази адресна книга. Проверете\n"
-"дали пътя съществува и дали имате права за достъп."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Заявката не завърши успешно."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Грешка при добавяне на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Грешка при добавяне на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Грешка при модифициране на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Грешка при модифициране на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Грешка при изтриване на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Грешка при изтриване на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s вече съществува\n"
-"Искате ли да го презапишете?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Презаписва"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Премества карта в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Копира карта в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Премества карти в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Копира карти в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Избор на Контакт от Адресната книга"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Множество VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard за %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(няма)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Основна ел. поща"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Ел. Поща 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Ел. Поща 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Избор на действие"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Създава нов контакт \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Добавя адрес към вече съществуващия контакт \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Търсене в адресната книга..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Редактира инфирмацията за контакти"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Слива адреса на ел. поща"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "е една друга карта."
-msgstr[1] "е една друга карта."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Показва Пълните Заглавия"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Съхранява Контакт като VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Записва в адресната книга"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2758,9 +2513,9 @@ msgstr[1] "Намира контакт в"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Заявка"
 
@@ -2776,134 +2531,134 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при модифициране на карта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Име започващо с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Електронна поща започваща с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорията е"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Кое да е поле съдържа"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Напреднали..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Съхранява като VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Нов Контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Нов Списък с Контакти..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Отива в Папка..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Вмъква..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Търсене за Контакти..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Източници за Адресни книги..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Препраща Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Изпраща съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Разпечатва"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Печат на Плик"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Адресна книга..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Адресна книга..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Изрязва"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копира"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Текущ изглед"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Всяка категория"
@@ -2937,6 +2692,8 @@ msgid "Car Phone"
 msgstr "Телефон в автомобил"
 
 #: 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:3
 msgid "Categories"
 msgstr "Категории"
 
@@ -2944,6 +2701,21 @@ msgstr "Категории"
 msgid "Company Phone"
 msgstr "Работен телефон"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Електронна поща"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Ел. Поща 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Ел. Поща 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Фамилия"
@@ -2983,14 +2755,29 @@ msgstr "Йордания"
 msgid "Manager"
 msgstr "Мениджър"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мобилен Телефон"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Прякор"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Бележка"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Организация"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Друг Факс"
@@ -3044,29 +2831,21 @@ msgstr "Неименувано"
 msgid "Web Site"
 msgstr "Интернет страница"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Височина"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Има Фокус"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Избрани"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Има Курсор"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поле"
@@ -3083,7 +2862,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3092,21 +2875,412 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Избрани"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Има Курсор"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+#, fuzzy
+msgid "map"
+msgstr "Амапала"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Членове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-поща"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Бостън"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#, fuzzy
+msgid "Fax"
+msgstr "Сл. Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Работа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+#, fuzzy
+msgid "Blog"
+msgstr "Болоня"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Личен"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "_Титла:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Домашен Факс"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Успех"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Книгата с адреси не съществува"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Нов списък с контакти"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Отказан достъп"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "Картата не е намерена"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Карта ID вече съществува"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Протокола на се подържа"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Прекратено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не мога да създам програмен канал: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Идентификацията неуспешна"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Изисква идентификация"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Няма такова съобщение"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Друга грешка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Не мога да отворя тази адресна книга. Проверете\n"
+"дали пътя съществува и дали имате права за достъп."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"В тази версия на Еволюшън не е компилирана поддръжка на\n"
+"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
+"програмата от CVS след като сте изтеглили и инсталирали \n"
+"OpenLDAP от хипервръзката отдолу.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Не мога да отворя тази адресна книга. Проверете\n"
+"дали пътя съществува и дали имате права за достъп."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
 msgstr ""
 
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Заявката не завърши успешно."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Грешка при добавяне на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Грешка при добавяне на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Грешка при модифициране на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Грешка при модифициране на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Грешка при изтриване на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Грешка при изтриване на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s вече съществува\n"
+"Искате ли да го презапишете?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Презаписва"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Премества карта в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Копира карта в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Премества карти в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Копира карти в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Избор на Контакт от Адресната книга"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Множество VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard за %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(няма)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Основна ел. поща"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Избор на действие"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Създава нов контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Добавя адрес към вече съществуващия контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Търсене в адресната книга..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Редактира инфирмацията за контакти"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Слива адреса на ел. поща"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "е една друга карта."
+msgstr[1] "е една друга карта."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Показва Пълните Заглавия"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Съхранява Контакт като VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Записва в адресната книга"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Преглед на Карта"
@@ -3150,6 +3324,11 @@ msgstr "Интерфейс за вмъкване на VCard"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard·(.vcf,·.gcrd) - Визитна карта"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Отпечатай плик"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3161,11 +3340,6 @@ msgstr "Отпечатва избраните контакти"
 msgid "Print contact"
 msgstr "Отпечатва избраните контакти"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Отпечатай плик"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3352,6 +3526,23 @@ msgstr "Списък с _Контакти"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Не мога да отворя съобщение"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Адресната книга не може да бъде отворена"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Адресната книга не може да бъде отворена"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3409,23 +3600,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Вътрешна грешка"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Не мога да отворя съобщение"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Адресната книга не може да бъде отворена"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Адресната книга не може да бъде отворена"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Грешка при зареждането на адресна книга"
@@ -3442,40 +3616,366 @@ msgstr "Няма име на файл"
 msgid "Unnamed List"
 msgstr "Неименуван Списък"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не изтривай"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Изпрати по-късно"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази среща?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Сигурни ли сте, че искате да прекъснете и изтриете този запис в дневника?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Среща"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Искате ли да съхраните промените?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Вие имате промени. Да ги забравя ли и да обновя редактора?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Незаписва Промени"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Съобщение на Сървър:"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Изпраща"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Въведедете парола"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Wombat сървървърът не може да бъде стартиран"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Wombat не може да бъде стартиран"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не мога да прочета календара от pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не мога да прочета списъкът със задачи от pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Стартиращ:"
@@ -3564,10 +4064,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Не мога да инициализирам Bonobo"
@@ -3716,9 +4212,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показвай номерата на седмиците в навигацията за _ден"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Съдържания на Обобщен"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Съдържание на Коментар"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Несъвпадащ"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3737,8 +4254,8 @@ msgid "Purge events older than"
 msgstr "връща по-малко от"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "дни"
 
@@ -3749,7 +4266,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3799,66 +4316,54 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова _Среща"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "К_алендар:"
+msgid "Cale_ndar"
+msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Създава нова папка"
@@ -3889,27 +4394,6 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Съдържания на Обобщен"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Съдържания на описание"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Съдържание на Коментар"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Съдържания на описание"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Несъвпадащ"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3927,223 +4411,132 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Опции на Звукова Аларма"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Опции за Получатели на Съобщението"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Опции на програма аларма"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Неизвестни опции на аларма"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Повторение на Аларма"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Издава звук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Повтаря алармата"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Стартирай програма:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Започва:</b>·"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "С тези аргументи:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Времева Зона: "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Основен"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "допълнително време всеки"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Аларми"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "часове"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Напиши Съобщение"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Д_обавя"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Базов"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Дата/Време:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Съобщения"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Издава зук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Напомняне"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Стартирай програма"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Изпрати ел. писмо"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Обобщено:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Акаунт:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Опций..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Стартирай програма:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Повтаря алармата"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Изпраща"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "след"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "преди"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "ден(дни)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "край на среща"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "допълнително време всеки"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "час(ове)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "часове"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "минут(а/и)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "начало на среща"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Трябва да определите име на файла."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Метода заявен за зареждане на `%s' не се подържа"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "_Добавя Група..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Колорадо"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Избери цвят"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Добавя Група..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Презарежда"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr ""
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Д_обавя"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "седмици"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Аларми"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4261,7 +4654,7 @@ msgid "Free/Busy Publishing"
 msgstr "Заявка Свободен/Зает"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Петък"
@@ -4275,7 +4668,7 @@ msgid "Minutes"
 msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понеделник"
@@ -4285,7 +4678,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Събота"
@@ -4299,7 +4692,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показвай номерата на седмиците в навигацията за _ден"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Неделя"
@@ -4313,7 +4706,7 @@ msgid "T_hu"
 msgstr "_Чет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвъртък"
@@ -4327,7 +4720,7 @@ msgid "Time format:"
 msgstr "Формат на време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вторник"
@@ -4337,7 +4730,7 @@ msgid "W_eek starts:"
 msgstr "Седмицата започва:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Сряда"
@@ -4371,7 +4764,8 @@ msgstr "Сбива почивните дни в месечен пре_глед"
 msgid "_Day begins:"
 msgstr "_Денят започва:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4421,6 +4815,80 @@ msgstr "_Ср"
 msgid "before every appointment"
 msgstr "преди всяка среща"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Трябва да определите име на файла."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Метода заявен за зареждане на `%s' не се подържа"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "_Добавя Група..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Колорадо"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Избери цвят"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Добавя Група..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Презарежда"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "седмици"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Това събитие е било изтрито."
@@ -4465,80 +4933,74 @@ msgstr "%s  Вие имате промени. Да ги забравя ли и �
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Грешка при валидиране: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " в"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Дължим"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Дължим"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Обектът не може да бъде осъвременен"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Редактиране на Среща"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в журнал - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Запазва като..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Не мога да получа текущата версия!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Грешка при валидиране: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " в"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Дължим"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Дължим"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4604,8 +5066,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Обекта не може да бъде изпратен!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Адресна книга..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Контакти..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4615,160 +5078,221 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въвежда Делегат"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Напомня"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Информация"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Началната дата е грешна"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Крайната дата е грешна"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Началния час е грешен"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Крайния час е грешен"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Адресната книга не може да бъде отворена"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "преди всяка среща"
+msgstr[1] "преди всяка среща"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "край на среща"
+msgstr[1] "край на среща"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "преди всяка среща"
+msgstr[1] "преди всяка среща"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "С_ъбитие за цял ден"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "преди всяка среща"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Зает"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "преди всяка среща"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ка_тегории..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "преди всяка среща"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Начало на задача: <b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Класификация"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Завършени:</b>·"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Т_аен"
+msgid "A_ll day event"
+msgstr "С_ъбитие за цял ден"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Дата и Час"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Ка_тегории..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Свободен"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ка_тегории..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "К_алендар:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Класификация"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Конфиденциален"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "L_ocation:"
 msgstr "_Местонахождение: "
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
 msgstr "Частен"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
 msgstr "Публичен"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
 msgstr "Показва Времето Като"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Резюме:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Аларми"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Описание:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Край:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Начало:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Без"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Изтрива"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Премахва"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4807,35 +5331,45 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Статус"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Започва:</b>·"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Добавя подателя в Адресната книга"
+msgid "<b>Organizer</b>"
+msgstr "<b>Започва:</b>·"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Смяна на организатор"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "К_онтакти..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Смяна на организатор"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Организатор:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -4909,148 +5443,143 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Тази среща съдържа повторения които Evolution не може да редактира."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "първи"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "секунда"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "трети"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "четвърти"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "последен"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Друга Дата"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "ден"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "събития"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата/Време:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Всеки"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Изключения"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Преглед"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Правило на Повторение"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Наст_ройка на повторение"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Модифицир_а"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Няма повторение"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Повторение"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Премахва"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Всеки"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Пр_осто повторение"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Редактирай среща"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "за"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "завинаги"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "месец(и)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "докато"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "седмиц(а/и)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "годин(а/и)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Избор на действие"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Дестин"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Датата на приключване е грешна"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Изпрати и Чернова Съобщение"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% Приключено"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Изпрати и Чернова Съобщение"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Приключено"
 
@@ -5062,8 +5591,8 @@ msgstr "Високо"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "В Прогрес"
@@ -5075,22 +5604,22 @@ msgid "Low"
 msgstr "Ниско"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не е Стартиран"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Прогрес"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Приключено в проценти: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5115,37 +5644,42 @@ msgstr "_Статус:"
 msgid "_Web Page:"
 msgstr "_Интернет страница:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Задача"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Адресната книга не може да бъде отворена"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Конфиденциален"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Изпрати и Чернова Съобщение"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Изпрати и Чернова Съобщение"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Описание:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Пап_ка:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5156,60 +5690,58 @@ msgstr "На_чална Дата:"
 msgid "_Due date:"
 msgstr "_Крайна Дата"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Грешна оторизация отговори сървъра."
+msgid "_Group:"
+msgstr "Група"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Край на информация Свободен/Зает: <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Ден"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Информация Свободен/Зает"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Информация Свободен/Зает"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Фамилия:"
+msgid "_Daily"
+msgstr "Ден"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Парола"
+msgid "_Manual"
+msgstr "Манагуа"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Парола"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Запомни тази парола"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Преименува"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Седмица"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5291,7 +5823,7 @@ msgstr "%s в %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Натиснете за да добавите задача"
@@ -5300,6 +5832,11 @@ msgstr "Натиснете за да добавите задача"
 msgid "Untitled"
 msgstr "Неименувано"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Обобщено:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5313,7 +5850,7 @@ msgstr "_Крайна Дата"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Състояние:"
 
@@ -5327,20 +5864,93 @@ msgstr "_Приоритет:"
 msgid "Web Page:"
 msgstr "Страница"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Публичен"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Крайна Дата"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Частен"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Начална Дата"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Конфиденциален"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Резюме"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Свободно"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Заето"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ю"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "И"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географското местонахождение трябва да бъде въведено в следния формат: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Не"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Повтарям"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Назначен"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5386,96 +5996,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Свободно"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заето"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Изтрива избраните обекти"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Обновява обектите"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отваря"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Отваря _Съобщение"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Запазва като..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Разпечатва..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Отрязва"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Копира"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Поставя"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_ Задава задача"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Маркира като Приключено"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Маркира Избраните Задачи като Приключени"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Изтрива"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Изтрива Избраните Задачи"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Запазва като..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Натиснете за да добавите задача"
 
@@ -5484,181 +6100,112 @@ msgstr "Натиснете за да добавите задача"
 msgid "% Complete"
 msgstr "% Приключено"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Завършено"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Дата на завършване"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Срок"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Начална Дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Резюме"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Сортиране на Задачи"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Преместване"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Копиране"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Нова _Среща..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Нова Задача"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Избира _Нишка"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Копира в папка"
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Премества в Папка"
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Настройки"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Крайна Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Начална Дата"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Неизвестен"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Повтарям"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Назначен"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Да"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ю"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "И"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географското местонахождение трябва да бъде въведено в следния формат: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5682,36 +6229,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "сутрин"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "вечер"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутно разделяне"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутно разделяне"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "сутрин"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "вечер"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5778,37 +6325,36 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Започва:</b>·"
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Завършва:</b>·"
+#, fuzzy
+msgid "Starts"
+msgstr "Статус"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Завършени:</b>·"
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Енид"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr ""
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Дължим"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iКалендарна информация"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iКалендар Грешка"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5816,305 +6362,285 @@ msgstr ""
 "<br> Моля, прегледайте следната информация и тогава изберете действие от "
 "долното меню."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Без</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Местоположение:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Приет"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Избера действие:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Обновява"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Да"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Приема"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Отказва"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Изпраща Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Обновява статуса на отговарящият"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за среща."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Информация за Среща"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Предложение на срещата:"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желае да бъде добавен на съществуващата среща."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Обновява срещата:"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желае да получи последната информация за срещата.."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Заявка за Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за срещата."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Отговор на Среща"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> прекъсна срещата."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Прекъсване на срещата"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> изпраща неразбираемо съобщение."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Лошо Съобщение за Среща"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Предложение за Задача"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желае да бъде добавен към съществуваща задача.."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Обновяван Задача"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желае да получи последната информация за задача.."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Заявка за Обновяване на задача"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Отговор на Задача"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Прекъсване на Задача"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Лошо Съобщение за Задача"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Заявка Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Отговор Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Лошо Свободен/Зает Съобщение"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподържани заявки."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно календар съобщение."
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Обновяването приключено\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
@@ -6143,6 +6669,10 @@ msgstr "Зареждане на Календар"
 msgid "Loading calendar..."
 msgstr "Клендарът се зарежда..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Съобщение на Сървър:"
@@ -6159,11 +6689,6 @@ msgstr "начална дата"
 msgid "Chair Persons"
 msgstr "Председателстващ"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Членове"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Допълнителни Членове"
@@ -6231,6 +6756,28 @@ msgstr "Делегиран"
 msgid "In Process"
 msgstr "В Прогрес"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън Офиса"
@@ -6239,98 +6786,64 @@ msgstr "Извън Офиса"
 msgid "No Information"
 msgstr "Няма Информация"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Добавя подателя в Адресната книга"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Опции"
+msgid "O_ptions"
+msgstr "Опций"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Показ_ва само работните часове"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Показва _Намаление"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Обновява Свободен/Зает"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Автоизбиране"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Всички Хора и Ресурси"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Вси_чки Хора и Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Заявени Хора"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Нужни Хора и _Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Начало на срещата:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Край на срещата:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Въведедете парола за %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6339,120 +6852,53 @@ msgstr ""
 "Грешка в %s:\n"
 "·%s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Отваряне на задачи в %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Грешка в %s:\n"
-"·%s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Няма задачи"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Отваряне на задачи в %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Завършение задачи..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Изтрива избраните обекти..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задачи"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Обновява обектите"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Среща - %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Отвори в %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задачи"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6794,10 +7240,6 @@ msgstr "Избран месец (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Задача"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6828,7 +7270,7 @@ msgid "Contacts: "
 msgstr "Контакти:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
@@ -6857,7 +7299,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d дни"
 msgstr[1] "%d дни"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6877,35 +7319,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Задачи"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Нова Задача"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "_Задачи"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Създава нова задача"
@@ -8575,69 +9011,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr "Вие трябва да сте в 'online' за да завършите тази операция"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Синхронизиране на папки"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка при работа с филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка при изпълнение на филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Не мога да отворя spool папка"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Не мога да обработя spool папка"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получаване на съобщение номер %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Не мога да отворя съобщение"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка на съобщение %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Синхронизиране на папка"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка на съобщение - %d от %d"
@@ -8659,43 +9095,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка при търсене на филтър: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподържана операция: добавяне на съобщение за %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподържана операция: търсене по израз: за %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподържана операция: търсене по uids: за %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Премества съобщения"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Копира съобщения"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Лансинг"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Получавам %d съобщение"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8741,7 +9140,44 @@ msgstr "(съвпадение на всичи) изисква единичен �
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподържана операция: добавяне на съобщение за %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподържана операция: търсене по израз: за %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Неподържана операция: търсене по uids: за %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Премества съобщения"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копира съобщения"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Лансинг"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Получавам %d съобщение"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8749,43 +9185,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Прекратено."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8793,63 +9229,83 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Това е част от криптирано съобщение"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не мога да получа съобщение от редактора"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: 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 ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не мога да заключа '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8872,26 +9328,6 @@ msgstr "Неуспех при получаване на lock използвай�
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неуспех при получаване на lock използвайки flcntl(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr ""
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr ""
-
-#: 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 ""
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не мога да заключа '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9134,7 +9570,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -9215,55 +9651,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Компилирането на регулярен израз пропадна  %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' се нуждае от компонент име на потребител"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' се нуждае от компонент хост"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' се нуждае от компонент път"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Анализира: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Неуспех при търсене на име %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Търсенето на хост пропадна: %s: хоста не е намерен"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Разглежда адрес"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9338,7 +9774,7 @@ msgstr ""
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Не мога да създам декодиращ контекст за S/MIME"
@@ -9432,7 +9868,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "HTML сигнатурен файл"
 
 #: camel/camel-smime-context.c:651
@@ -9446,48 +9882,47 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Неуспех при намиране на сертификат за \"%s\"."
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Създава правило От Съобщение"
+msgid "Cannot create CMS Message"
+msgstr "Не мога да отворя съобщение"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Не мога да отворя съобщение"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Не мога да прикача файл %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Не мога да прикача файл %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Не мога да отворя съобщение"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Не мога да създам декодиращ контекст за S/MIME"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9534,7 +9969,8 @@ msgstr "Не мога да преименувам папката %s Няма т�
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не мога да преименувам папката %s Грешна операция"
@@ -9543,8 +9979,8 @@ msgstr "Не мога да преименувам папката %s Грешна
 msgid "Trash"
 msgstr "Кошче"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Юни"
@@ -9665,7 +10101,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9678,11 +10114,11 @@ msgstr ""
 "Пръстови отпечатъци:·······%s\n"
 "SПодпис:·········%s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ДОБЪР"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "ЛОШ"
 
@@ -9699,7 +10135,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9709,35 +10145,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не мога да анализирам URL `%s'"
@@ -9761,7 +10197,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не мога да преименувам папката %s Няма такава папка"
@@ -9782,8 +10218,8 @@ msgid "Checking for new mail"
 msgstr "Проверка за нова поща"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Проврка за нови съобщения във всички папки"
 
@@ -9815,8 +10251,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9835,321 +10271,28 @@ msgstr "Тази опция ще ви свърже с IMAP сървър изпо
 msgid "Checklist"
 msgstr "Гъста мъгла"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неочакван отговор от IMAP сървър: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Сървъра неочаквано се откачи: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не мога да синхронизирам spool папката `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не мога да получа папка: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Папки"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показва само папките с абонат"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Място за име"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "За четене и запазване на поща от IMAP сървъри"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP сървър %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP·услуга за·%s·на·%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Връзкрата прекратена"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Неизвестна грешка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sМоля въведете IMAP паролата за %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-"Не мога да се оторизирам пред IMAP сървър.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не мога да получа папка: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "В името на папката не може да се съдържа символа 'Return"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Не мога да изтрия папка %s: Няма такава папка"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не мога да изтрия папка %s: Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неочакван отговор от IMAP сървър: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Няма задачи"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Сървъра неочаквано се откачи: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Неизвестна грешка"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10216,7 +10359,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10292,6 +10435,27 @@ msgstr ""
 "\n"
 "Коментар:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Папки"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Показва само папките с абонат"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Място за име"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
@@ -10314,43 +10478,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP сървър %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP·услуга за·%s·на·%s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Връзкрата прекратена"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Неподдържано SSL/TLS разширение"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Неуспешни SSL преговори"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не мога да се свържа към сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Няма подръжка за оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10361,30 +10574,283 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "В името на папката не може да се съдържа символа 'Return"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "На бащината папка не е разрешено да има подпапки"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не мога да преименувам папката %s Няма такава папка"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr ""
+"Не мога да се оторизирам пред IMAP сървър.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Сървъра неочаквано се откачи: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не мога да синхронизирам spool папката `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "За четене и запазване на поща от IMAP сървъри"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sМоля въведете IMAP паролата за %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+"Не мога да се оторизирам пред IMAP сървър.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Няма задачи"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Сървъра неочаквано се откачи: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10547,18 +11013,26 @@ msgstr "Не мога да запазя обобщение %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не мога да добавя съобщение към обобщение: неизвестна причина"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Пощенска кутия"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не мога да добавя съобщението в maildir папката: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10574,25 +11048,25 @@ msgstr ""
 "Не мога да получа съобщение  %s от папка %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Грешно съдържание на съобщение"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папката `%s' не съществува."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
@@ -10601,23 +11075,23 @@ msgstr ""
 "Не мога да създам папка`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' не е maildir директория."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не мога да изтрия папката `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "не е maildir директория"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11210,55 +11684,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr "Не мога да се свържа към сървър %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Няма такава папка `%s'."
@@ -11475,97 +11961,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сървър %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP поща през %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Не мога да изпратя поща; адеса на изпращача не е указан."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Не мога да изпратя съобщение: няма зададен получател"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Поздравления"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Грешка при създаване на SASL оторизация"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Лош отговор за оторизация от сървъра.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM от заявката таймаут %s пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO върна грешка: %s: пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA върна грешка: %s: пощата не е изпратена"
@@ -11573,28 +12059,28 @@ msgstr "DATA върна грешка: %s: пощата не е изпратен�
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP команда пропадна: %s"
@@ -11658,90 +12144,6 @@ msgstr "MIME тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не мога да отворя файл `%s': %s"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Не мога да получа съобщение от редактора"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Неименувано Съобщение"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Отвори файл"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Напиши Съобщение"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11824,17 +12226,89 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не мога да отворя файл `%s': %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не мога да получа съобщение от редактора"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Неименувано Съобщение"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Отвори файл"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Напиши Съобщение"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Препратено съобщение - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Неименувано Съобщение"
+msgstr[1] "Неименувано Съобщение"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Прикрепи файл към съобщението"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11852,52 +12326,66 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Не мога да получа съобщение от POP сървър %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr ""
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Искате ли да съхраните промените?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Не Изтривай"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Премахва"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Грешка при запазване на кратки клавиши."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11905,57 +12393,66 @@ msgid ""
 msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Незаписва Промени"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Съобщение на Сървър:"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Не мога да получа съобщение: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Не мога да създам сигнатурен контекст за S/MIME"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Не мога да получа съобщение: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12249,11 +12746,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Изберете време за да го сравните отново"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Правила на Филтриране"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12281,19 +12773,8 @@ msgstr "Трябва да определите име на файла."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Синхронизиране на папка"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Трябва да изберете папка."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12301,153 +12782,38 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Задача"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Трябва да има име този филтър."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Тази vпапка трябва да има име."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 #, fuzzy
 msgid "Please choose another name."
 msgstr "Моля, изберете сървър."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Не е избран сървър"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Избира файл"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Завършва:</b>·"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Избира Папка"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Правила на Филтриране"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Източници на vПапки"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Сравни срещу"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Входящи"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "време относително към текущото"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "преди"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "месеци"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "секунди"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "задава само папки"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "текущото време"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "времето определено от вас"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "с всички активни отдалечени папки"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "с всички локални и активни отдалечени папки"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "с всички локални папки"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "години"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важно"
 
@@ -12517,6 +12883,65 @@ msgstr "входящ"
 msgid "outgoing"
 msgstr "изходящ"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила на Филтриране"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Сравни срещу"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Входящи"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "време относително към текущото"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "преди"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "месеци"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "секунди"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "текущото време"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "времето определено от вас"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "години"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Добавя Правило"
@@ -12529,60 +12954,69 @@ msgstr "Редактира на Правило"
 msgid "Rule name"
 msgstr "Име на правило"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Програма"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Настройки наинтерфейса за писане на писма"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Тялото съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Тялото не съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тялото или Темата съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Поща Evolution"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Съобщението съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Получателите съдържат"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Изпращача съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Темата съдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Темата несъдържа"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Виртуални Папки"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Поща"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "Доб_авя"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Пощенски Абонати"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Източник на VFolder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Пощенски Настройки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Поща"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12615,51 +13049,324 @@ msgstr "Изтрива всички сигнатури"
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Препратени съобщения"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Правила на Филтриране"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Избира Папка"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Назначава Цвят"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Назначава Цвят"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Прикрепени файлове"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Издава звук"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "съдържа"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Копира в Папка"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Получено на дата"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Изпратено на дата"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Изтрива"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "не съдържа"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "не завършва с"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "не съществува"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "не връща"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "не звучи като"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "не започва с"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Не съществува"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Чернова"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "завършва с"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Съществува"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "съществува"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Израз"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "е"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "е след"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "е преди"
+
+#: mail/em-filter-i18n.h:30
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+msgid "is Flagged"
+msgstr "Маркирано"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "е по-голямо от"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "е по малко от"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "не е"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Маркирано"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Юни"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Етикет"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Пощенски списък"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Тяло на съобщение"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Заглавие на съобщение"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Съобщението беше изпратено"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Съобщението %s не е намерено."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Премества в Папка"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Напуска програмата"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Изпълнява Звук"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочита"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Получателите съдържат"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Получатели"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "връща"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "връща по-голямо от"
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "е по малко от"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Стартирай програма:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Изпращач:"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Статус"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Размер (кБ)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "звучи като"
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Източник"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Специфично заглавие"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "започва с"
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Спира Зареждането"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "САЩ"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Завършва:</b>·"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Източници на vПапки"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Свойства"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "_Име на папката:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Помощно съобщение"
+msgstr[1] "Помощно съобщение"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Помощно съобщение"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Следващо _Непрочетено Писмо"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Следващо _Непрочетено Писмо"
+msgstr[1] "Следващо _Непрочетено Писмо"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12669,415 +13376,428 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Create New Folder"
 msgstr "Създава Нова Папка"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Укажете каде да бъде създадена папката:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Крествю"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Име_на_папка:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Зареждане..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Не мога да декриптирам това съобщение: няма шифрован текст за декриптиране"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копира в Папка"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Премества в _Папка"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Премества"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Прекъсва Задача"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Избира папка"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Копира"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Създава нова папка"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименува папката \"%s\" на:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Преименува Папка"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Изглед"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Отваря в Нов Прозорец"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Копира..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "Премества..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Нова Папка..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Преименува"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Настройки..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Пощенска кутия"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Преименувай..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Зареждане..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Поща"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Свойства"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Редактира като ново съобщение..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Разпечатва"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Отговаря на подателя"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Отговаря на списъка"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Отговаря на всички"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Препраща"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Отбелязва като прочетено"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Отбелязва като непрочетено"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Отбелязва като В_ажно"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Отбелязва като Неважно"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Отбелязва като непрочетено"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Отбелязва като В_ажно"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Премества в Папка"
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копира в Папка..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Етикет"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Добавя Изпращача в Адресната _книга"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Прил_ага Филтри"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила на Филтриране"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Създава правило От Съобщение"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder върху _Тема"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "v_Папка на Получатели"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Филтър върху _Mailing List"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Филтър върху Т_ема"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Филтър върху По_лучатели"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Филтър върху Mailing _List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "По подразбиране"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Отпечатай Съобщението"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копира местоположениет на указател"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Натиснете за да добавите задача"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "От"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Съвпадения:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Отговор-До"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Назначен"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Запазва сигнатура"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Тема"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Запазва сигнатура"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s прикачен"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+msgid "Unencrypted"
+msgstr "Прекъснат"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Неподържана схема"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Грешка при модифициране на списък"
+msgid "Encrypted"
+msgstr "PGP криптиране"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Неизвестна грешка: %s"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Получавам съобщение %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-#, fuzzy
-msgid "Unsigned"
-msgstr "Назначен"
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Valid signature"
-msgstr "Запазва сигнатура"
+msgid "_View Certificate"
+msgstr "_Сертифициран ID:"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Запазва сигнатура"
+msgid "This certificate is not viewable"
+msgstr "Съобщението не е налично"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Прекъснат"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1085
 #, fuzzy
-msgid "Encrypted"
-msgstr "PGP криптиране"
+msgid "_View Inline"
+msgstr "_Вътрешен"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-display.c:1086
+#, fuzzy
+msgid "_Hide"
+msgstr "Скрий"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Получавам съобщение %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13114,9 +13834,35 @@ msgstr "Указател към неизвестни външни данни (\"
 msgid "Formatting message"
 msgstr "Премества съобщения"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "От"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Отговор-До"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "До"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Пощенска програма"
 
@@ -13130,102 +13876,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Съвпадения:"
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Сертифициран ID:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s прикачен"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Съобщението не е налично"
-
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr ""
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr ""
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "_View Inline"
-msgstr "_Вътрешен"
+msgid "Unsupported signature format"
+msgstr "Неподържана схема"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Скрий"
+msgid "Error verifying signature"
+msgstr "Грешка при модифициране на списък"
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неизвестна грешка: %s"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13340,7 +14031,7 @@ msgstr "Изпраща с_ъобщението към списък..."
 msgid "_Add to Addressbook"
 msgstr "Добави адресна книга"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори в %s..."
@@ -13354,7 +14045,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Абонира"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Папка"
 
@@ -13391,11 +14082,24 @@ msgid "Add address"
 msgstr "Адрес"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail от %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Виртуални Папки"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "Доб_авя"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Източник на VFolder"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -13873,63 +14577,34 @@ msgstr ""
 msgid "spamd port"
 msgstr "Вмъква"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Настройки наинтерфейса за писане на писма"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Поща Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 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:99
-msgid "Mail Preferences"
-msgstr "Пощенски Настройки"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Поща"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution внася вашите стари Elm пощи"
@@ -13990,34 +14665,6 @@ msgstr "Импортира"
 msgid "Importing mailbox"
 msgstr "Импортира Файлове"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14165,80 +14812,86 @@ msgstr "%s пощенски списък"
 msgid "Add Filter Rule"
 msgstr "Добавя правило за Филтър"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr " %d избрано"
+msgid_plural "%d deleted"
+msgstr[0] " %d избрано"
+msgstr[1] " %d избрано"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr " %d неизпратено"
+msgid_plural "%d junk"
+msgstr[0] " %d неизпратено"
+msgstr[1] " %d неизпратено"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d дни"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d дни"
+msgstr[1] "%d дни"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr " %d изпратено"
+msgid_plural "%d sent"
+msgstr[0] " %d изпратено"
+msgstr[1] " %d изпратено"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr " %d неизпратено"
+msgid_plural "%d unsent"
+msgstr[0] " %d неизпратено"
+msgstr[1] " %d неизпратено"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d общо"
+msgid_plural "%d total"
+msgstr[0] "%d общо"
+msgstr[1] "%d общо"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr " %d неизпратено"
+msgid_plural ", %d unread"
+msgstr[0] " %d неизпратено"
+msgstr[1] " %d неизпратено"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Ново _Писмо"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Пощенско Съобщение"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Създава ново писмо"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нов VFolder"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Пощенски Филтри"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Създава нова папка"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Проверява Обслужване"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Свързване със сървъра..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Потребител"
@@ -14288,16 +14941,23 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Проверява Обслужване"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Свързване със сървъра..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Проверка за подържани типове"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Преглед"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14561,7 +15221,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Приключено"
 
@@ -14910,6 +15570,116 @@ msgstr ""
 msgid "description"
 msgstr "описание"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Източници на vПапки"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Приет"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "За_вършени"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Със значение на малки/големи букви"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Търси в съобщението"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Намери:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "С_ървър"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Източник на Информация"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Крайна Дата"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Флаг:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Абонирай се"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "О_тпиши се"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "задава само папки"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "с всички активни отдалечени папки"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "с всички локални и активни отдалечени папки"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "с всички локални папки"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15110,14 +15880,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15144,8 +15906,9 @@ msgstr ""
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
+#, fuzzy
 msgid "Cannot save to file \"{0}\"."
-msgstr ""
+msgstr "Папката %s не може да бъде преместена"
 
 #. mail:no-create-path secondary
 #: mail/mail-errors.xml.h:96
@@ -15224,8 +15987,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Папката %s не може да бъде преместена"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15278,8 +16042,9 @@ msgstr "Не мога да отворя съобщение"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "е една друга карта."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15308,8 +16073,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Не изтривай"
+msgstr "Възстановява изтрито"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15355,8 +16121,9 @@ msgstr ""
 "Искате ли да запазите промените?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Незаписва Промени"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -15373,8 +16140,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Не мога да изтрия папката:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15406,13 +16176,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Синхронизиране на папка"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Трябва да изберете папка."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Тази vпапка трябва да има име."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не е избран сървър"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15420,16 +16221,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Презаписва"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Аспен"
@@ -15589,7 +16390,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15598,46 +16399,21 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Със значение на малки/големи букви"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Търси в съобщението"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Намери:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Източник на Информация"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Прекратяване..."
@@ -15673,24 +16449,24 @@ msgstr "Обновяване ..."
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15745,15 +16521,15 @@ msgstr "Обновяване на vпапки за uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
@@ -15817,7 +16593,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
@@ -15873,10 +16649,6 @@ msgstr "Препрати"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочита"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Отговори"
@@ -15889,48 +16661,51 @@ msgstr "Отговори на Всички"
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тялото съдържа"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "За_вършени"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тялото не съдържа"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тялото или Темата съдържа"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Крайна Дата"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Съобщението съдържа"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Флаг:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Получателите съдържат"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr ""
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Изпращача съдържа"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr ""
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Темата съдържа"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "С_ървър"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Темата несъдържа"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Абонирай се"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Обвивка на Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "О_тпиши се"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Компонент за Адресната книга на Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -15997,31 +16772,18 @@ msgstr ""
 msgid "mail"
 msgstr "Електронна поща"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Неизвестна грешка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Грешни аргументи"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Не мога да регистрирам в OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Активни Връзки"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Конфигурационната база данни не е намерена"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Активни Връзки"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Грешка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Натиснете OK за да затворите връзките и да преминете в 'offline'"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16204,30 +16966,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' и '..' са запазени имена на папка."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian· Evolution в момента е 'online'.  Натиснете този бутон за да го "
-"превключите в режим 'offline'."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution е в процес на преминаване на режим 'offline'."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution  в момента е 'offline.'  Натиснете този бутон за да го превключите "
-"в 'online' режим."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mail до %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Инструмента GNOME Pilot изглежда не е инсталиран на тази система"
@@ -16245,111 +16983,93 @@ msgstr "Bug·buddy не е инсталиран."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може да бъде стартиран."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Работа в 'O_nline режим' "
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Работа в '_Offline режим'"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Работа в 'Offline режим'"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Нов"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Нова Задача"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Тест"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian· Evolution в момента е 'online'.  Натиснете този бутон за да го "
+"превключите в режим 'offline'."
 
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Създава нова задача"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution е в процес на преминаване на режим 'offline'."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Активни Връзки"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Активни Връзки"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Натиснете OK за да затворите връзките и да преминете в 'offline'"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "К_алендар:"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution  в момента е 'offline.'  Натиснете този бутон за да го превключите "
+"в 'online' режим."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Контакт"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail до %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Поща"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Задачи"
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Неизвестна грешка"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Тип_папка:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Грешни аргументи"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Отваря Папката на Друг Потребител"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Не мога да регистрирам в OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Акаунт:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Конфигурационната база данни не е намерена"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Име на папката:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Грешка"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Потребител"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Нов"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Асистент за Настройка на Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Импортира Файлове"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Времева Зона: "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Добре Дошли"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16358,7 +17078,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16366,19 +17086,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Обвивка на Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Нова Задача"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Тест"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Компонент за Адресната книга на Evolution"
+msgid "Create a new test item"
+msgstr "Създава нова задача"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16446,7 +17167,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution не може да импортира данни от следните файлове:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16466,7 +17187,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16475,39 +17196,39 @@ msgstr ""
 "Благодарности\n"
 "От екипа на Ximian·Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Не ми казвай отново"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Стартира в \"offline\" режим"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Стартира в \"online\" режим"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16580,6 +17301,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -16839,6 +17582,12 @@ msgstr "_Сертифициран ID:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Карта ID вече съществува"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17066,12 +17815,6 @@ msgstr "Темата е %s"
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Карта ID вече съществува"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17215,8 +17958,8 @@ msgstr "Преглежда текущия контакт"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Действия"
@@ -17701,16 +18444,6 @@ msgstr "_Обърнат Избор"
 msgid "_Threaded Message List"
 msgstr "_Дървовиден списък на съобщенията"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Затваря този прозорец"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Затваря"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18123,6 +18856,16 @@ msgstr "Инс_трументи"
 msgid "_Undelete"
 msgstr "Възстановява изтрито"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Затваря този прозорец"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Затваря"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Прикрепя"
@@ -18205,10 +18948,6 @@ msgstr "Съхранява текущият файл с различно име"
 msgid "Save the message in a specified folder"
 msgstr "Съхранява съобщението в определа папка"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Изпраща"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18788,7 +19527,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18947,6 +19686,214 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Грешна оторизация отговори сървъра."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Фамилия:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Редактор за Контакти"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Съхрани Списък като VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Група"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Wombat не може да бъде стартиран"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "К_алендар:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Опции на Звукова Аларма"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Опции за Получатели на Съобщението"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Опции на програма аларма"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Неизвестни опции на аларма"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Повторение на Аларма"
+
+#~ msgid "Play sound:"
+#~ msgstr "Издава звук:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "С тези аргументи:"
+
+#~ msgid "Basics"
+#~ msgstr "Базов"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Дата/Време:"
+
+#~ msgid "Reminders"
+#~ msgstr "Напомняне"
+
+#~ msgid "_Options..."
+#~ msgstr "_Опций..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Адресна книга..."
+
+#~ msgid "Reminder"
+#~ msgstr "Напомня"
+
+#~ msgid "B_usy"
+#~ msgstr "_Зает"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Т_аен"
+
+#~ msgid "Date & Time"
+#~ msgstr "Дата и Час"
+
+#~ msgid "F_ree"
+#~ msgstr "_Свободен"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Частен"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Публичен"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Добавя подателя в Адресната книга"
+
+#~ msgid "Preview"
+#~ msgstr "Преглед"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило на Повторение"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Наст_ройка на повторение"
+
+#~ msgid "_Modify"
+#~ msgstr "Модифицир_а"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Няма повторение"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Пр_осто повторение"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% Приключено"
+
+#~ msgid "Progress"
+#~ msgstr "Прогрес"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Конфиденциален"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Пап_ка:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Започва:</b>·"
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Завършва:</b>·"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Завършени:</b>·"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Без</i>"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Добавя подателя в Адресната книга"
+
+#~ msgid "_Options"
+#~ msgstr "_Опции"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Начало на срещата:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Край на срещата:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка в %s:\n"
+#~ "·%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Неуспех при намиране на сертификат за \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Създава правило От Съобщение"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Не мога да създам декодиращ контекст за S/MIME"
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Програма"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Име на папката:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Преименува"
+
+#~ msgid "_Properties..."
+#~ msgstr "Настройки..."
+
+#~ msgid "C_alendar:"
+#~ msgstr "К_алендар:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "_Контакт"
+
+#~ msgid "_Mail:"
+#~ msgstr "_Поща"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Задачи"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Тип_папка:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Отваря Папката на Друг Потребител"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Име на папката:"
+
+#~ msgid "_User:"
+#~ msgstr "_Потребител"
+
 #~ msgid "Primary"
 #~ msgstr "Основен"
 
@@ -19088,12 +20035,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Получава резултатите от търсенето от LDAP сървъра..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Грешка при търсенето"
-
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Курсорът не може да бъде зареден\n"
-
 #~ msgid "EBook not loaded\n"
 #~ msgstr "EBook не е заредена\n"
 
@@ -19109,15 +20050,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Public folder containing contact information"
 #~ msgstr "Публична папка съдържаща информация за контакти"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Неуспех в идентифицирането пред LDAP сървъра"
-
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Сървърът отговори с неподдържани основи за търсене"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Този сървър не поддръжа LDAPv3 информация"
-
 #~ msgid "Server Name"
 #~ msgstr "Име на сървъра"
 
@@ -19250,9 +20182,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Is New Card"
 #~ msgstr "Е Нова Картичка"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Редактор на категории не е наличен"
-
 #~ msgid "Could not find widget for a field: `%s'"
 #~ msgstr "Не мога да намеря графичен обект за поле: `%s'"
 
@@ -19326,16 +20255,9 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "_General"
 #~ msgstr "_Основен"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази среща?"
-
 #~ msgid "Are you sure you want to cancel and delete this task?"
 #~ msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази задача?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Сигурни ли сте, че искате да прекъснете и изтриете този запис в дневника?"
-
 #~ msgid "Could not update invalid object"
 #~ msgstr "Не може да осъвремени невалиден обект"
 
@@ -19345,30 +20267,12 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "You don't have permissions to update this object"
 #~ msgstr "Нямата права да осъвремените този обект"
 
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
-
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Сигурен ли сте, че искате да изтриете тази неименувана задача?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Сигурен ли сте, че искате да неименуван запис в дневника?"
 
-#~ msgid "Are you sure you want to delete %d appointments?"
-#~ msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
-
-#~ msgid "Are you sure you want to delete %d tasks?"
-#~ msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
-
-#~ msgid "Are you sure you want to delete %d journal entries?"
-#~ msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
-
 #~ msgid "That person is already attending the meeting!"
 #~ msgstr "Това лице вече участва в срещата!"
 
@@ -19404,9 +20308,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "_Save as..."
 #~ msgstr "_Запазва като..."
 
-#~ msgid "Alarms"
-#~ msgstr "Аларми"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Географска Позиция"
 
@@ -19584,120 +20485,9 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Outgoing"
 #~ msgstr "Изходящи"
 
-#~ msgid "Assign Color"
-#~ msgstr "Назначава Цвят"
-
-#~ msgid "Attachments"
-#~ msgstr "Прикрепени файлове"
-
-#~ msgid "Beep"
-#~ msgstr "Издава звук"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Копира в Папка"
-
-#~ msgid "Date received"
-#~ msgstr "Получено на дата"
-
-#~ msgid "Date sent"
-#~ msgstr "Изпратено на дата"
-
-#~ msgid "Deleted"
-#~ msgstr "Изтрива"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Не съществува"
-
-#~ msgid "Draft"
-#~ msgstr "Чернова"
-
-#~ msgid "Exist"
-#~ msgstr "Съществува"
-
-#~ msgid "Mailing list"
-#~ msgstr "Пощенски списък"
-
-#~ msgid "Message Body"
-#~ msgstr "Тяло на съобщение"
-
-#~ msgid "Message Header"
-#~ msgstr "Заглавие на съобщение"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Премества в Папка"
-
-#~ msgid "Play Sound"
-#~ msgstr "Изпълнява Звук"
-
-#~ msgid "Sender"
-#~ msgstr "Изпращач:"
-
 #~ msgid "Shell Command"
 #~ msgstr "Shell·команда"
 
-#~ msgid "Size (kB)"
-#~ msgstr "Размер (кБ)"
-
-#~ msgid "Specific header"
-#~ msgstr "Специфично заглавие"
-
-#~ msgid "contains"
-#~ msgstr "съдържа"
-
-#~ msgid "does not contain"
-#~ msgstr "не съдържа"
-
-#~ msgid "does not end with"
-#~ msgstr "не завършва с"
-
-#~ msgid "does not exist"
-#~ msgstr "не съществува"
-
-#~ msgid "does not return"
-#~ msgstr "не връща"
-
-#~ msgid "does not sound like"
-#~ msgstr "не звучи като"
-
-#~ msgid "does not start with"
-#~ msgstr "не започва с"
-
-#~ msgid "ends with"
-#~ msgstr "завършва с"
-
-#~ msgid "exists"
-#~ msgstr "съществува"
-
-#~ msgid "is after"
-#~ msgstr "е след"
-
-#~ msgid "is before"
-#~ msgstr "е преди"
-
-#~ msgid "is greater than"
-#~ msgstr "е по-голямо от"
-
-#~ msgid "is less than"
-#~ msgstr "е по малко от"
-
-#~ msgid "is not"
-#~ msgstr "не е"
-
-#~ msgid "is"
-#~ msgstr "е"
-
-#~ msgid "returns greater than"
-#~ msgstr "връща по-голямо от"
-
-#~ msgid "returns"
-#~ msgstr "връща"
-
-#~ msgid "sounds like"
-#~ msgstr "звучи като"
-
-#~ msgid "starts with"
-#~ msgstr "започва с"
-
 #~ msgid "Rules"
 #~ msgstr "Правила"
 
@@ -21900,9 +22690,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Emporia"
 #~ msgstr "Емпориа"
 
-#~ msgid "Enid"
-#~ msgstr "Енид"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Енид/Удринг"
 
@@ -23400,9 +24187,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Malaga"
 #~ msgstr "Малага"
 
-#~ msgid "Managua"
-#~ msgstr "Манагуа"
-
 #~ msgid "Manaus"
 #~ msgstr "Манаус"
 
@@ -25617,9 +26401,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "View the selected folder"
 #~ msgstr "Показва избраната папка"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Копира..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Панел с папки"
 
@@ -25629,18 +26410,12 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Отива в Папка..."
 
-#~ msgid "_Move..."
-#~ msgstr "Премества..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Нова папка"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Премахва Другите Потребителски Папки"
 
-#~ msgid "_Rename..."
-#~ msgstr "Преименувай..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панел с Бързи Клавиши"
 
@@ -25659,9 +26434,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "With _Category"
 #~ msgstr "С _Категория"
 
-#~ msgid "Information"
-#~ msgstr "Информация"
-
 #~ msgid "Error"
 #~ msgstr "Грешка"
 
@@ -25755,9 +26527,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Създай нова папка..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "Контакти..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Фабрика, от която да се внесат LDIF файлове в Еволюшън."
 
@@ -25856,9 +26625,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "(%d not shown)"
 #~ msgstr "(%d не са показани)"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "К_онтакти..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Тип Телефон"
 
@@ -26287,9 +27053,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Meeting ends: <b>"
 #~ msgstr "Край на срещата:: <b>"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Край на информация Свободен/Зает: <b>"
-
 #~ msgid "Task Completed: <b>"
 #~ msgstr "Задачата Приключено: <b>"
 
@@ -26394,9 +27157,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Send _Later"
 #~ msgstr "Изпрати По-късно"
 
-#~ msgid "Send _later"
-#~ msgstr "Изпрати по-късно"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Настройки за Pilot..."
 
@@ -26404,12 +27164,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Addressbook Settings"
 #~ msgstr "Източници на адреси"
 
-#, fuzzy
-#~ msgid "Could not query for schema information"
-#~ msgstr ""
-#~ "Грешна информация при трасиране:\n"
-#~ "%s"
-
 #~ msgid "Sta_rt of day:"
 #~ msgstr "Начало на д_еня:"
 
@@ -26526,12 +27280,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Could not create a PGP decryption context."
 #~ msgstr "Не мога да създам PGP декриптиращ контекст."
 
-#~ msgid "Moving"
-#~ msgstr "Преместване"
-
-#~ msgid "Copying"
-#~ msgstr "Копиране"
-
 #, fuzzy
 #~ msgid "Signature name:"
 #~ msgstr "Файл с Подпис:"
@@ -26836,9 +27584,6 @@ msgstr "%s (%d%% приключено)"
 #~ "Област: %s\n"
 #~ "Държава: %s"
 
-#~ msgid "Message %s not found."
-#~ msgstr "Съобщението %s не е намерено."
-
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Не мога да отворя директория за сървър с новини %s"
 
@@ -26848,9 +27593,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Не мога да отворя папка: списъка със съобщения не е пълен"
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Не мога да получа съобщение от POP сървър %s: %s"
-
 #~ msgid ""
 #~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
 #~ "it."
@@ -26874,9 +27616,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Message was received"
 #~ msgstr "Съобщението беше получено"
 
-#~ msgid "Message was sent"
-#~ msgstr "Съобщението беше изпратено"
-
 #~ msgid "on or after"
 #~ msgstr "на или след"
 
diff --git a/po/ca.po b/po/ca.po
index 04f02b1396..1e37a48c7c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,14 +12,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-07 19:08+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-04-08 12:21+0200\n"
 "Last-Translator: Softcatala <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 # fitxer: addressbook.gui.component.ca.po
@@ -63,389 +63,478 @@ msgstr "capçalera del contacte: "
 msgid "evolution minicard"
 msgstr "minitargeta de l'evolution"
 
+# fitxer: calendar.ca.po.3
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "No s'ha pogut enviar l'element.\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "El servidor ha respost amb bases de cerca no suportades"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Aquest servidor no suporta la informació de l'esquema d'LDAPv3"
+
+# fitxer: camel.ca.po.2
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "No s'ha pogut obtenir l'article %s del servidor NNTP"
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "El servidor no ha contestat amb una informació d'esquema vàlida"
+
+# fitxer: addressbook.conduit.ca.po
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "No s'ha pogut carregar la llibreta d'adreces"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "L'editor de categories no està disponible."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+# fitxer: addressbook.tools.ca.po
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr ""
+"S'ha produït un error en carregar la llibreta d'adreces predeterminada."
+
+# fitxer: camel.ca.po.4
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "No s'ha pogut processar la carpeta per a cues"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Voleu desar els canvis?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Descarta"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "i un altre contacte."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+# fitxer: camel.ca.po.4
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "No s'ha pogut analitzar el contingut del missatge"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "S'ha produït un error en afegir el contacte"
+
+# fitxer: addressbook.gui.component.ca.po
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visualitzador de la llibreta d'adreces de l'Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
 # fitxer: addressbook.conduit.ca.po
-#: addressbook/conduit/address-conduit.c:272
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Adreça de sincronització predeterminada:"
 
 # fitxer: addressbook.conduit.ca.po
-#: addressbook/conduit/address-conduit.c:1150
-#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "No s'ha pogut carregar la llibreta d'adreces"
 
 # fitxer: addressbook.conduit.ca.po
-#: addressbook/conduit/address-conduit.c:1214
-#: addressbook/conduit/address-conduit.c:1217
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreces del pilot"
 
-# fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Completat automàtic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactes"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificats"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
 msgstr "Configura el completat automàtic"
 
 # fitxer: addressbook.gui.component.ca.po
-#. 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);
 #. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:363
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Activació de les adreces de la llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualitzador de la llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualitzador de targetes de la llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Component de la llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visualitzador de carpetes de la llibreta d'adreces de l'Evolution"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Control de gestió de certificats S/Mime de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Control de paràmetres de configuració de les carpetes de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
 msgstr "Gestioneu els vostres certificats S/Mime"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:225
-#, c-format
-msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr ""
-"Se suprimirà la llibreta d'adreces '%s'. Esteu segur de voler continuar?"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:313
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "New Address Book"
-msgstr "Nova llibreta d'adreces"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:436 calendar/gui/tasks-component.c:367
-#: filter/libfilter-i18n.h:11 mail/em-account-prefs.c:235
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Suprimeix"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:315
-#: calendar/gui/calendar-component.c:437 calendar/gui/tasks-component.c:369
-msgid "Properties..."
-msgstr "Propietats..."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:551
+#: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
 msgstr "Nou contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:552
+#: addressbook/gui/component/addressbook-component.c:94
 msgid "_Contact"
 msgstr "_Contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:553
+#: addressbook/gui/component/addressbook-component.c:95
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:558
+#: addressbook/gui/component/addressbook-component.c:101
 msgid "New Contact List"
 msgstr "Nova llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:559
+#: addressbook/gui/component/addressbook-component.c:102
 msgid "Contact _List"
 msgstr "_Llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:560
+#: addressbook/gui/component/addressbook-component.c:103
 msgid "Create a new contact list"
 msgstr "Crea una nova llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-component.c:565
-msgid "New Addressbook Book"
-msgstr "Nou llibre de llibreta d'adreces"
-
-# fitxer: camel.ca.po.3
-#: addressbook/gui/component/addressbook-component.c:566
-msgid "_Address Book"
-msgstr "Llibret_a d'adreces"
+#: addressbook/gui/component/addressbook-component.c:109
+#, fuzzy
+msgid "New Contacts Group"
+msgstr "Nou contacte"
 
 # fitxer: calendar.ca.po.2
-#: addressbook/gui/component/addressbook-component.c:567
-msgid "Create a new address book"
-msgstr "Crea una nova llibreta d'adreces"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "Failed to connect to LDAP server"
-msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:431
-msgid "Failed to authenticate with LDAP server"
-msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:459
-msgid "Could not perform query on Root DSE"
-msgstr "No s'ha pogut realitzar la consulta al Root DSE"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:785
-msgid "The server responded with no supported search bases"
-msgstr "El servidor ha respost amb bases de cerca no suportades"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1217
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Aquest servidor no suporta la informació de l'esquema d'LDAPv3"
+#: addressbook/gui/component/addressbook-component.c:110
+#, fuzzy
+msgid "Contacts Grou_p"
+msgstr "Contactes:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1238
-msgid "Error retrieving schema information"
-msgstr "S'ha produït un error en recuperar la informació de l'esquema"
+#: addressbook/gui/component/addressbook-component.c:111
+#, fuzzy
+msgid "Create a new contacts group"
+msgstr "Crea un nou contacte"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1246
-msgid "Server did not respond with valid schema information"
-msgstr "El servidor no ha contestat amb una informació d'esquema vàlida"
+#: addressbook/gui/component/addressbook-component.c:184
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:57
-#: calendar/gui/migration.c:128 mail/em-migrate.c:1071
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "S'està migrant..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:65
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"S'ha modificat la ubicació i jerarquia de les carpetes de contactes de "
-"l'Evolution des de la versió 1.x.\n"
-"\n"
-"Espereu mentre l'Evolution migra les carpetes..."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:99
-#: calendar/gui/migration.c:175 mail/em-migrate.c:1112
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "S'està migrant '%s':"
 
 # fitxer: addressbook.gui.component.ca.po
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:409
-#: calendar/gui/migration.c:430 calendar/gui/migration.c:513
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:236
+#: addressbook/gui/component/addressbook-migrate.c:489
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "En aquest ordinador"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:417
-#: calendar/gui/migration.c:438 calendar/gui/migration.c:521
-#: filter/filter-label.c:123 mail/em-migrate.c:925 mail/mail-config.c:67
-#: mail/mail-config.glade.h:106
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personal"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:425
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:553
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Servidors d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:673
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Paràmetres del completat automàtic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:275
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"El nombre de targetes que compleixen els criteris de la consulta\n"
-"superen el nombre màxim que pot visualitzar l'Evolution, o el que pot "
-"retornar el servidor.\n"
-"Feu una cerca més específica o augmenteu el límit\n"
-"del resultat en les preferències del servidor de directoris d'aquesta\n"
-"llibreta d'adreces."
+"S'ha modificat la ubicació i jerarquia de les carpetes de contactes de "
+"l'Evolution des de la versió 1.x.\n"
+"\n"
+"Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:281
+#: addressbook/gui/component/addressbook-migrate.c:1143
+#, fuzzy
 msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"El temps d'execució d'aquesta consulta ha superat el límit del servidor o\n"
-"l'especificat en la configuració de la llibreta d'adreces. Feu una consulta\n"
-"més específica o augmenteu el límit de temps en les preferències del\n"
-"servidor de directori de la llibreta d'adreces."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:287
-msgid "The backend for this addressbook was unable to parse this query."
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"El programa de suport de la llibreta d'adreces no ha pogut analitzar la "
-"consulta."
+"S'ha modificat la ubicació i jerarquia de les carpetes de contactes de "
+"l'Evolution des de la versió 1.x.\n"
+"\n"
+"Espereu mentre l'Evolution migra les carpetes..."
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:290
-msgid "The backend for this addressbook refused to perform this query."
+# fitxer: calendar.ca.po.3
+#: addressbook/gui/component/addressbook-migrate.c:1152
+#, fuzzy
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"El programa de suport de la llibreta d'adreces ha refusat realitzar aquesta "
-"consulta."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:293
-msgid "This query did not complete successfully."
-msgstr "S'ha produït un error en l'execució d'aquesta consulta."
+"Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
+"carpetes de les tasques de l'Evolution.\n"
+"\n"
+"Espereu mentre l'Evolution migra les carpetes...<"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:591
+# fitxer: calendar.ca.po.3
+#: addressbook/gui/component/addressbook-migrate.c:1162
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
-"No s'ha pogut obrir la llibreta d'adreces. Comproveu que el camí existeixi i "
-"que hi teniu permís d'accés."
+"Des de l'Evolution 1.x s'ha modificat la ubicació i la jerarquia de les "
+"carpetes del calendari de l'Evolution.\n"
+"\n"
+"Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:598
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
+#: addressbook/gui/component/addressbook-view.c:633
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
-"No s'ha pogut obrir la llibreta d'adreces perquè l'URI que heu introduït és "
-"incorrecte o el servidor d'LDAP no està disponible."
+"Se suprimirà la llibreta d'adreces '%s'. Esteu segur de voler continuar?"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:603
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"Aquesta versió de l'Evolution no està compilada amb el suport per a LDAP. Si "
-"voleu utilitzar l'Evolution amb l'LDAP heu d'obtenir l'OpenLDAP de l'enllaç "
-"de sota i compilar el programa a partir del codi font del CVS."
+#: addressbook/gui/component/addressbook-view.c:714
+msgid "New Address Book"
+msgstr "Nova llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:612
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"No s'ha pogut obrir la llibreta d'adreces perquè l'URI introduït és "
-"incorrecte o el servidor no està disponible."
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Suprimeix"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:629
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+msgid "Properties..."
+msgstr "Propietats..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:713
+#: addressbook/gui/component/addressbook.c:89
 msgid "Accessing LDAP Server anonymously"
 msgstr "S'està accedint anònimament al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:788
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduïu la contrasenya per a %s (usuari %s)"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:1113
-msgid "UID of the contacts source that the view will display"
-msgstr ""
-"L'identificador d'usuari (UID) de l'origen dels contactes que mostrarà la "
-"visualització"
-
-# fitxer: calendar.ca.po.5
-#: addressbook/gui/component/addressbook.c:1118
-msgid "The URI that the address book will display"
-msgstr "La URI que mostrarà la llibreta d'adreces"
-
-# fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr "Xml de l'EFolderList per a la llista d'uris d'acabament"
@@ -471,18 +560,13 @@ msgstr "L'URI de l'última carpeta utilitzada en el diàleg de selecció de noms
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Mostra les bas_es suportades "
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -490,180 +574,198 @@ msgstr "  Mostra les bas_es suportades "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "1:00"
-msgstr "1:00"
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1"
+msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:6
-msgid "5:00"
-msgstr "5:00"
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "5"
+msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-# fitxer: addressbook.gui.component.ca.po
+# fitxer: camel.ca.po.1
+#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "Autenticació d'SMTP"
+
+# fitxer: calendar.ca.po.5
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "Address Book Creation Assistant"
-msgstr "Assistent de creació de la llibreta d'adreces"
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "_Visualització"
 
-# fitxer: addressbook.gui.component.ca.po
+# fitxer: designs.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:9
+#, fuzzy
+msgid "<b>Downloading</b>"
+msgstr "<b>Enviar correu electrònic:</b>"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:10
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "S'està cercant"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Pas 2: Informació del servidor"
+
+# fitxer: calendar.ca.po.3
+#: addressbook/gui/component/ldap-config.glade.h:12
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>Llavors</b>"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "Afegeix als contactes"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:10 mail/mail-account-gui.c:66
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Sempre"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anònimament"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:12
-msgid ""
-"Congratulations, you are\n"
-"\t      finished setting up this address book.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"Felicitats, heu finalitzat\n"
-"\t      el procés de configuració d'aquesta llibreta\n"
-"d'adreces.\n"
-"\n"
-"Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
+# fitxer: calendar.ca.po.4
+#: addressbook/gui/component/ldap-config.glade.h:17
+msgid "Basic"
+msgstr "Bàsic"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:16
-msgid "Connecting"
-msgstr "S'està connectant"
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Detalls"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Distinguished _name:"
+#: addressbook/gui/component/ldap-config.glade.h:19
+#, fuzzy
+msgid "Distinguished name"
 msgstr "_Nom distingit:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Email address:"
-msgstr "Adreça de correu electrònic:"
+#: addressbook/gui/component/ldap-config.glade.h:20
+#, fuzzy
+msgid "Download limit:"
+msgstr "Límit de baixa_da:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "L'Evolution utilitzarà el DN per autenticar-vos al servidor"
+#: addressbook/gui/component/ldap-config.glade.h:21
+#, fuzzy
+msgid "Email address"
+msgstr "Adreça de correu electrònic:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "L'Evolution utilitzarà l'adreça de correu electrònic per autenticar-vos al "
 "servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "Finished"
-msgstr "Ha finalitzat"
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Find Possible Search Bases"
+msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
-#: calendar/gui/dialogs/calendar-setup.glade.h:11 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "Group:"
-msgstr "Grup:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:24 mail/mail-account-gui.c:68
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mai"
 
-# fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:26
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
-msgstr ""
-"Heu d'especificar com voleu connectar-vos al servidor d'LDAP. Alguns "
-"servidors utilitzen els\n"
-"protocols SSL (Secure Socket Layer) i TLS (Transport Layer Security) per "
-"protegir les connexions mitjançant xifratge.\n"
-"Consulteu l'administrador de sistemes si el servidor d'LDAP utilitza aquests "
-"protocols."
+msgid "Only locations within starting point"
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Ba_se de la cerca:"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Search base only"
+msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:29
-msgid "One"
-msgstr "One"
+#, fuzzy
+msgid "Search base:"
+msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:30
-msgid "S_earch scope: "
+#, fuzzy
+msgid "Search scope:"
 msgstr "Àmbit de la c_erca: "
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:31
-msgid "Searching"
-msgstr "S'està cercant"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només es connectarà al servidor "
 "d'LDAP\n"
 "si aquest suporta SSL o TLS."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només intentarà utilitzar l'SSL/TLS "
 "si esteu\n"
@@ -673,13 +775,12 @@ msgstr ""
 "segura."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Si seleccioneu aquesta opció indiqueu que el vostre servidor no suporta ni "
 "SSL ni TLS.\n"
@@ -687,96 +788,35 @@ msgstr ""
 "sereu vulnerables als errors\n"
 "de seguretat."
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:41
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-"Si seleccioneu aquesta opció podreu modificar els paràmetres predeterminats "
-"de les cerques d'LDAP de l'Evolution i de la creació i edició dels "
-"contactes. "
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"Specifying a\n"
-"\t\t\t  display name and group is the first step in setting\n"
-"\t\t\t  up an address book."
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "Starting point and locations within it"
 msgstr ""
-"El primer pas\n"
-"\t\t\t  de la configuració d'una llibreta d'adreces és especificar\n"
-"\t\t\t  un nom i grup per a la visualització."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
-msgid "Step 1: Folder Characteristics"
-msgstr "Pas 1: Característiques de la carpeta"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "Step 2: Server Information"
-msgstr "Pas 2: Informació del servidor"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 3: Connecting to Server"
-msgstr "Pas 3: Connectar-se al servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 4: Searching the Directory"
-msgstr "Pas 4: Cercar el directori"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-"Les opcions d'aquesta pàgina defineixen la quantitat d'entrades que "
-"s'haurien d'incloure\n"
-"a les cerques i la durada esperada de les cerques. Pregunteu a "
-"l'administrador del sistema\n"
-"si heu de modificar aquestes opcions."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "La base de la cerca és el nom distingit (DN) de l'entrada on començaran les "
 "cerques.\n"
 "Si ho deixeu en blanc, la cerca començarà a l'arrel de l'arbre de directoris."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "L'àmbit de la cerca defineix fins a quina profunditat voleu que la cerca\n"
 "estengui l'arbre de directoris. L'àmbit de cerca 'sub' inclourà  totes les\n"
@@ -785,24 +825,7 @@ msgstr ""
 "vostra base.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:61
-msgid ""
-"This assistant will help you\n"
-"\t      create a new address book. \n"
-"\n"
-"Depending on the type of address book you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"L'assistent us ajudarà a\n"
-"\t      crear una nova llibreta d'adreces.\n"
-"\n"
-"Es necessitaran més paràmetres en funció del tipus de la llibreta d'adreces\n"
-"que creeu. Si necessiteu ajuda per trobar la informació poseu-vos en\n"
-"contacte amb l'administrador del sistema."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:67
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -810,10 +833,10 @@ msgstr ""
 "És el nom complet del servidor d'LDAP. Per exemple, 'ldap.mycompany.com'."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "És el nombre màxim d'entrades a baixar. Si especifiqueu un nombre massa "
@@ -821,7 +844,7 @@ msgstr ""
 "retardarà la llibreta d'adreces."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -832,133 +855,133 @@ msgstr ""
 "d'LDAP."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "El nom d'aquest servidor que apareixerà a la llista de carpetes de "
 "l'Evolution.\n"
 "Només s'utilitza per visualitzar-la."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:73
-#: calendar/gui/dialogs/calendar-setup.glade.h:34
-msgid ""
-"This is the name that will appear in your Evolution folder list. It is for "
-"display purposes only. "
-msgstr ""
-"El nom que apareixerà a la vostra llista de carpetes de l'Evolution. Només "
-"s'utilitza per visualitzar-la."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "És el port d'LDAP on s'intentarà connectar l'Evolution.\n"
 "S'ha proporcionat una llista de ports estàndard. Pregunteu a "
 "l'administrador\n"
 "del sistema quin port heu d'especificar."
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:77
-msgid "This option controls how long a search will be run."
-msgstr "L'opció especifica la durada de l'execució de la cerca."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:78
-msgid "U_se SSL/TLS:"
-msgstr "Utilitza _SSL/TLS:"
+# fitxer: calendar.ca.po.5
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "Timeout:"
+msgstr "Format de l'hora:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "S'està utilitzant el nom distingit (DN)"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "S'està utilitzant l'adreça de correu electrònic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:81 mail/mail-account-gui.c:67
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Sempre que sigui possible"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:82
-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 ""
-"Heu decidit configurar un servidor d'LDAP. El primer pas és definir-ne el "
-"nom i la\n"
-"informació d'entrada. Si no esteu segur d'aquestes dades pregunteu-ho a "
-"l'administrador del sistema."
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:84
-#: calendar/gui/dialogs/calendar-setup.glade.h:37
-msgid "_Display name:"
-msgstr "Nom _de visualització"
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "_Add Contacts Group"
+msgstr "Afegeix als contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Límit de baixa_da:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:86
-msgid "_Log in method:"
-msgstr "_Mètode d'entrada:"
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "_Email address:"
+msgstr "Adreça de correu electrònic:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "_Port number:"
-msgstr "Nombre del _port:"
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "_Search base:"
-msgstr "Ba_se de la cerca:"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Log in method:"
+msgstr "_Mètode d'entrada:"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:89
-msgid "_Server name:"
-msgstr "Nom del _servidor:"
+# fitxer: camel.ca.po.4
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Entrada"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "_Timeout (minutes):"
-msgstr "_Temps d'espera (minuts):"
+# fitxer: mail.ca.po.1
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
+msgstr "_Nom:"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:91
-msgid "cards"
-msgstr "targetes"
+# fitxer: calendar.ca.po.4
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
+msgid "_Port:"
+msgstr "_Prioritat:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:92
-msgid "connecting-tab"
-msgstr "pestanya-connexió"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Àmbit de la c_erca: "
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:93
-msgid "general-tab"
-msgstr "pestanya-general"
+# fitxer: mail.ca.po.1
+#: addressbook/gui/component/ldap-config.glade.h:56
+#, fuzzy
+msgid "_Server:"
+msgstr "S_ervidor:"
+
+# fitxer: calendar.ca.po.5
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Format de l'hora:"
+
+# fitxer: mail.ca.po.1
+#: addressbook/gui/component/ldap-config.glade.h:58
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "_Utilitza una conexió segura (SSL):"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:94
-msgid "searching-tab"
-msgstr "pestanya-cerca"
+#: addressbook/gui/component/ldap-config.glade.h:59
+msgid "cards"
+msgstr "targetes"
+
+# fitxer: calendar.ca.po.5
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: mail/mail-config.glade.h:183
+msgid "minutes"
+msgstr "minuts"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
@@ -966,41 +989,41 @@ msgid "Evolution Addressbook name selection interface"
 msgstr "Interfície de selecció del nom de la llibreta d'adreces de l'Evolution"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:207
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
 msgid "Remove All"
 msgstr "Suprimeix-los tots"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:214
-#: addressbook/gui/component/select-names/e-select-names.c:693
-#: calendar/gui/dialogs/cal-prefs-dialog.c:659
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Suprimeix"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:221
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Mostra la llista de contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:221
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact Info"
 msgstr "Mostra la informació del contacte"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:228
-#: addressbook/gui/component/select-names/e-select-names-popup.c:338
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 msgid "Send HTML Mail?"
 msgstr "Voleu enviar correus HTML?"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:330
-#: addressbook/gui/widgets/eab-popup-control.c:1001
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Afegeix als contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names-popup.c:356
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr "Contacte sense nom"
 
@@ -1014,12 +1037,12 @@ msgstr "Nom"
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Font"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names.c:494
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Selecciona els contactes de la llibreta d'adreces"
@@ -1049,245 +1072,289 @@ msgstr "C_ategoria:"
 msgid "_Find"
 msgstr "_Cerca"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid " B_usiness:"
-msgstr " F_eina:"
+# fitxer: widgets.ca.po
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Cerca"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: designs.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "<b>Email</b>"
+msgstr "<b>Enviar correu electrònic:</b>"
+
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "A_ddress..."
-msgstr "A_dreça..."
+#, fuzzy
+msgid "<b>Home</b>"
+msgstr "<b>Llavors</b>"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "A_ssistant's name:"
-msgstr "Nom de l'a_judant:"
+#, fuzzy
+msgid "<b>Instant Messaging</b>"
+msgstr "Missatgeria instantània"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Addressbook:"
-msgstr "Llibreta d'adreces:"
+#, fuzzy
+msgid "<b>Job</b>"
+msgstr "<b>Si</b>"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: smime.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Anni_versary:"
-msgstr "Ani_versari:"
+#, fuzzy
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Valor del camp</b>"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Birthda_y:"
-msgstr "Data de na_ixement:"
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>Llavors</b>"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "Blog address:"
-msgstr "Adreça de la bitàcola:"
+#, fuzzy
+msgid "<b>Telephone</b>"
+msgstr "<b>Llavors</b>"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "Business fa_x:"
-msgstr "Fa_x de la feina:"
+msgid "<b>Web Addresses</b>"
+msgstr ""
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "Collaboration"
-msgstr "Col·laboració"
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "<b>Si</b>"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:1202
-#: addressbook/gui/contact-editor/e-contact-editor.c:2019
-msgid "Contact Editor"
-msgstr "Editor de contactes"
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "AIM"
+msgstr "AIM"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "D_epartment:"
-msgstr "D_epartament:"
+#, fuzzy
+msgid "Address:"
+msgstr "_Adreça:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
-msgid "Details"
-msgstr "Detalls"
+#, fuzzy
+msgid "Anniversary:"
+msgstr "Ani_versari:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Enter the person's instant messenger accounts here."
-msgstr "Introduïu-hi els comptes de missatgeria instantània de la persona."
+#, fuzzy
+msgid "Assistant:"
+msgstr "Assistent"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "F_ree/Busy URL:"
-msgstr "URL de lliu_re/ocupat:"
+#, fuzzy
+msgid "Birthday:"
+msgstr "Data de na_ixement:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.4
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "File a_s:"
-msgstr "Anomena i de_sa:"
+msgid "Calendar:"
+msgstr "Calendari:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Full _Name..."
-msgstr "_Nom complet..."
+#, fuzzy
+msgid "City:"
+msgstr "Pob_lació:"
+
+# fitxer: camel.ca.po.3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#, fuzzy
+msgid "Company:"
+msgstr "Ordre:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid ""
-"If this person has the ability to participate in a video conference, enter "
-"their address here."
-msgstr ""
-"Si aquest persona pot participar en una videoconferència, introduïu-ne "
-"l'adreça."
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
+msgid "Contact"
+msgstr "Contacte"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr ""
-"Si la persona publica informació de lliure/ocupat o qualsevol altra "
-"relacionada amb el calendari a internet,\n"
-"introduïu-ne l'adreça."
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
+msgid "Contact Editor"
+msgstr "Editor de contactes"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#, fuzzy
+msgid "Country:"
+msgstr "Paí_s:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Instant Messaging"
-msgstr "Missatgeria instantània"
+#, fuzzy
+msgid "Department:"
+msgstr "D_epartament:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "New phone type"
-msgstr "Nou tipus de telèfon"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "URL de lliu_re/ocupat:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "No_tes:"
-msgstr "No_tes:"
+msgid "Full _Name..."
+msgstr "_Nom complet..."
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Organi_zation:"
-msgstr "Organit_zació:"
+#, fuzzy
+msgid "Home Page:"
+msgstr "Pàgina inicial"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "P_rofession:"
-msgstr "P_rofessió:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
+msgstr "Missatgeria de l'MSN"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: smime.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Primary _email:"
-msgstr "Adreça _electrònica primària:"
+#, fuzzy
+msgid "Mailing Address"
+msgstr "Adreça de correu electrònic"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "S_pouse:"
-msgstr "Con_juge:"
+#, fuzzy
+msgid "Manager:"
+msgstr "Administrador"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Wants to receive _HTML mail"
-msgstr "Voleu rebre correu _HTML"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "Sobre_nom:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Add"
-msgstr "_Afegeix"
+#, fuzzy
+msgid "Notes:"
+msgstr "No_tes:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: camel.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Business:"
-msgstr "_Feina:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr "Novell Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Categories..."
-msgstr "_Categories..."
+#, fuzzy
+msgid "Office:"
+msgstr "_Oficina:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#. FIXME: need to disable for undeletable folders
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-#: calendar/gui/dialogs/meeting-page.c:651
-#: calendar/gui/e-calendar-table.c:1060 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1281 calendar/gui/e-calendar-view.c:1312
-#: mail/em-folder-tree.c:2517 mail/em-folder-view.c:769
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Suprimeix"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41 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:43
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
-msgid "_Edit"
-msgstr "_Edita"
+#, fuzzy
+msgid "PO Box:"
+msgstr "A_partat de correus:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Home:"
-msgstr "_Inici"
+#, fuzzy
+msgid "Personal Information"
+msgstr "Informació diària"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Job title:"
-msgstr "_Càrrec:"
+#, fuzzy
+msgid "Profession:"
+msgstr "P_rofessió:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Manager's name:"
-msgstr "Nom de l'ad_ministrador:"
+#, fuzzy
+msgid "Spouse:"
+msgstr "Con_juge:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Mobile:"
-msgstr "_Mòbil:"
+#, fuzzy
+msgid "State/Province:"
+msgstr "E_stat/província:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "_Nickname:"
-msgstr "Sobre_nom:"
+#, fuzzy
+msgid "Title:"
+msgstr "_Títol:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "_Office:"
-msgstr "_Oficina:"
+msgid "Video Chat:"
+msgstr ""
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
-msgid "_Public Calendar URL:"
-msgstr "URL del calendari _públic:"
+#, fuzzy
+msgid "Wants to receive HTML mail"
+msgstr "Voleu rebre correu _HTML"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
+# fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "_This is the mailing address"
-msgstr "És l'adreça elec_trònica"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Pàgina web:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
+#. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-msgid "_Video Conferencing URL:"
-msgstr "URL del sistema de _videoconferència:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
+msgid "Work"
+msgstr "Feina"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:44
-msgid "_Web page address:"
-msgstr "Adreça de la pàgina _web:"
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr "_Codi postal:"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "Categories"
+
+# fitxer: composer.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "Nom del fitxer:"
+
+# fitxer: mail.ca.po.1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#, fuzzy
+msgid "_Where:"
+msgstr "S_ervidor:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:316
-#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adreça"
 
@@ -1295,14 +1362,14 @@ msgstr "Adreça"
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: 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:119
-#: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:173
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -2521,16 +2588,10 @@ msgstr "Zimbabwe"
 msgid "AOL Instant Messenger"
 msgstr "Missatgeria instantània de l'AOL"
 
-# fitxer: camel.ca.po.3
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
-
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:2835
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2540,29 +2601,21 @@ msgid "Yahoo Messenger"
 msgstr "Missatgeria del Yahoo"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
-msgstr "Missatgeria de l'MSN"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:2838
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:328
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#: addressbook/gui/contact-editor/e-contact-editor.c:704
 msgid "Service"
 msgstr "Servei"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: addressbook/gui/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/cal-prefs-dialog.c:426
-#: calendar/gui/e-cal-list-view.etspec.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 msgid "Location"
 msgstr "Ubicació"
 
@@ -2572,118 +2625,102 @@ msgid "Username"
 msgstr "Nom d'usuari"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:246
-#: addressbook/gui/contact-editor/e-contact-editor.c:2503
-#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Particular"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#. red
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:250
-#: addressbook/gui/contact-editor/e-contact-editor.c:2803
-#: filter/filter-label.c:122 mail/em-migrate.c:924 mail/mail-config.c:66
-#: mail/mail-config.glade.h:155
-msgid "Work"
-msgstr "Feina"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:254
-#: addressbook/gui/contact-editor/e-contact-editor.c:2504
-#: addressbook/gui/contact-editor/e-contact-editor.c:2807
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Altres"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:217
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+# fitxer: camel.ca.po.3
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Groupwise"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Llibreta d'adreces d'origen"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:224
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Llibreta d'adreces objectiu"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:231
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-#: addressbook/gui/widgets/e-minicard.c:180
-msgid "Contact"
-msgstr "Contacte"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:238
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "És un contacte nou"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:245
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Camps d'escriptura"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modificat"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:718
-msgid "Account Name"
-msgstr "Nom del compte"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1485
-msgid "Category editor not available."
-msgstr "L'editor de categories no està disponible."
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1493
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Aquest contacte pertany a les categories:"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-msgid "Save Contact as VCard"
-msgstr "Desa el contacte com a VCard"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2502
-msgid "Business"
-msgstr "Feina"
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Seleccioneu entre les següents opcions"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2834
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
-msgid "AIM"
-msgstr "AIM"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#, fuzzy
+msgid "No image"
+msgstr "Níger"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2836
-#: addressbook/gui/widgets/eab-contact-display.c:312
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Yahoo"
-msgstr "Yahoo"
+# fitxer: calendar.ca.po.4
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#, fuzzy
+msgid ""
+"The contact data is invalid:\n"
+"\n"
+msgstr "La data de periodicitat no és vàlida"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2837
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "MSN"
-msgstr "MSN"
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contacte"
 
-# fitxer: camel.ca.po.3
-#: addressbook/gui/contact-editor/e-contact-editor.c:2839
-msgid "GroupWise"
-msgstr "Groupwise"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:3126
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"No s'ha pogut trobar l'element de la interfície gràfica per a un camp: '%s'"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
@@ -2697,7 +2734,7 @@ msgstr "_Edita el complet"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Nom compl_et:"
 
@@ -2707,7 +2744,7 @@ msgid "E-_mail:"
 msgstr "Correu electrò_nic:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2716,7 +2753,7 @@ msgstr ""
 "suprimir aquests contactes?"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -2875,59 +2912,83 @@ msgstr "_Ubicació:"
 msgid "\n"
 msgstr "\n"
 
-# fitxer: addressbook.gui.contact-list-editor.ca.po
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Selecciona els contactes de la llibreta d'adreces"
+
+# fitxer: addressbook.gui.contact-list-editor.ca.po
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membres"
 
+# fitxer: composer.ca.po
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Elimina els elements seleccionats de la llista de fitxers adjunts"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionada"
+
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Oculta les adreces quan s'en_viï un correu a aquesta llista"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Nom de la _llista:"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Escriviu una adreça de correu o arrossegueu un con_tacte a la llista de sota:"
 
-# fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "contact-list-editor"
-msgstr "editor de la llista de contactes"
+# fitxer: calendar.ca.po.5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "diàleg1"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Llibreta"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "És una llista nova"
 
+# fitxer: calendar.ca.po.3
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Participants necessaris"
+
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:211
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:753
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor de la llista de contactes"
 
-# fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:431
-msgid "Save List as VCard"
-msgstr "Desa la llista com a VCard"
-
 # fitxer: addressbook.gui.merging.ca.po
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2974,8 +3035,8 @@ msgstr ""
 
 # fitxer: addressbook.gui.search.ca.po
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
-#: widgets/misc/e-filter-bar.c:154
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Cerca avançada"
 
@@ -2995,9 +3056,9 @@ msgstr[1] "%d contactes"
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Consulta"
 
@@ -3012,109 +3073,110 @@ msgid "Model"
 msgstr "Model"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:114
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "El nom comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "El correu electrònic comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoria és"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avançat..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipus"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2031
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Desa com a VCard"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Nou contacte..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova llista de contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Vés a la carpeta..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importa..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Cerca els contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Fonts de la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Configuració del Pilot..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenvia el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Envia un missatge al contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
@@ -3122,62 +3184,50 @@ msgid "Print"
 msgstr "Imprimeix"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimeix el sobre"
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copia a la llibreta d'adreces..."
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Mou a la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Retalla"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:434 calendar/gui/tasks-component.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Enganxa"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1248
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Visualització actual"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1279
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"S'ha produït un error en el programa de suport\n"
-"de la llibreta d'adreces %s. Haureu de reiniciar l'Evolution per tornar-lo a "
-"utilitzar"
-
-# fitxer: addressbook.gui.widgets.ca.po
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1622
-#: calendar/gui/cal-search-bar.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
@@ -3218,6 +3268,8 @@ msgstr "Telèfon del cotxe"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: 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:3
 msgid "Categories"
 msgstr "Categories"
 
@@ -3228,19 +3280,19 @@ msgstr "Telèfon de la companyia"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:522 smime/lib/e-cert.c:774
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Adreça electrònica"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:460
+#: addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "Adreça electrònica 2"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:470
+#: addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "Adreça electrònica 3"
 
@@ -3291,7 +3343,7 @@ msgstr "Administrador"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
@@ -3302,7 +3354,7 @@ msgstr "Sobrenom"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "Note"
 msgstr "Nota"
 
@@ -3313,7 +3365,7 @@ msgstr "Oficina"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:305
+#: addressbook/gui/widgets/eab-contact-display.c:345
 msgid "Organization"
 msgstr "Organització"
 
@@ -3345,7 +3397,7 @@ msgstr "Ràdio"
 # fitxer: addressbook.gui.widgets.ca.po
 #: 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-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -3382,19 +3434,19 @@ msgstr "Lloc web"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:136
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Amplada"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:143
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Alçada"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:151
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Té el focus"
 
@@ -3424,7 +3476,7 @@ msgid "Column Width"
 msgstr "Amplada de la columna"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3439,7 +3491,7 @@ msgstr ""
 "Per crear un nou contacte cliqueu dues vegades."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3450,217 +3502,322 @@ msgstr ""
 "Aquesta visualització no té cap element a mostrar."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptador"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-minicard.c:159
+#: addressbook/gui/widgets/e-minicard.c:160
 msgid "Selected"
 msgstr "Seleccionada"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-minicard.c:166
+#: addressbook/gui/widgets/e-minicard.c:167
 msgid "Has Cursor"
 msgstr "Té el cursor"
 
-#: addressbook/gui/widgets/eab-contact-display.c:118
-#: addressbook/gui/widgets/eab-contact-display.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:128
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:498
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
 msgid "List Members"
 msgstr "Llista els membres"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:298
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
 # fitxer: mail.ca.po.1
-#: addressbook/gui/widgets/eab-contact-display.c:306
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Posició"
 
-# fitxer: calendar.ca.po.3
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "Groupwise"
-msgstr "Groupwise"
-
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:313
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr "Videoconferència"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Phone"
 msgstr "Telèfon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:315
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr "Fax"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:319
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "work"
 msgstr "feina"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr "www"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#: addressbook/gui/widgets/eab-contact-display.c:557
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Blog"
 msgstr "Bitàcola"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "personal"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:518
+#: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Càrrec"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:549
+#: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Pàgina inicial"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:47
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Correcte"
 
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:48
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1071
-msgid "Unknown error"
-msgstr "Error desconegut"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "El dipòsit està desconnectat"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "La llibreta d'adreces no existeix"
+
+# fitxer: addressbook.gui.component.ca.po
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova llista de contactes"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "No s'ha trobat el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "L'ID del contacte ja existeix"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "El protocol no està suportat"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:325 calendar/gui/e-cal-model-tasks.c:599
-#: calendar/gui/e-calendar-table.c:467 calendar/gui/e-tasks.c:209
-#: calendar/gui/print.c:2349 camel/camel-service.c:728
-#: camel/camel-service.c:766 camel/camel-service.c:850
-#: camel/camel-service.c:890 camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
+# fitxer: calendar.ca.po.3
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "No s'ha pogut obrir la font"
+
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "S'ha produït un error en l'autenticació"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Es necessita autenticació"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "El TLS no està disponible"
 
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Address Book does not exist"
-msgstr "La llibreta d'adreces no existeix"
+# fitxer: camel.ca.po.3
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "No existeix el missatge"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Un altre error"
 
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:86
-msgid "Do you want to save changes?"
-msgstr "Voleu desar els canvis?"
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"No s'ha pogut obrir la llibreta d'adreces. Comproveu que el camí existeixi i "
+"que hi teniu permís d'accés."
 
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:88
-msgid "_Discard"
-msgstr "_Descarta"
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"No s'ha pogut obrir la llibreta d'adreces perquè l'URI que heu introduït és "
+"incorrecte o el servidor d'LDAP no està disponible."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Aquesta versió de l'Evolution no està compilada amb el suport per a LDAP. Si "
+"voleu utilitzar l'Evolution amb l'LDAP heu d'obtenir l'OpenLDAP de l'enllaç "
+"de sota i compilar el programa a partir del codi font del CVS."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"No s'ha pogut obrir la llibreta d'adreces perquè l'URI introduït és "
+"incorrecte o el servidor no està disponible."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"El nombre de targetes que compleixen els criteris de la consulta\n"
+"superen el nombre màxim que pot visualitzar l'Evolution, o el que pot "
+"retornar el servidor.\n"
+"Feu una cerca més específica o augmenteu el límit\n"
+"del resultat en les preferències del servidor de directoris d'aquesta\n"
+"llibreta d'adreces."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"El temps d'execució d'aquesta consulta ha superat el límit del servidor o\n"
+"l'especificat en la configuració de la llibreta d'adreces. Feu una consulta\n"
+"més específica o augmenteu el límit de temps en les preferències del\n"
+"servidor de directori de la llibreta d'adreces."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"El programa de suport de la llibreta d'adreces no ha pogut analitzar la "
+"consulta."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"El programa de suport de la llibreta d'adreces ha refusat realitzar aquesta "
+"consulta."
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "S'ha produït un error en l'execució d'aquesta consulta."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:107
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "S'ha produït un error en afegir la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:107
-#: addressbook/gui/widgets/eab-gui-util.c:525
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Error adding contact"
 msgstr "S'ha produït un error en afegir el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:116
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "S'ha produït un error en modificar la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:116
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying contact"
 msgstr "S'ha produït un error en modificar el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:126
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "S'ha produït un error en suprimir la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:126
-#: addressbook/gui/widgets/eab-gui-util.c:483
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 msgid "Error removing contact"
 msgstr "S'ha produït un error en suprimir el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3670,7 +3827,7 @@ msgstr ""
 "Esteu segur de voler mostrar tots aquests contactes?"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:234
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3680,59 +3837,53 @@ msgstr ""
 "El voleu sobreescriure?"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:238
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "S'ha produït un error en desar el fitxer %s: %s"
-
-# fitxer: addressbook.gui.widgets.ca.po
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:311
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:444
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:579
+#: addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Move contact to"
 msgstr "Mou el contacte a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:581
+#: addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Copy contact to"
 msgstr "Copia el contacte a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:584
+#: addressbook/gui/widgets/eab-gui-util.c:640
 msgid "Move contacts to"
 msgstr "Mou els contactes a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:586
+#: addressbook/gui/widgets/eab-gui-util.c:642
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:589
+#: addressbook/gui/widgets/eab-gui-util.c:645
 msgid "Select target addressbook."
 msgstr "Selecciona la llibreta d'adreces destí."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:768
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Múltiples VCard"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:771
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per a %s"
@@ -3743,44 +3894,44 @@ msgstr "VCard per a %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:188
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(cap)"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:450
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Adreça electrònica principal"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:586
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Seleccioneu una acció"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:594
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Crea un nou contacte '%s'"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:610
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Afegeix l'adreça al contacte existent '%s'"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:888
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "S'està consultant la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:971
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Edita la informació del contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-popup-control.c:1026
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Combina les adreces electròniques"
 
@@ -3819,19 +3970,19 @@ msgid "GTK Tree View"
 msgstr "Visualització d'arbre del GTK"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Prova de reflux"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Copyright (C) 2000, Ximian, Inc."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Hauria de provar l'element de l'àrea de dibuix de reflux"
 
@@ -3865,13 +4016,13 @@ msgid "Print envelope"
 msgstr "Imprimeix el sobre"
 
 # fitxer: addressbook.printing.ca.po
-#: addressbook/printing/e-contact-print.c:1009
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
 # fitxer: addressbook.printing.ca.po
-#: addressbook/printing/e-contact-print.c:1075
-#: addressbook/printing/e-contact-print.c:1102
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Imprimeix el contacte"
 
@@ -4108,16 +4259,23 @@ msgid "This should test the contact print code"
 msgstr "Es provarà el codi d'impressió de contactes"
 
 # fitxer: addressbook.tools.ca.po
-#: 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
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "No es pot obrir el fitxer"
 
-# fitxer: addressbook.tools.ca.po
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "No es pot carregar la URI"
+# fitxer: addressbook.conduit.ca.po
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "No s'ha pogut carregar la llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "No es pot obrir la llibreta d'adreces"
 
 # fitxer: addressbook.tools.ca.po
 #: addressbook/tools/evolution-addressbook-export.c:56
@@ -4207,96 +4365,371 @@ msgid "No filename provided."
 msgstr "No s'ha proporcionat cap nom de fitxer."
 
 # fitxer: addressbook.util.ca.po
-#: addressbook/util/eab-destination.c:677
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Llista sense nom"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+# fitxer: mail.ca.po.3
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "No ho suprimeixis"
+
+# fitxer: calendar.ca.po.5
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Envia a:"
+
+# fitxer: calendar.ca.po.5
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Esteu segur de voler cancel·lar i suprimir aquesta reunió?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Esteu segur de voler suprimir %d tasca?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Esteu segur de voler cancel·lar i suprimir aquesta entrada del diari?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Esteu segur de voler suprimir %d entrada del diari?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Esteu segur de voler suprimir la cita '%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Esteu segur de voler suprimir %d cita?"
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Esteu segur de voler suprimir la tasca '%s'?"
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Esteu segur de voler suprimir l'entrada del diari '%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Esteu segur de voler suprimir la cita '%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Esteu segur de voler suprimir la tasca '%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Esteu segur de voler suprimir l'entrada del diari '%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Cita"
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Esteu segur de voler suprimir %d cita?"
+
+# fitxer: calendar.ca.po.4
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
+
+# fitxer: calendar.ca.po.4
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Descarta els canvis"
+
+# fitxer: calendar.ca.po.4
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "_Descarta els canvis"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Envia"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+# fitxer: calendar.ca.po.2
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Importador del vCalendar de l'Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 # fitxer: calendar.ca.po.5
-#: calendar/common/authentication.c:37 calendar/gui/itip-utils.c:1158
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduïu la contrasenya"
 
 # fitxer: calendar.ca.po.5
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Divideix els esdeveniments de múltiples dies:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/conduits/calendar/calendar-conduit.c:1320
-#: calendar/conduits/todo/todo-conduit.c:857
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
 # fitxer: calendar.ca.po.5
-#: 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"
-
-# fitxer: calendar.ca.po.5
-#: calendar/conduits/calendar/calendar-conduit.c:1436
 #: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de calendari del Pilot"
 
 # fitxer: calendar.ca.po.5
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Prioritat predeterminada:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/conduits/todo/todo-conduit.c:945
-#: calendar/conduits/todo/todo-conduit.c:948
+#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació de ToDo del Pilot"
 
-# fitxer: calendar.ca.po.5
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendari i tasques"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
 msgid "Calendars"
 msgstr "Calendaris"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configureu el vostre fus horari, la llista de calendaris i tasques."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Tasques i calendari de l'Evolution"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Control de configuració de l'Evolution Calendar"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visualitzador de missatges de planificació de l'Evolution Calendar"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visualitzador de l'Evolution Calendar"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor del calendari/tasques de l'Evolution"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visualitzador de tasques de l'Evolution"
-
-# fitxer: calendar.ca.po.5
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Component de calendari de l'Evolution"
@@ -4308,84 +4741,91 @@ msgstr "Component de tasques de l'Evolution"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1139 calendar/gui/print.c:1819
-#: calendar/gui/tasks-control.c:516 calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:709
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tasques"
 
 # fitxer: calendar.ca.po.5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendaris"
+
+# fitxer: views.ca.po
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasques"
+
+# fitxer: calendar.ca.po.5
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servei de notificació per alarma de l'Evolution Calendar"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "S'inicia:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Finalitza:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:253
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarma de l'Evolution"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:346
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarma a %s"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Ta_nca"
+#, fuzzy
+msgid "Snooze _time (minutes):"
+msgstr "Temps de migdiada (minuts)"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Mi_gdiada"
+msgid "_Edit appointment"
+msgstr "_Edita la cita"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "Temps de migdiada (minuts)"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr "_Edita la cita"
+#, fuzzy
+msgid "_Snooze"
+msgstr "Mi_gdiada"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: calendar/gui/alarm-notify/alarm-queue.c:872
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Obre"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Descarta"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:876
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Descarta-ho tot"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:941
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "No hi ha cap descripció disponible"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:959
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4399,13 +4839,13 @@ msgstr ""
 "Finalitza a %s"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-#: calendar/gui/alarm-notify/alarm-queue.c:1079
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Avís"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4418,7 +4858,7 @@ msgstr ""
 "una caixa de diàleg de recordatori normal."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:1085
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4436,27 +4876,22 @@ msgstr ""
 "Esteu segur de voler executar aquest programa?"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "No facis més preguntes sobre aquest programa."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/notify-main.c:163
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/notify-main.c:166
-msgid "Could not initialize gnome-vfs"
-msgstr "No s'ha pogut inicialitzar el gnome-vfs"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/notify-main.c:175
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "No s'ha pogut crear la factoria de serveis de notificació per alarma"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/alarm-notify/util.c:37 calendar/gui/e-tasks.c:111
+#: calendar/gui/alarm-notify/util.c:37
 msgid "invalid time"
 msgstr "l'hora no es vàlida"
 
@@ -4569,29 +5004,28 @@ msgstr ""
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
-msgid "The view showing when the calendar starts"
-msgstr "La visualització que mostra quan s'inicia el calendari"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Time last alarm ran"
 msgstr "L'última vegada que es va executar l'alarma"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Units for determining when to hide tasks"
 msgstr "Unitats per determinar quan amagar les tasques"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units of default reminder"
 msgstr "Unitats de la notificació predeterminada"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
 msgid "Weekday the week starts on"
 msgstr "Dia de la setmana en que comença"
 
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
 # fitxer: calendar.ca.po.5
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -4643,19 +5077,21 @@ msgid "Location contains"
 msgstr "La ubicació conté"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:363 mail/mail-ops.c:1005
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Sense coincidència"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1596
-#: camel/providers/groupwise/camel-gw-listener.c:302
-#: camel/providers/groupwise/camel-gw-listener.c:326
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 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 "
@@ -4665,42 +5101,43 @@ msgstr ""
 "temps seleccionat, si continueu no podreu recuperar-los."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Buida els esdeveniments anteriors a"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:362
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:15
+#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dies"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 # fitxer: calendar.ca.po.5
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:692
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-week-view-main-item.c:329
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
@@ -4708,96 +5145,102 @@ 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:464
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
 #: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:373
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "S'eliminarà el calendari '%s'. Esteu segur de voler continuar?"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:432
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Nou calendari"
 
+# fitxer: calendar.ca.po.3
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "S'està carregant el calendari..."
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/calendar-component.c:917
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
+msgstr ""
+"No s'ha pogut obrir el calendari '%s' per crear esdeveniments i reunions"
+
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:923
+#: calendar/gui/calendar-component.c:929
+msgid "There is no calendar available for creating events and meetings"
+msgstr "No hi ha cap calendari disponible per crear esdeveniment i reunions"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nova cit_a"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:924
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "Cit_a"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:925
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:930
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nova reunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:931
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "R_eunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:932
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Crea una nova petició de reunió"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:937
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nova cita de tot el dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:938
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Cita de tot el _dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:939
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Crea una nova cita de tot el dia"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:944
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nou calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:945
-msgid "C_alendar"
-msgstr "C_alendari"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:946
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Crea un nou calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:1013
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr ""
-"No s'ha pogut obrir el calendari '%s' per crear esdeveniments i reunions"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/calendar-component.c:1025
-msgid "There is no calendar available for creating events and meetings"
-msgstr "No hi ha cap calendari disponible per crear esdeveniment i reunions"
-
-# fitxer: calendar.ca.po.5
 #: calendar/gui/calendar-offline-handler.c:192
 #, c-format
 msgid "backend_go_offline(): %s"
@@ -4830,17 +5273,17 @@ msgid "Month View"
 msgstr "Visualització mensual"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "S'ha produït un error en obrir el calendari"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "El mètode per obrir el calendari no està suportat"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "No teniu permís per obrir el calendari"
 
@@ -4850,240 +5293,195 @@ msgstr "No teniu permís per obrir el calendari"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "No s'ha pogut obrir la carpeta a '%s'"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/control-factory.c:192
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrarà el calendari"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/control-factory.c:199
-msgid "The type of view to show"
-msgstr "El tipus de visualització a mostrar"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:466
-msgid "Audio Alarm Options"
-msgstr "Opcions de l'alarma de l'àudio"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:475
-msgid "Message Alarm Options"
-msgstr "Opcions de l'alarma dels missatges"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:484
-msgid "Email Alarm Options"
-msgstr "Opcions de l'alarma del correu electrònic"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:493
-msgid "Program Alarm Options"
-msgstr "Opcions de l'alarma del programa"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:509
-msgid "Unknown Alarm Options"
-msgstr "Es desconeixen les opcions de l'alarma"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Repetició de l'alarma"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Missatge a visualitzar:"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Missatge a enviar"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Reprodueix el so:"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repeteix l'alarma"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Executa el programa:"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Envia a:"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Amb aquests arguments:"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
-msgid "dialog1"
-msgstr "diàleg1"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "temps extra per cada"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "hores"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:17
-msgid "minutes"
-msgstr "minuts"
+# fitxer: calendar.ca.po.3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Comença:</b> "
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.c:800
-msgid "Action/Trigger"
-msgstr "Acció/activador"
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opcions de la llista de tasques</b>"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_fegeix"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Previsualització</b>"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Bàsics"
+# fitxer: mail.ca.po.3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Afegeix una adreça"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/hora:"
+# fitxer: composer.ca.po
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Redacta un missatge"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Mostra un missatge"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
+
+# fitxer: views.ca.po
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Missatges"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reprodueix un so"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Recordatoris"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executa un programa"
 
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Envia a:"
+
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Envia un correu electrònic"
 
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "D_epartament:"
+
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:164
-msgid "Summary:"
-msgstr "Resum:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Executa el programa"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcions..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repeteix l'alarma"
+
+# fitxer: shell.ca.po
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Compte:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "després de"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "abans de"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dies"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "final de la cita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "temps extra per cada"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hores"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:40
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "hores"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuts"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "inici de la cita"
 
 # fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Acció/activador"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_fegeix"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarma a %s"
+
+# fitxer: calendar.ca.po.5
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:415 mail/em-account-prefs.c:492
-#: mail/em-composer-prefs.c:670 mail/em-composer-prefs.c:898
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Habilitat"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.c:656
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
 msgid "Are you sure you want to remove this URL?"
 msgstr "Esteu segur de voler suprimir aquesta URL?"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.c:664
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
 msgid "Don't Remove"
 msgstr "No el suprimeixis"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.c:710
-#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:773 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:398
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Inhabilita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.c:710
-#: calendar/gui/dialogs/cal-prefs-dialog.c:742
-#: calendar/gui/dialogs/cal-prefs-dialog.c:775 mail/em-account-prefs.c:314
-#: mail/em-account-prefs.c:355 mail/em-account-prefs.c:400
-#: mail/em-composer-prefs.c:589 mail/em-composer-prefs.c:647
-#: mail/em-composer-prefs.c:677
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Habilita"
 
@@ -5112,284 +5510,302 @@ msgstr "30 minuts"
 msgid "60 minutes"
 msgstr "60 minuts"
 
-# fitxer: calendar.ca.po.5
+# fitxer: calendar.ca.po.3
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alertes"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Comença:</b> "
 
-# fitxer: calendar.ca.po.5
+# fitxer: calendar.ca.po.3
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Llavors</b>"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Opcions de la llista de tasques</b>"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Llavors</b>"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Setmana laborable"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Paràmetres del calendari i les tasques"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Color de les tasques retrassades"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Color de les tasques que vencen avui"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "_El dia acaba:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dies"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: mail/mail-config.glade.h:74
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Visualització"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Habi_lita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "Publicació _lliure/ocupat"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Divendres"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Hores"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuts"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Dilluns"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "d_g"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Dissabte"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "M_ostra un recordatori"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Mostra el _número de setmana en el navegador de dates"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Diumenge"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "T_asques que vencen avui:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "d_j"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Llista de tasques"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Dijous"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Hora"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Fu_s horari:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Dimarts"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "La s_etmana comença:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Dimecres"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Setmana laborable"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Dies laborables:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 hores (am/pm)"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 hores"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Afegeix una URL"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Sol·licit_a la confirmació en la supressió dels elements"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Comprimeix els caps de setmana en visualitzacions mensuals"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "El _dia comença:"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Visualització"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Publicació _lliure/ocupat"
+# fitxer: addressbook.gui.component.ca.po
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 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:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Edita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "d_v"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_General"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Amaga les tasqu_es completades després de"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "d_l"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Tasq_ues retrassades:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "d_s"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Mo_stra les hores de finalització de les cites en visualitzacions setmanals "
 "i mensuals"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Divisions de _temps:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "d_m"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "d_c"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:156
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Heu d'especificar una ubicació d'on obtenir el calendari."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:164
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "La ubicació de l'origen '%s' no està ben formada."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "La ubicació del origen '%s' no es un origen del webcal."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:216
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "L'origen amb el nom '%s' ja existeix en el grup seleccionat"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:229
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -5398,233 +5814,121 @@ msgstr ""
 "El grup '%s' és remot. Heu d'especificar una ubicació d'on obtenir el "
 "calendari"
 
-# fitxer: calendar.ca.po.5
+# fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Calendar Creation Assistant"
-msgstr "Assistent de creació de calendaris"
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Afegeix un nou calendari"
 
-# fitxer: calendar.ca.po.5
+# fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Calendar Properties"
-msgstr "Propietats del calendari"
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grup de la llista de tasques"
 
-# fitxer: calendar.ca.po.5
+# fitxer: mail.ca.po.2
 #: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid ""
-"Congratulations, you are finished setting up this calendar.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"Felicitats, heu finalitzat la configuració d'aquest calendari.\n"
-"\n"
-"Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid ""
-"Congratulations, you are finished setting up this task list.\n"
-"\n"
-"Please click the \"Apply\" button to save the settings you have entered here."
-msgstr ""
-"Felicitats, heu finalitzat la configuració d'aquesta llista de tasques.\n"
-"\n"
-"Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: calendar/gui/tasks-component.c:363
-msgid "New Task List"
-msgstr "Nova llista de tasques"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "Remote"
-msgstr "Remota"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid ""
-"Specifying a display name and group is the first step in setting up a "
-"calendar."
-msgstr ""
-"El primer pas de configuració d'un calendari és especificar un nom i grup de "
-"visualització."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
-msgid ""
-"Specifying a display name and group is the first step in setting up a task "
-"list."
-msgstr ""
-"El primer pas de configuració d'una llista de tasques és especificar un nom "
-"i grup de visualització."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
-msgid "Step 2: Remote Folder Parameters"
-msgstr "Pas 2: paràmetres de la carpeta remota"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
-msgid "Task List Creation Assistant"
-msgstr "Assistent de creació de llistes de tasques"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
-msgid "Task List Properties"
-msgstr "Propietats de la llista de tasques"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:24
-msgid ""
-"This assistant will help you create a new calendar. \n"
-"\n"
-"Depending on the type of calendar you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"Aquest assistent us ajudarà a crear un nou calendari.\n"
-"\n"
-"En funció del tipus de calendari que creeu caldran\n"
-"paràmetres addicionals. Poseu-vos en contacte amb el vostre\n"
-"administrador de sistemes si necessiteu ajuda per trobar\n"
-"aquesta informació."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:29
-msgid ""
-"This assistant will help you create a new task list.\n"
-"\n"
-"Depending on the type of task list you create, additional\n"
-"parameters may be required. Please contact your system\n"
-"administrator if you need help finding this information."
-msgstr ""
-"Aquest assistent us ajudarà a crear una nova llista de tasques.\n"
-"\n"
-"En funció del tipus de llista de tasques que creeu caldran paràmetres\n"
-"addicionals. Poseu-vos en contacte amb el vostre administrador de sistema\n"
-"si necessiteu ajuda per trobar aquesta informació."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:35
-msgid ""
-"You're creating a folder in a group that's stored in a remote location. This "
-"requires you\n"
-"to specify additional parameters."
-msgstr ""
-"Esteu creant una carpeta en un grup que està desat en una ubicació remota. "
-"Per a aquesta opció\n"
-"heu d'especificar paràmetres addicionals."
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:38
-msgid "_Refresh Interval:"
-msgstr "Intè_rval d'actualització:"
+#, fuzzy
+msgid "C_olor:"
+msgstr "Colors"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:39
-msgid "_Source URL:"
-msgstr "URL d'o_rigen:"
+# fitxer: mail.ca.po.1
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Agafa un color"
 
-# fitxer: calendar.ca.po.5
-#: 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'esdeveniment que esteu suprimint és una reunió, voleu enviar una "
-"notificació de cancel·lació?"
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Afegeix un nou calendari"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta reunió?"
+# fitxer: calendar.ca.po.3
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Grup"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"La tasca que se suprimirà està assignada, voleu enviar una notificació de "
-"cancel·lació?"
+# fitxer: calendar.ca.po.3
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Refresca"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta tasca?"
+# fitxer: addressbook.printing.ca.po
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipus:"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"L'entrada del diari que s'està suprimint està publicada, voleu enviar una "
-"notificació de cancel·lació?"
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta entrada del diari?"
+# fitxer: filter.ca.po
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "setmanes"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "S'ha suprimit l'esdeveniment."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "S'ha suprimit la tasca."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "S'ha suprimit l'entrada del diari."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s No heu realitzat cap canvi, voleu tancar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "S'ha modificat l'esdeveniment."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "S'ha modificat la tasca."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "s'ha modificat l'entrada del diari."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s No heu realitzat cap canvi, voleu actualitzar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "S'ha produït un error de validació: %s"
@@ -5655,61 +5959,54 @@ msgid "Due "
 msgstr "Venciment"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:424
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "No s'ha pogut actualitzar l'objecte"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:899
-#: calendar/gui/dialogs/comp-editor.c:936
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Edita la cita"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:907
-#: calendar/gui/dialogs/comp-editor.c:944
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tasca - %s"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:910
-#: calendar/gui/dialogs/comp-editor.c:947
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diari - %s"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:921
-#: calendar/gui/dialogs/comp-editor.c:957
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Sense resum"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:1382
-#: calendar/gui/e-calendar-table.c:1193 calendar/gui/e-calendar-view.c:1006
-#: composer/e-msg-composer.c:1155
-msgid "Save as..."
-msgstr "Anomena i desa..."
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:1485
-#: calendar/gui/dialogs/comp-editor.c:1509
-#: calendar/gui/dialogs/comp-editor.c:1535
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Els canvis realitzats en aquest element es descartaran en produir-se una "
 "actualització"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/comp-editor.c:1574
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "No s'ha pogut utilitzar la versió actual"
 
@@ -5728,131 +6025,75 @@ msgid "Destination is read only"
 msgstr "El destí només es pot llegir"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Esteu segur de voler suprimir la cita '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Esteu segur de voler suprimir aquesta cita sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Esteu segur de voler suprimir la tasca '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Esteu segur de voler suprimir aquesta tasca sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Esteu segur de voler suprimir l'entrada del diari '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Esteu segur de voler suprimir aquesta entrada del diari sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Esteu segur de voler suprimir %d cita?"
-msgstr[1] "Esteu segur de voler suprimir %d cites?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Esteu segur de voler suprimir %d tasca?"
-msgstr[1] "Esteu segur de voler suprimir %d tasques?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Esteu segur de voler suprimir %d entrada del diari?"
-msgstr[1] "Esteu segur de voler suprimir %d entrades del diari?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'entrada del diari perquè s'ha produït un error del "
 "corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'element perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè us han denegat el permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir la tasca perquè no teniu permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'entrada del diari perquè no teniu permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'element perquè us han denegat el permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "No s'ha pogut suprimir l'entrada del diari perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'element perquè s'ha produït un error"
 
-# fitxer: calendar.ca.po.4
+# fitxer: addressbook.gui.component.ca.po
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Llibreta d'adreces..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contactes"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
@@ -5865,192 +6106,264 @@ msgid "Enter Delegate"
 msgstr "Introduïu el delegat"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-editor.c:207
-msgid "Reminder"
-msgstr "Recordatori"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Periodicitat"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Planificació"
 
+# fitxer: addressbook.printing.ca.po
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientació"
+
 # fitxer: calendar.ca.po.4
-#: 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
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunió"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "L'esdeveniment no té data d'inici"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "L'esdeveniment no té data de fi"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "La data d'inici és errònia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "La data de finalització és errònia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "L'hora d'inici és errònia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "L'hora de finalització és errònia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No s'ha pogut obrir el calendari '%s'."
 
-# fitxer: calendar.ca.po.4
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "abans de cada cita"
+msgstr[1] "abans de cada cita"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "final de la cita"
+msgstr[1] "final de la cita"
+
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "abans de cada cita"
+msgstr[1] "abans de cada cita"
+
+# fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Esdeveniment de tot e_l dia"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "abans de cada cita"
 
-# fitxer: calendar.ca.po.4
+# fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Oc_upat"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "abans de cada cita"
 
-# fitxer: calendar.ca.po.4
+# fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "abans de cada cita"
 
-# fitxer: calendar.ca.po.4
+# fitxer: addressbook.gui.component.ca.po
 #: calendar/gui/dialogs/event-page.glade.h:5
-msgid "Calendar:"
-msgstr "Calendari:"
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Contactes</b>"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classificació"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Data i hora"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidencial"
+msgid "A_ll day event"
+msgstr "Esdeveniment de tot e_l dia"
 
-# fitxer: calendar.ca.po.4
+# fitxer: widgets.ca.po
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data i hora"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Desa la visualització personalitzada..."
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Lliu_re"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "Ubicaci_ó:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendari:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classificació"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pú_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidencial"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Mostra l'hora com a"
+msgid "L_ocation:"
+msgstr "Ubicaci_ó:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privat"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Públic"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Mostra l'hora com a"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Resu_m:"
 
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+# fitxer: widgets.ca.po
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Neteja"
+
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descripció:"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Hora d_e finalització:"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
 # fitxer: calendar.ca.po.4
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:591 composer/e-msg-composer.c:2136
-#: mail/em-account-prefs.c:453 mail/em-folder-view.c:778
-#: mail/mail-account-gui.c:1366 mail/mail-account-gui.c:1860
-#: mail/mail-config.glade.h:100
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:193
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Cap"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.c:418
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "L'organitzador seleccionat ja no té cap compte."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.c:424
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "És necessari un organitzador."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.c:439
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Com a mínim és necessari un assistent."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.c:647
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delega a..."
 
 # fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Sup_rimeix"
+
+# fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Assistents"
@@ -6093,41 +6406,51 @@ msgstr "Membre"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estat"
 
-# fitxer: calendar.ca.po.4
+# fitxer: calendar.ca.po.3
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Afegeix assis_tents"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Finalitza:</b> "
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "<b>Organizer</b>"
 msgstr "Organitzador:"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
 msgstr "_Canvia l'organitzador"
 
+# fitxer: addressbook.gui.component.ca.po
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contactes"
+
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Conv_ida a altres..."
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organitzador:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -6211,279 +6534,219 @@ msgid "All Instances"
 msgstr "Tots els casos"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Aquesta cita conté periodicitats que l'Evolution no pot editar."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "La data de periodicitat no és vàlida"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "el"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "primer"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "segon"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "tercer"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "quart"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "últim"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Un altra data"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "al"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "aparicions"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/hora"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Cada"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Excepcions"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Previsualització"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Regla de periodicitat"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Periodi_citat personalitzada"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modifica"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Previsualització</b>"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Se_nse periodicitat"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Periodicitat"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:452
-msgid "_Remove"
-msgstr "Sup_rimeix"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Periodicitat _simple"
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Edita la cita"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "per"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "per sempre"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesos"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "fins"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "setmanes"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "anys"
 
 # fitxer: calendar.ca.po.4
-#: 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 ""
-"L'esdeveniment s'ha modificat però no s'ha desat.\n"
-"\n"
-"Voleu desar els canvis?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/save-comp.c:57 composer/e-msg-composer.c:1572
-msgid "_Discard Changes"
-msgstr "_Descarta els canvis"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Desa l'esdeveniment"
-
-# fitxer: shell.ca.po
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Seleccioneu la font"
-
-# fitxer: calendar.ca.po.4
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:84
+#, fuzzy
+msgid "Select destination"
 msgstr "Seleccioneu el destí %s"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "calendari"
-
-# fitxer: calendar.ca.po.2
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "llista de tasques"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "S'ha creat la informació de la reunió. Voleu enviar-la?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"S'ha modificat la informació de la reunió. Voleu enviar-ne una versió "
-"actualitzada?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "S'ha creat la informació d'assignació de la tasca. Voleu enviar-la?"
+# fitxer: mail.ca.po.2
+#: calendar/gui/dialogs/select-source-dialog.c:106
+#, fuzzy
+msgid "_Destination"
+msgstr "Carpeta de destí:"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"S'ha modificat la informació de la tasca. Voleu enviar-ne una versió "
-"actualitzada?"
+# fitxer: calendar.ca.po.5
+#: calendar/gui/dialogs/select-source-dialog.c:108
+msgid "Task List"
+msgstr "Llista de tasques"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "La data de finalització és errònia"
 
-# fitxer: calendar.ca.po.4
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Tipus de lletra del missatge</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _completada"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alertes</span>"
 
 # fitxer: calendar.ca.po.4
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:323 calendar/gui/e-cal-model-tasks.c:597
-#: calendar/gui/e-calendar-table.c:466 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/e-tasks.c:206
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completada"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:391 calendar/gui/e-tasks.c:227
-#: mail/message-list.c:947
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:321 calendar/gui/e-cal-model-tasks.c:595
-#: calendar/gui/e-cal-model-tasks.c:657 calendar/gui/e-calendar-table.c:465
-#: calendar/gui/e-tasks.c:203 calendar/gui/print.c:2343
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En procés"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:393 calendar/gui/e-tasks.c:231
-#: mail/message-list.c:945
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baixa"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:392
-#: calendar/gui/e-tasks.c:229 mail/message-list.c:946
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:319 calendar/gui/e-cal-model-tasks.c:593
-#: calendar/gui/e-calendar-table.c:464 calendar/gui/e-tasks.c:213
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "No s'ha iniciat"
 
-# fitxer: calendar.ca.po.4
+# fitxer: calendar.ca.po.2
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progrés"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percentatge acabat: %i"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:394
+#: calendar/gui/e-calendar-table.c:377
 msgid "Undefined"
 msgstr "No s'ha definit"
 
@@ -6507,51 +6770,46 @@ msgstr "E_stat:"
 msgid "_Web Page:"
 msgstr "Pàgina _web:"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-editor.c:193
-msgid "Basic"
-msgstr "Bàsic"
+# fitxer: calendar.ca.po.2
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tasca"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Assignació"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "La data de venciment és errònia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-page.c:547 calendar/gui/e-cal-model-tasks.c:738
-#: calendar/gui/e-cal-model-tasks.c:766
-msgid "Due date is before start date!"
-msgstr "La data de venciment és anterior a la data d'inici."
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-page.c:840
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No s'han pogut obrir les tasques a '%s'."
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opcions</span>"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:243
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
-msgid "Description:"
-msgstr "Descripció:"
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Suprimeix el correu</span>"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Carpeta:"
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+msgid "Description:"
+msgstr "Descripció:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-page.glade.h:10
@@ -6563,64 +6821,69 @@ msgstr "Data d'ini_ci:"
 msgid "_Due date:"
 msgstr "_Data de venciment:"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Credencials d'autenticació del servidor d'HTTP"
+# fitxer: addressbook.gui.component.ca.po
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grup:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendaris seleccionats per a la publicació"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opcions del calendari</b>"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Diari"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Freqüència de publicació"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Editor de lliure/ocupat"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Ubicació de la publicació lliure/ocupat"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Ubicació de la publicació lliure/ocupat"
+msgid "Free/Busy Editor"
+msgstr "Editor de lliure/ocupat"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nom d'usuari:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Diari"
 
-# fitxer: calendar.ca.po.4
+# fitxer: shell.ca.po
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Contrasenya:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Correu:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Freqüència de publicació"
+#, fuzzy
+msgid "_Password:"
+msgstr "Contrasenya:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Recorda la contrasenya"
 
-# fitxer: calendar.ca.po.4
+# fitxer: mail.ca.po.2
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nom d'usuari:"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publicacions de l'usuari"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Setmanalment"
 
 # fitxer: calendar.ca.po.4
@@ -6716,73 +6979,100 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s per a un tipus d'activador desconegut"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:369
-msgid "Public"
-msgstr "Públic"
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
+#, c-format
+msgid "Click to open %s"
+msgstr "Cliqueu per obrir %s"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:370
-msgid "Private"
-msgstr "Privat"
+# fitxer: filter.ca.po
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Sense títol"
 
-# fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:371
-msgid "Confidential"
-msgstr "Confidencial"
+# fitxer: calendar.ca.po.5
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resum:"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Data d'inici:"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Data de venciment:"
+
+# fitxer: calendar.ca.po.3
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:956
+msgid "Status:"
+msgstr "Estat:"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioritat:"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
+msgstr "Pàgina web:"
 
 # fitxer: mail.ca.po.3
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "Data de finalització"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-list-view.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:4
 msgid "Start Date"
 msgstr "Data d'inici"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
 msgid "Summary"
 msgstr "Resum"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
 msgid "Free"
 msgstr "Lliure"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Ocupat"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "N"
 msgstr "N"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:275
+#: calendar/gui/e-cal-model-tasks.c:302
 msgid "S"
 msgstr "S"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:277 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:277
+#: calendar/gui/e-cal-model-tasks.c:304
 msgid "W"
 msgstr "O"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:545
+#: calendar/gui/e-cal-model-tasks.c:601
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6793,192 +7083,217 @@ msgstr ""
 "45.436845,125.862501"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sí"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:966 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
 # fitxer: calendar.ca.po.4
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1665 camel/camel-gpg-context.c:1716
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
 #: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2133
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:61
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Es desconeix"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model.c:872
+#: calendar/gui/e-cal-model.c:911
 msgid "Recurring"
 msgstr "Periòdic"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model.c:874
+#: calendar/gui/e-cal-model.c:913
 msgid "Assigned"
 msgstr "Assignat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:413
+#: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:414
+#: calendar/gui/e-calendar-table.c:397
 msgid "10%"
 msgstr "10%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:415
+#: calendar/gui/e-calendar-table.c:398
 msgid "20%"
 msgstr "20%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:416
+#: calendar/gui/e-calendar-table.c:399
 msgid "30%"
 msgstr "30%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:417
+#: calendar/gui/e-calendar-table.c:400
 msgid "40%"
 msgstr "40%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:418
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:419
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr "60%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:420
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr "70%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr "80%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:422
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr "90%"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-calendar-table.c:406
 msgid "100%"
 msgstr "100%"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:701 calendar/gui/e-calendar-view.c:626
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:864 calendar/gui/e-calendar-view.c:727
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1081
-#: calendar/gui/e-calendar-view.c:1261 calendar/gui/e-calendar-view.c:1328
-#: mail/em-folder-view.c:744 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Obre"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1041
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Obre una pàgina _web"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1334
-#: mail/em-folder-view.c:746 mail/em-popup.c:689 mail/em-popup.c:804
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1240 calendar/gui/e-calendar-view.c:1263
-#: calendar/gui/e-calendar-view.c:1332 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Im_primeix..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1047 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1310
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Re_talla"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1048 calendar/gui/e-calendar-table.c:1074
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1308
-#: mail/em-folder-tree.c:2510 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1244 calendar/gui/e-calendar-view.c:1270
-#: calendar/gui/e-calendar-view.c:1330 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "E_nganxa"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Assigna una tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1054
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "R_eenvia com a iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Marca com a acabada"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca les tasques seleccionades com a acabades"
 
+# fitxer: addressbook.gui.contact-editor.ca.po
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Suprimeix"
+
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1061 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Suprimeix les tasques selecciona_des"
 
+# fitxer: calendar.ca.po.4
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Anomena i desa..."
+
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.c:1371
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliqueu per afegir una tasca"
 
@@ -6989,122 +7304,130 @@ msgid "% Complete"
 msgstr "% acabat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:602
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Acabat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Data de finalització"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Data de venciment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritat"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Data d'inici"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordre de les tasques"
 
+# fitxer: camel.ca.po.4
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "S'està movent els missatges"
+
+# fitxer: camel.ca.po.4
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "S'està copiant els missatges"
+
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1233 calendar/gui/e-calendar-view.c:1320
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nova cit_a..."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1234 calendar/gui/e-calendar-view.c:1322
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nou _esdeveniment de tot el dia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1235 calendar/gui/e-calendar-view.c:1324
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nova reunió"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1236 calendar/gui/e-calendar-view.c:1326
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nova tasca"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: calendar/gui/e-calendar-view.c:1250 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecciona av_ui"
 
 # fitxer: mail.ca.po.1
-#: calendar/gui/e-calendar-view.c:1251
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "_Selecciona data..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1255 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publica la informació lliure/ocupat"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: calendar/gui/e-calendar-view.c:1274
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
 # fitxer: mail.ca.po.3
-#: calendar/gui/e-calendar-view.c:1275
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1276
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Planifica la _reunió..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1313
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1283 calendar/gui/e-calendar-view.c:1314
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1316
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Vés a _avui"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1318
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Vés a una _data..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1336 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Configu_ració..."
 
 # fitxer: calendar.ca.po.3
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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"
@@ -7112,10 +7435,6 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 
 # fitxer: calendar.ca.po.3
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -7142,11 +7461,7 @@ msgstr "%02i divisions de minut"
 # fitxer: calendar.ca.po.3
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view-top-item.c:688 calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
@@ -7154,35 +7469,32 @@ msgstr "%A, %d de %B"
 # fitxer: calendar.ca.po.3
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view-top-item.c:696 calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
 # fitxer: calendar.ca.po.3
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 # fitxer: calendar.ca.po.3
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:824 calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:591
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetició complexa)"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7190,7 +7502,7 @@ msgstr[0] "Cada dia"
 msgstr[1] "Cada %d dies"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:607
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7198,7 +7510,7 @@ msgstr[0] "Cada setmana"
 msgstr[1] "Cada %d setmanes"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:609
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7206,24 +7518,24 @@ msgstr[0] "Cada setmana el "
 msgstr[1] "Cada %d setmanes el "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:617
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " i "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:624
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "El %s dies de "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7231,7 +7543,7 @@ msgstr[0] "cada mes"
 msgstr[1] "cada %d mesos"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7239,7 +7551,7 @@ msgstr[0] "Cada any"
 msgstr[1] "Cada %d anys"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:659
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7247,439 +7559,399 @@ msgstr[0] " una vegada"
 msgstr[1] " un total de %d vegades"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:668
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", finalitza el "
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:692
-msgid "<b>Starts:</b> "
-msgstr "<b>Comença:</b> "
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:702
-msgid "<b>Ends:</b> "
-msgstr "<b>Finalitza:</b> "
+# fitxer: calendar.ca.po.4
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Starts"
+msgstr "Estat"
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:722
-msgid "<b>Completed:</b> "
-msgstr "<b>Acabat:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:732
-msgid "<b>Due:</b> "
-msgstr "<b>Venciment:</b> "
+# fitxer: calendar.ca.po.4
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Venciment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:769 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Informació de l'iCalendar"
 
 # fitxer: calendar.ca.po.3
 #. Title
-#: calendar/gui/e-itip-control.c:784
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Error de l'iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Una persona desconeguda"
 
 # fitxer: calendar.ca.po.3
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br>Reviseu la informació següent i sel·leccioneu una acció del menú de sota."
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:919
-msgid "<i>None</i>"
-msgstr "<i>Cap</i>"
-
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: calendar/gui/e-itip-control.c:930
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Ubicació:"
 
 # fitxer: calendar.ca.po.3
-#. write status
-#: calendar/gui/e-itip-control.c:944 calendar/gui/e-tasks.c:199
-msgid "Status:"
-msgstr "Estat:"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Acceptat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Provisionalment acceptat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declinat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Escolliu una acció:"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Actualitza"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1061 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "D'acord"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Accepta"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Accepta provisionalment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Declina"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Envia la informació lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Actualitza l'estat de la resposta"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:399 mail/mail-send-recv.c:451
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informació de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la presència del %s a la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la vostra presència a una reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Proposició de reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Actualització de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Petició d'actualització de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud d'una reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Resposta de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "En/na <b>%s</b> ha cancel·lat la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Cancel·lació de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "En/na <b>%s</b> ha enviat un missatge inintel·ligible,"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Missatge de reunió erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informació de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "En/na <b>%s</b> sol·licita que el %s realitzi una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "En/na <b>%s</b> us sol·licita que realitzeu una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Proposició de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Actualització de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Sol·licitud d'actualització de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "En/na <b>%s</b> ha contestat a l'assignació d'una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Resposta de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "En/na <b>%s</b> ha cancel·lat la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Cancel·lació de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Missatge de tasca erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "El <b>%s</b> ha publicat la informació lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Informació lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "En/na <b>%s</b> us sol·licita la informació lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Sol·licitud lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Resposta lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Missatge lliure/ocupat erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "El missatge no està ben format"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "El missatge només conté sol·licituds no suportades."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El fitxer adjunt no conté cap missatge de calendari vàlid"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1527
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "El fitxer adjunt no té cap element del calendari visualitzable"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1758
-msgid "Calendar file could not be updated!\n"
-msgstr "No s'ha pogut actualitzar el fitxer del calendari.\n"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "S'ha acabat l'actualització\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1790 calendar/gui/e-itip-control.c:1862
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"No es pot actualitzar l'estat de l'assistència perquè l'element no existeix"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1806 calendar/gui/e-itip-control.c:1844
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objecte no és vàlid i no es pot actualitzar\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1816
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-la "
 "com a assistent?"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1828
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "No s'ha pogut actualitzar l'estat de l'assistència perquè l'estat és "
 "invàlid\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1847
-msgid "There was an error on the CORBA system\n"
-msgstr "S'ha produït un error en el sistema CORBA\n"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1850
-msgid "Object could not be found\n"
-msgstr "No s'ha pogut trobar l'objecte\n"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1853
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "No teniu els permisos necessaris per actualitzar el calendari\n"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "S'ha actualitzat l'estat de l'assistència\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1859
-msgid "Attendee status could not be updated!\n"
-msgstr "No s'ha pogut actualitzar l'estat de l'assistència.\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"No es pot actualitzar l'estat de l'assistència perquè l'element no existeix"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1890
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "S'ha acabat la supressió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1913 calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "S'ha enviat l'element.\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1965
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "No s'ha pogut enviar l'element.\n"
 
@@ -7714,6 +7986,11 @@ msgstr "S'està carregant el calendari"
 msgid "Loading calendar..."
 msgstr "S'està carregant el calendari..."
 
+# fitxer: calendar.ca.po.4
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organitzador:"
+
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7730,88 +8007,82 @@ msgid "date-start"
 msgstr "Data d'inici"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Persones amb cadira"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
-msgid "Required Participants"
-msgstr "Participants necessaris"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participants opcionals"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Recursos"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grup"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurs"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Habitació"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Cadira"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 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 "Participació necessària"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participació opcional"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No es participa"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 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 "Precisa d'una acció"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 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 "Provisionalment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegat"
@@ -7825,19 +8096,15 @@ msgstr "En procés"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel.c:2053
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %d/%m/%Y"
@@ -7845,10 +8112,6 @@ msgstr "%a %d/%m/%Y"
 # fitxer: calendar.ca.po.3
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: 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:1604
 msgid "%m/%d/%Y"
@@ -7864,101 +8127,77 @@ msgstr "Fora de l'oficina"
 msgid "No Information"
 msgstr "Cap informació"
 
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opcions"
+# fitxer: addressbook.printing.ca.po
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Opcions"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:449
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Mostra només les h_ores de treball"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:459
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació i mostra-ho"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:474
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Tria _automàticament"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:539
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Totes les persones i recursos"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:548
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:557
+#, fuzzy
+msgid "_Required people"
 msgstr "Persones necessà_ries"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:566
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Hora d'_inici de la reunió:"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Hora de finalització de la r_eunió:"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:177
-msgid "Start Date:"
-msgstr "Data d'inici:"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:193
-msgid "Due Date:"
-msgstr "Data de venciment:"
-
-# fitxer: calendar.ca.po.3
-#. write priority
-#: calendar/gui/e-tasks.c:221
-msgid "Priority:"
-msgstr "Prioritat:"
-
-# fitxer: calendar.ca.po.3
-#. URL
-#: calendar/gui/e-tasks.c:277
-msgid "Web Page:"
-msgstr "Pàgina web:"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:310 mail/em-folder-view.c:2177
+#: calendar/gui/e-pub-utils.c:300
 #, c-format
-msgid "Click to open %s"
-msgstr "Cliqueu per obrir %s"
+msgid "Enter the password for %s"
+msgstr "Introduïu la contrasenya de %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:773 calendar/gui/gnome-cal.c:1899
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7968,88 +8207,57 @@ msgstr ""
 " %s"
 
 # fitxer: calendar.ca.po.3
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:792
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"El programa de suport de la tasca per a\n"
-"%s\n"
-" ha fallat."
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "S'estan carregant les tasques"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:872
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:893
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"S'ha produït un error en obrir %s:\n"
-"%s"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:912
-msgid "Loading tasks"
-msgstr "S'estan carregant les tasques"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:1014
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "S'estan acabant les tasques..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:1037
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "S'estan suprimint els objectes seleccionats..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:1063
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "S'està ampliant"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/gnome-cal.c:1760
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "S'estan actualitzant els objectes"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "S'estan carregant les cites a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1779
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1799
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1928
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"El suport del calendari per a '%s' ha fallat."
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1940
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"El suport de la tasca per a '%s' ha fallat."
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:2754
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "S'està buidant"
 
@@ -8191,13 +8399,7 @@ msgid "You must be an attendee of the event."
 msgstr "Heu d'assistir a l'esdeveniment."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/itip-utils.c:1157
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Introduïu la contrasenya de %s"
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/migration.c:137
+#: calendar/gui/migration.c:146
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
 "Evolution 1.x.\n"
@@ -8210,7 +8412,7 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes...<"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/migration.c:141
+#: calendar/gui/migration.c:150
 msgid ""
 "The location and hierarchy of the Evolution calendar folders has changed "
 "since Evolution 1.x.\n"
@@ -8223,16 +8425,35 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/migration.c:366
+#: calendar/gui/migration.c:376
 msgid "Birthdays & Anniversaries"
 msgstr "Aniversaris"
 
 # fitxer: calendar.ca.po.3
 #. Create the Webcal source group
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:529
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr "A la web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "No s'ha pogut obrir el calendari '%s'."
+
+# fitxer: calendar.ca.po.4
+#. FIXME: domain/code
+#: calendar/gui/migration.c:889
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "No s'han pogut obrir les tasques a '%s'."
+
 # fitxer: calendar.ca.po.3
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -8464,11 +8685,6 @@ msgid "Selected year (%Y)"
 msgstr "Any seleccionat (%Y)"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tasca"
-
-# fitxer: calendar.ca.po.2
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -8505,7 +8721,7 @@ msgstr "Contactes:"
 
 # fitxer: calendar.ca.po.2
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Previsualització de la impressió"
 
@@ -8520,66 +8736,84 @@ msgid "Print Setup"
 msgstr "Configuració de la impressió"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:302
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Se suprimirà la llista de tasques '%s'. Esteu segur de voler continuar?"
 
-# fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:560
-msgid "New task"
-msgstr "Nova tasca"
-
-# fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:561
-msgid "_Task"
-msgstr "_Tasca"
-
-# fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:562
-msgid "Create a new task"
-msgstr "Crea una nova tasca"
-
-# fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:567
-msgid "New task list"
+# fitxer: calendar.ca.po.5
+#: calendar/gui/tasks-component.c:371
+msgid "New Task List"
 msgstr "Nova llista de tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:568
-msgid "_Task List"
-msgstr "Llista de _tasques"
+#: calendar/gui/tasks-component.c:408
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "Nova tasca"
+msgstr[1] "Nova tasca"
 
-# fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:569
-msgid "Create a new task list"
-msgstr "Crea una llista de tasques nova"
+# fitxer: addressbook.gui.widgets.ca.po
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Seleccionada"
+msgstr[1] "Seleccionada"
+
+# fitxer: calendar.ca.po.3
+#: calendar/gui/tasks-component.c:457
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "S'estan carregant les tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:636
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "No es pot obrir la llista '%s' per crear els esdeveniments i reunions"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:648
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "No hi ha cap calendari disponible per crear les tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "L'URI de la carpeta de tasques a visualitzar"
+#: calendar/gui/tasks-component.c:1030
+msgid "New task"
+msgstr "Nova tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No s'han pogut carregar les tasques a '%s'"
+#: calendar/gui/tasks-component.c:1031
+msgid "_Task"
+msgstr "_Tasca"
+
+# fitxer: calendar.ca.po.2
+#: calendar/gui/tasks-component.c:1032
+msgid "Create a new task"
+msgstr "Crea una nova tasca"
+
+#: calendar/gui/tasks-component.c:1038
+#, fuzzy
+msgid "New tasks group"
+msgstr "Grups de notícies"
+
+# fitxer: calendar.ca.po.4
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
+msgstr "Grup de la llista de tasques"
+
+# fitxer: calendar.ca.po.2
+#: calendar/gui/tasks-component.c:1040
+#, fuzzy
+msgid "Create a new tasks group"
+msgstr "Crea una nova tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8592,12 +8826,12 @@ msgstr ""
 "Esteu segur de voler eliminar aquestes tasques?"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "No m'ho tornis a preguntar."
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Imprimeix les tasques"
 
@@ -8637,17 +8871,17 @@ msgid "Appointments and Meetings"
 msgstr "Cites i reunions"
 
 # fitxer: calendar.ca.po.2
-#: calendar/importers/icalendar-importer.c:494
+#: calendar/importers/icalendar-importer.c:490
 msgid "Reminder!!"
 msgstr "Recordatori"
 
 # fitxer: calendar.ca.po.2
-#: calendar/importers/icalendar-importer.c:702
+#: calendar/importers/icalendar-importer.c:698
 msgid "Calendar Events"
 msgstr "Esdeveniments del calendari"
 
 # fitxer: calendar.ca.po.2
-#: calendar/importers/icalendar-importer.c:727
+#: calendar/importers/icalendar-importer.c:723
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -8656,7 +8890,7 @@ msgstr ""
 "Voleu importar-los a l'Evolution?"
 
 # fitxer: calendar.ca.po.2
-#: calendar/importers/icalendar-importer.c:734
+#: calendar/importers/icalendar-importer.c:730
 msgid "Gnome Calendar"
 msgstr "Gnome Calendar"
 
@@ -10646,98 +10880,98 @@ msgid "Copy folder content locally for offline operation"
 msgstr "Copia el contingut de la carpeta localment per treballar desconnectat"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-disco-folder.c:101
+#: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
 msgstr "Descarrega els missatges nous per treballar desconnectat"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-disco-folder.c:441
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "S'està preparant la carpeta '%s' per treballar desconnectat"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-disco-store.c:377
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr "Heu d'estar connectat a la xarxa per completar aquesta operació"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "No s'ha pogut crear el conducte a '%s': %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "No s'ha pogut crear el procés fill '%s': %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "S'ha rebut un fluxe de missatge invàlid de %s: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "S'està sincronitzant les carpetes"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "S'ha produït un error en analitzar el filtre: %s. %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "S'ha produït un error en executar el filtre: %s. %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "No s'ha pogut obrir la carpeta per a cues"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "No s'ha pogut processar la carpeta per a cues"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "S'està obtenint el missatge %d (%d%%)"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "No es pot obrir el missatge"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "S'ha produït un error en el missatge %d"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "S'està sincronitzant la carpeta"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "S'està obtenint el missatge %d de %d"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "No s'ha pogut obtenir el missatge %d de %d"
@@ -10764,7 +10998,7 @@ msgid "Error executing filter search: %s: %s"
 msgstr "S'ha produït un error en executar la cerca de filtres: %s. %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -10774,7 +11008,7 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -10784,55 +11018,81 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 msgid "(match-all) requires a single bool result"
 msgstr "(concorda-amb-tot) necessita un únic resultat booleà"
 
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+# fitxer: camel.ca.po.4
+#: camel/camel-folder-search.c:784
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(concorda-amb-tot) necessita un únic resultat booleà"
+
+# fitxer: camel.ca.po.4
+#: camel/camel-folder-search.c:790
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(concorda-amb-tot) necessita un únic resultat booleà"
+
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "S'està realitzant una petició en una capçalera desconeguda: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:626
+#: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "No se suporta l'operació d'afegir un missatge per a %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1217
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "No se suporta l'operació de cerca per expressió per a %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1257
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "No se suporta l'operació de cerca per identificador d'usuari per a %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1374
+#: camel/camel-folder.c:1416
 msgid "Moving messages"
 msgstr "S'està movent els missatges"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1374
+#: camel/camel-folder.c:1416
 msgid "Copying messages"
 msgstr "S'està copiant els missatges"
 
-#: camel/camel-folder.c:1624
-msgid "Learning junk and/or non junk message(s)"
-msgstr "S'està aprenent si els missatges són brossa"
+# fitxer: calendar.ca.po.5
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Avís"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1653
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "S'està filtrant els nous missatges"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:710
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -10844,17 +11104,17 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:724
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:748
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "No s'ha pogut analitzar la petició de frase secreta del gpg."
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:762
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -10864,33 +11124,34 @@ msgstr ""
 "per a l'usuari: '%s'"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:779 camel/camel-gpg-context.c:1263
-#: camel/camel-gpg-context.c:1422 camel/camel-gpg-context.c:1508
-#: camel/camel-gpg-context.c:1615 mail/mail-ops.c:697
-#: mail/mail-send-recv.c:598
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "S'ha cancel·lat."
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:797
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "No s'ha pogut desbloquejar la clau secreta perquè s'han donat 3 frases "
 "incorrectes."
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:803
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada del GnuPG: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:847
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No s'ha pogut xifrar perquè no s'ha especificat cap destinatari vàlid"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1124
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -10902,48 +11163,48 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1129
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "No s'ha pogut signar %s amb el GPG: %s\n"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1242 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "No s'ha pogut escriure les dades: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1256 camel/camel-gpg-context.c:1664
-#: camel/camel-gpg-context.c:1715
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "No s'ha pogut executar el gpg: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1280 camel/camel-gpg-context.c:1414
-#: camel/camel-gpg-context.c:1501 camel/camel-gpg-context.c:1524
-#: camel/camel-gpg-context.c:1608 camel/camel-gpg-context.c:1632
-#: camel/camel-gpg-context.c:1686 camel/camel-gpg-context.c:1737
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "No s'ha pogut executar el gpg."
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1299
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Això és una part d'un missatge, signada digitalment"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1381 camel/camel-gpg-context.c:1390
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "No s'ha pogut verificar la signatura del missatge. El format del missatge no "
 "és correcte"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1397
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -10951,23 +11212,23 @@ msgstr ""
 "fitxer temporal: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1484
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No s'ha pogut generar les dades per xifrar: %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1542
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Això és una part del missatge xifrada digitalment"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1639 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contingut xifrat"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-gpg-context.c:1643
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "No s'ha pogut analitzar el contingut del missatge"
 
@@ -11329,7 +11590,7 @@ msgstr "Les credencials referenciades han caducat."
 #: 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:1197
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "La resposta d'autenticació del servidor és incorrecta."
 
@@ -11435,66 +11696,66 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "Ha fallat la compilació de l'expressió regular: %s. %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component de màquina remota"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camí"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "S'està resolent: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ha fallat la cerca del nom: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Ha fallat la cerca de la màquina remota: %s. No s'ha pogut crear el fluxe"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ha fallat la cerca de la màquina remota: %s. No s'ha trobat la màquina"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ha fallat la cerca de la màquina remota: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "S'està resolent l'adreça"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Ha fallat la cerca de la màquina remota: no s'ha trobat la màquina"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Ha fallat la cerca de la màquina remota"
 
@@ -11514,6 +11775,88 @@ msgstr ""
 msgid "Enter security pass-phrase for `%s'"
 msgstr "Introduïu la frase secreta per a '%s'"
 
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.4
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "No es pot obrir el missatge"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
+msgstr ""
+
+# fitxer: composer.ca.po
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "No s'ha pogut adjuntar el fitxer %s: %s"
+
+# fitxer: composer.ca.po
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "No s'ha pogut adjuntar el fitxer %s: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
+msgstr "No existeix la carpeta '%s'."
+
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+# fitxer: mail.ca.po.2
+#: camel/camel-smime-context.c:354
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Certi_ficats de xifratge:"
+
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
+msgstr ""
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "No s'ha pogut crear un bloqueig per a la carpeta %s: %s"
+
+# fitxer: mail.ca.po.1
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "No s'han pogut afegir a la carpeta local 'Enviat': %s"
+
+# fitxer: addressbook.gui.component.ca.po
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#, fuzzy
+msgid "Failed to encode data"
+msgstr "S'ha produït un error en l'autenticació.\n"
+
 # fitxer: camel.ca.po.3
 #: camel/camel-smime-context.c:514
 msgid "Unverified"
@@ -11551,7 +11894,8 @@ msgstr "L'algorisme de la signatura és desconegut"
 
 # fitxer: camel.ca.po.3
 #: camel/camel-smime-context.c:528
-msgid "Siganture algorithm unsupported"
+#, fuzzy
+msgid "Signature algorithm unsupported"
 msgstr "No se suporta l'algorisme de la signatura"
 
 # fitxer: camel.ca.po.3
@@ -11564,44 +11908,176 @@ msgstr "La signatura està mal formada"
 msgid "Processing error"
 msgstr "S'ha produït un error en processar"
 
+# fitxer: mail.ca.po.3
+#: camel/camel-smime-context.c:569
+#, fuzzy
+msgid "No signedData in signature"
+msgstr "La signatura no és vàlida"
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+#, fuzzy
+msgid "Cannot calculate digests"
+msgstr "No s'ha pogut crear la carpeta: %s. %s"
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "No es pot obtenir el missatge %s: %s"
+
+# fitxer: camel.ca.po.3
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "Hi ha un error en la signatura del certificat"
+
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
+msgstr ""
+
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
+msgstr ""
+
+# fitxer: mail.ca.po.1
+#: camel/camel-smime-context.c:635
+#, fuzzy
+msgid "Cannot find signature digests"
+msgstr "No s'ha pogut desar el fitxer de signatura: %s"
+
 # fitxer: camel.ca.po.3
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signador: %s <%s>: %s\n"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:214
+#: camel/camel-smime-context.c:752
+#, fuzzy
+msgid "Decoder failed"
+msgstr "L'ordre DATA ha fallat"
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:804
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+#: camel/camel-smime-context.c:811
+msgid "Cannot find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:820
+msgid "Cannot allocate slot for encryption bulk key"
+msgstr ""
+
+# fitxer: camel.ca.po.4
+#: camel/camel-smime-context.c:831
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "No es pot obrir el missatge"
+
+#: camel/camel-smime-context.c:837
+msgid "Cannot create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:843
+msgid "Cannot attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:849
+msgid "Cannot attach CMS data object"
+msgstr ""
+
+# fitxer: shell.ca.po
+#: camel/camel-smime-context.c:858
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr ""
+"No s'ha pogut crear la carpeta especificada:\n"
+"%s"
+
+#: camel/camel-smime-context.c:863
+msgid "Cannot add CMS RecipientInfo"
+msgstr ""
+
+# fitxer: camel.ca.po.2
+#: camel/camel-smime-context.c:888
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
+
+#: camel/camel-smime-context.c:974
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:981
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+# fitxer: camel.ca.po.1
+#: camel/camel-smime-context.c:1008
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "No s'ha implementat l'ordre"
+
+#: camel/camel-smime-context.c:1016
+msgid "export keys: unimplemented"
+msgstr ""
+
+# fitxer: camel.ca.po.3
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut obtenir la carpeta. L'operació és invàlida en aquest magatzem"
 
 # fitxer: camel.ca.po.2
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut crear la carpeta. L'operació és invàlida en aquest magatzem"
 
+# fitxer: camel.ca.po.2
+#: camel/camel-store.c:325
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix"
+
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:793
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.3
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Paperera"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Brossa"
 
@@ -11752,7 +12228,7 @@ msgid "Error in application verification"
 msgstr "S'ha produït un error en la verificació de l'aplicació"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -11766,12 +12242,12 @@ msgstr ""
 "Signatura:          %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "Correcte"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "Incorrecte"
 
@@ -11797,7 +12273,7 @@ msgstr ""
 
 # fitxer: camel.ca.po.3
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -11813,7 +12289,7 @@ msgstr ""
 "Voleu acceptar-lo?"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -11823,7 +12299,7 @@ msgstr ""
 "Emissor: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -11833,7 +12309,7 @@ msgstr ""
 "Emissor: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -11843,7 +12319,7 @@ msgstr ""
 "Emissor: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -11853,43 +12329,36 @@ msgstr ""
 "Emissor: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "No s'ha pogut analitzar la URL '%s'"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "S'ha produït un error en desar '%s': %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-folder.c:658
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existeix el missatge %s a %s"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-folder.c:824 camel/camel-vee-folder.c:830
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No s'ha pogut copiar o moure els missatges a la carpeta virtual"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
-
-# fitxer: camel.ca.po.3
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s. La carpeta no existeix"
@@ -11906,13 +12375,14 @@ msgstr "No es pot copiar els missatges a la carpeta Brossa"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
-#: camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "S'està comprovant si hi ha correu nou"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Comprova si hi ha correu nou a totes les carpetes"
 
@@ -11939,26 +12409,27 @@ msgid "Post Office Agent SOAP Port:"
 msgstr "Port SOAP de l'agent de l'oficina de correus:"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Per accedir els servidors Novell Groupwise"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Contrasenya"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -11967,8 +12438,8 @@ msgstr ""
 "de text sense xifrar."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: camel/providers/groupwise/camel-gw-listener.c:303
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Llista de comprovacions"
 
@@ -11976,17 +12447,27 @@ msgstr "Llista de comprovacions"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3022
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "S'ha cancel·lat l'operació"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3025
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor s'ha desconnectat inesperadament: %s"
 
+# fitxer: addressbook.gui.widgets.ca.po
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Error desconegut"
+
 # fitxer: camel.ca.po.3
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
@@ -12028,43 +12509,36 @@ msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta OK inesperada del servidor IMAP: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:323
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta es va destruir i es va tornar a crear al servidor."
 
 # fitxer: camel.ca.po.3
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:566
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "S'està cercant els missatges canviats"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:1960
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No es pot obtenir el missatge: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2007
-#: 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
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -12074,28 +12548,44 @@ msgstr ""
 "  %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2007
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "No existeix el missatge"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2041
-#: camel/providers/imap/camel-imap-folder.c:2643
-#: camel/providers/nntp/camel-nntp-folder.c:205
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Aquest missatge no està disponible actualment"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2307
-#: camel/providers/imap/camel-imap-folder.c:2377
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "S'està recollint la informació del resum per als nous missatges"
 
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2681
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta a FETCH."
 
@@ -12122,37 +12612,47 @@ msgstr "No s'ha pogut emmagatzemar %s a la memòria cau: %s"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-provider.c:43
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "S'està comprovant si hi ha correu nou"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap/camel-imap-provider.c:48
 msgid "Connection to Server"
 msgstr "Connexió al servidor"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap/camel-imap-provider.c:50
 msgid "Use custom command to connect to server"
 msgstr "Utilitza una ordre personalitzada per connectar amb el servidor"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:52
 msgid "Command:"
 msgstr "Ordre:"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr "Carpetes"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
 msgid "Show only subscribed folders"
 msgstr "Mostra únicament les carpetes subscrites"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
 msgid "Override server-supplied folder namespace"
 msgstr "Ignora l'espai de noms de carpeta proporcionat pel servidor"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
 msgid "Namespace"
 msgstr "Espai de noms"
 
@@ -12185,21 +12685,25 @@ msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor d'IMAP %s"
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei d'IMAP per a %s a %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -12208,75 +12712,78 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "L'SSL no està disponible"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:563
-#: camel/providers/imap/camel-imap-store.c:800
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "S'ha cancel·lat la connexió"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:634
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:635
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "No se suporta l'extensió SSL/TLS."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:666
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "S'ha produït un error en la negociació SSL"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:803
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No s'ha pogut connectar amb l'ordre '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1227
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no suporta el tipus d'autenticació sol·licitat (%s)"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No se suporta el tipus d'autenticació %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1260
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduïu la contrasenya IMAP per a %s@%s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1274
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "No heu introduït la contrasenya."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1303
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12288,23 +12795,30 @@ msgstr ""
 "\n"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1790
-#: camel/providers/imap/camel-imap-store.c:1883
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "La carpeta '%s' no existeix"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1801
-#: camel/providers/imap/camel-imap-store.c:2089
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "El nom de carpeta '%s' no és vàlid perquè conté el caràcter '%c'"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1824
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "La carpeta pare no pot contenir subcarpetes"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
@@ -12312,15 +12826,297 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:2100
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "La carpeta pare és desconeguda: %s"
 
+# fitxer: camel.ca.po.1
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:2150
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "La carpeta pare no pot contenir subcarpetes"
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "El servidor s'ha desconnectat inesperadament: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "No es pot afegir cap missatge a la carpeta mh: %s. %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "No es pot afegir cap missatge a la carpeta mh: %s. %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: mail.ca.po.2
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Amb aquesta opció es connectarà al servidor IMAP mitjançant una contrasenya "
+"de text sense xifrar."
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"No es pot connectar amb el servidor POP %s. No se suporta el mecanisme "
+"d'autenticació sol·licitat."
+
+# fitxer: camel.ca.po.1
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduïu la contrasenya SMTP per a %s a la màquina %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr ""
+"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "No s'ha pogut canviar el nom de la carpeta: %s. La carpeta no existeix"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr ""
+"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "No s'ha pogut canviar el nom de la carpeta %s a %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Ordre:"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+"No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr ""
+
+# fitxer: camel.ca.po.3
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "El servidor s'ha desconnectat inesperadament: %s"
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imapp/camel-imapp-provider.c:39
@@ -12360,22 +13156,22 @@ msgstr "Dades del cos de l'índex del missatge"
 
 # fitxer: camel.ca.po.2
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # fitxer: camel.ca.po.2
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "bústia de correu: %s (%s)"
 
 # fitxer: camel.ca.po.2
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -12446,67 +13242,67 @@ msgstr ""
 "També es pot usar per llegir un arbre de carpetes estil Elm, Pine o Mutt."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "L'arrel del magatzem (%s) no és un camí absolut"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "L'arrel del magatzem (%s) no és un directori normal"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "No s'ha pogut obtenir la carpeta: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Els magatzems locals no tenen bústia d'entrada"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fitxer de correu local %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta %s a %s: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No s'ha pogut canviar el nom a '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:385
+#: camel/providers/local/camel-local-store.c:423
 #: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "No s'ha pogut suprimir el fitxer de resum de la carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:395
+#: camel/providers/local/camel-local-store.c:433
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "No s'ha pogut suprimir el fitxer d'índex de carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -12523,25 +13319,52 @@ msgstr "No s'ha pogut desar el resum: %s. %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No s'ha pogut afegir el missatge al resum."
 
+# fitxer: mail.ca.po.3
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Bústia d'entrada"
+
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "No s'ha afegit cap missatge al maildir"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No s'ha pogut afegir el missatge a la carpeta maildir: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "El contingut del missatge no és vàlid"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
@@ -12549,7 +13372,7 @@ msgid "Cannot get folder `%s': %s"
 msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
@@ -12557,7 +13380,7 @@ msgid "Cannot get folder `%s': folder does not exist."
 msgstr "No existeix la carpeta '%s'."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
@@ -12565,28 +13388,28 @@ msgid "Cannot create folder `%s': %s"
 msgstr "No s'ha pogut crear la carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "'%s' no és un directori maildir."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No s'ha pogut suprimir la carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "no és un directori maildir"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:336
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:355
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No s'ha pogut cercar a la carpeta '%s': %s"
@@ -12642,30 +13465,20 @@ msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer de la bústia de correu: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: 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 ""
-"No es pot obtenir el missatge %s de la carpeta %s\n"
-"  %s"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Sembla que la carpeta està corrupta i no es pot arreglar."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Ha fallat la construcció del missatge. Potser la bústia està malmesa."
 
 # fitxer: camel.ca.po.2
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "No s'ha pogut crear una carpeta amb aquest nom."
 
@@ -12700,35 +13513,35 @@ msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta '%s' no està buida. No s'ha suprimit."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "No s'ha pogut crear el directori '%s': %s."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "No s'ha pogut crear la carpeta: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "La carpeta ja existeix"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "El nou nom de la carpeta no és vàlid."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "No s'ha pogut canviar el nom a '%s': '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s: %s"
@@ -12782,7 +13595,7 @@ msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-summary.c:592 mail/em-folder-tree.c:2472
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
@@ -12955,7 +13768,7 @@ msgstr ""
 
 # fitxer: camel.ca.po.2
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduïu la contrasenya NNTP per a %s@%s"
@@ -12976,19 +13789,10 @@ msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari o la contrasenya"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:140
-#: camel/providers/nntp/camel-nntp-folder.c:230
-#: 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 "Cancel·lat per l'usuari"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:142
-#: camel/providers/nntp/camel-nntp-folder.c:226
-#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -12998,81 +13802,58 @@ msgid "Cannot get message %s: %s"
 msgstr "No es pot obtenir el missatge %s: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:195
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: 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 "Cancel·lat per l'usuari"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 "S'ha produït un error intern. El format de l'identificador d'usuari no és "
 "vàlid: %s"
 
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "No s'ha pogut obtenir l'article %s del servidor NNTP"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:353
-msgid "Posting not allowed by news server"
-msgstr "El servidor de notícies no permet publicar"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:364
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"S'ha produït un error en enviar la capçalera del grup de notícies: %s. No "
-"s'ha publicat el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:404
-#: camel/providers/nntp/camel-nntp-folder.c:417
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"S'ha produït un error en publicar al grup de notícies: %s. No s'ha publicat "
-"el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:429
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"S'ha produït un error en llegir la resposta al missatge publicat. No s'ha "
-"publicat el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:432
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"S'ha produït un error en publicar el missatge: %s. No s'ha publicat el "
-"missatge"
+# fitxer: camel.ca.po.1
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "S'ha produït un error en l'operació: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:448
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "S'ha d'estar connectat per enviar missatges NNTP."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:459
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "No es pot copiar missatges d'una carpeta NNTP."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "No s'ha pogut obtenir la llista de grups del servidor."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
@@ -13110,30 +13891,33 @@ msgstr ""
 "contrasenya sense xifrar."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "L'ordre NNTP ha fallat: %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No s'ha pogut llegir la benvinguda de %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "El servidor NNTP %s ha retornat el codi d'error %d: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícies USENET mitjançant %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Error en el fluxe"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -13145,7 +13929,7 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -13156,7 +13940,7 @@ msgstr ""
 "no existeix el grup de notícies. Probablement, l'element és una carpeta pare."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -13166,73 +13950,74 @@ msgstr ""
 "notícies perquè aquest grup no existeix."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "No es pot crear una carpeta en un magatzem de notícies. Heu de subscriureu-"
 "us-hi."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "No es pot canviar el nom d'una carpeta en un magatzem de notícies."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "No es pot suprimir una carpeta en un magatzem de notícies. Heu de suprimir "
 "la subscripció."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "S'ha produït un error en la connexió: %s"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No existeix la carpeta '%s'"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Es precisa autenticació"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "No s'ha pogut obtenir el grup: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
 
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
-msgstr "No s'ha pogut obtenir els missatges. No s'ha especificat l'error"
+# fitxer: addressbook.gui.widgets.ca.po
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Cap contacte"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "L'ordre NNTP ha fallat: %s"
+msgid "No such folder: %s"
+msgstr "No existeix la carpeta '%s'"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: s'està cercant missatges nous"
 
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Resposta desconeguda del servidor: %s"
+# fitxer: camel.ca.po.3
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: camel.ca.po.4
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Resposta inesperada del GnuPG: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Cancel·la"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "S'ha produït un error en l'operació: %s"
@@ -13268,7 +14053,8 @@ msgid "Retrieving POP message %d"
 msgstr "S'està obtenint el missatge %d"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Raó desconeguda"
 
@@ -13289,7 +14075,7 @@ msgid "Disable support for all POP3 extensions"
 msgstr "Inhabilita el suport per a totes les extensions POP3"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -13325,22 +14111,28 @@ msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "No s'ha pogut connectar amb el servidor de POP %s (port %d): %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "No s'ha pogut connectar amb el servidor POP %s en mode segur: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "No s'ha pogut connectar amb el servidor POP %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -13350,13 +14142,13 @@ msgstr ""
 "d'autenticació sol·licitat."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Ha fallat l'entrada amb SASL '%s' al servidor POP %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
@@ -13364,20 +14156,20 @@ msgstr ""
 "SASL"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sIntroduïu la contrasenya POP per a %s a la máquina %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -13387,14 +14179,24 @@ msgstr ""
 "S'ha produït un error en enviar la contrasenya: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"No s'ha pogut connectar amb el servidor POP %s.\n"
+"S'ha produït un error en enviar la contrasenya: %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existeix la carpeta '%s'."
 
 # fitxer: camel.ca.po.1
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -13461,15 +14263,14 @@ msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
 # fitxer: camel.ca.po.1
 #: camel/providers/smtp/camel-smtp-provider.c:39
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr ""
-"Per lliurar correu connectant-se a una bústia remota fent servir SMTP."
+msgstr "Per lliurar correu connectant-se a una bústia remota fent servir SMTP."
 
 # fitxer: camel.ca.po.1
 #: camel/providers/smtp/camel-smtp-transport.c:174
@@ -13662,113 +14463,113 @@ msgstr ""
 "\n"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor d'SMTP %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Lliurament del correu SMTP mitjançant %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "No s'ha pogut enviar el missatge: el servei no està connectat."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "No s'ha pogut enviar el missatge: l'adreça del remitent no és vàlida."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Enviar missatges"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "No s'ha pogut enviar el missatge: no s'ha definit cap destinatari."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "No s'ha pogut enviar el missatge: un o més dels destinataris no són vàlids"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Benvinguda de l'SMTP"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "L'ordre HELO ha fallat: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "L'ordre HELO ha fallat"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Autenticació d'SMTP"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "S'ha produït un error en crear un objecte d'autenticació de SASL."
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "L'ordre AUTH ha fallat: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "L'ordre AUTH ha fallat"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "S'ha rebut una resposta incorrecta en autenticar-se al servidor.\n"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "L'ordre MAIL FROM ha fallat: %s: no s'ha enviat el correu"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "L'ordre MAIL FROM ha fallat"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "L'ordre RCPT TO ha fallat: %s: no s'ha enviat el correu"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Ha fallat RCPT TO <%s>"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "L'ordre DATA ha fallat: %s: no s'ha enviat el correu"
@@ -13777,68 +14578,68 @@ msgstr "L'ordre DATA ha fallat: %s: no s'ha enviat el correu"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "L'ordre DATA ha fallat"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "L'ordre RSET ha fallat: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "L'ordre RSET ha fallat"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "L'ordre QUIT ha fallat: %s"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "L'ordre QUIT ha fallat"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:105
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:111
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:302 mail/em-utils.c:1485
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "fitxer adjunt"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:453
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista de fitxers adjunts"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Adjunta un fitxer..."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:494
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -13872,16 +14673,11 @@ msgstr "Tipus MIME:"
 
 # fitxer: composer.ca.po
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
 msgid "Suggest automatic display of attachment"
 msgstr "Demana si s'ha de visualitzar el fitxer adjunt automàticament"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-hdrs.c:308
-msgid "You need to configure an account before you can compose mail."
-msgstr "Heu de configurar un compte abans de poder redactar un correu."
-
-# fitxer: composer.ca.po
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destí de l'enviament"
@@ -13972,217 +14768,285 @@ msgid "Click here to select folders to post to"
 msgstr "Cliqueu per seleccionar les carpetes on s'hi envia"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr "Adjunta fitxers"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:662
+#: composer/e-msg-composer.c:704
+#, fuzzy
 msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No s'ha pogut signar el missatge de sortida. No s'ha definit cap certificat "
 "de signatura per a aquest compte"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:668
+#: composer/e-msg-composer.c:711
+#, fuzzy
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
+"Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 "No s'ha pogut xifrar el missatge de sortida. No s'ha definit cap certificat "
 "de xifratge per a aquest compte"
 
+# fitxer: addressbook.tools.ca.po
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "No es pot obrir el fitxer"
+
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:799
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
-msgstr ""
-"S'ha produït un error en llegir el fitxer %s:\n"
-"%s"
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "No s'ha pogut recuperar el missatge de l'editor"
+
+# fitxer: mail.ca.po.1
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Missatges sense títol"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1170
-msgid "File exists, overwrite?"
-msgstr "El fitxer existeix. Voleu sobreescriure'l?"
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Obre un fitxer"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1181 composer/e-msg-composer.c:1197
-#, c-format
-msgid "Error saving file: %s"
-msgstr "S'ha produït un error en desar el fitxer: %s"
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Generat automàticament"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1221
-#, c-format
-msgid "Error loading file: %s"
-msgstr "S'ha produït un error en carregar el fitxer: %s"
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatura:"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1259
+#: composer/e-msg-composer.c:2298
 #, c-format
-msgid "Error accessing file: %s"
-msgstr "S'ha produït un error en accedir el fitxer: %s"
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "S'ha adjuntat <b>%d</b> fitxer"
+msgstr[1] "S'han adjuntat <b>%d</b> fitxers"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1267
-msgid "Unable to retrieve message from editor"
-msgstr "No s'ha pogut recuperar el missatge de l'editor"
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+"_Oculta la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1274
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
-"No es pot posicionar en el fitxer: %s\n"
-"%s"
+"_Mostra la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1281
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
-msgstr ""
-"No es pot truncar el fitxer: %s\n"
-"%s"
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Redacta un missatge"
+
+# fitxer: mail.ca.po.1
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Missatge reenviat - %s"
+
+# fitxer: mail.ca.po.2
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Adjunta el missatge original"
+msgstr[1] "Adjunta el missatge original"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1290
-#, c-format
+#: composer/e-msg-composer.c:4332
 msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
-"No es pot copiar el descriptor de fitxer: %s\n"
-"%s"
+"<b>(El redactor conté un cos de missatge que no està format per text i no es "
+"pot editar.)</b>"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1299
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Adjunta un fitxer al missatge"
+
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"S'ha produït un error en desar automàticament el missatge: %s\n"
-" %s"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1403
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr ""
+
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Ximian Evolution has found unsaved messages from a previous session.\n"
-"Would you like to try to recover them?"
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
-"El Ximian Evolution ha trobat missatges sense desar d'una sessió anterior.\n"
-"Voleu provar de recuperar-los?"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1567
-#, c-format
+#. mail-composer:attach-nomessages primary
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "No s'ha pogut recuperar el missatge de l'editor"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+# fitxer: mail.ca.po.3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Missatges sense llegir"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Voleu desar els canvis?"
+
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"No s'ha enviat el missatge '%s'.\n"
-"\n"
-"Voleu desar-ne els canvis?"
+
+# fitxer: calendar.ca.po.5
+#: composer/mail-composer-errors.xml.h:21
+#, fuzzy
+msgid "Don't Recover"
+msgstr "No el suprimeixis"
+
+# fitxer: addressbook.gui.component.ca.po
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Recover"
+msgstr "Suprimeix"
 
 # fitxer: mail.ca.po.1
-#: composer/e-msg-composer.c:1569
-msgid "Untitled Message"
-msgstr "Missatges sense títol"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:24
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "No s'ha pogut desar el fitxer de signatura: %s"
+
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:26
+msgid "Error saving to autosave because \"{1}\"."
+msgstr ""
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1576
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Atenció: s'ha modificat el missatge"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1609
-msgid "Open file"
-msgstr "Obre un fitxer"
+# fitxer: calendar.ca.po.4
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:30
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Esteu segur de voler suprimir aquesta cita sense nom?"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2016 mail/mail-account-gui.c:1287
-msgid "Autogenerated"
-msgstr "Generat automàticament"
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:32
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2086
-msgid "Signature:"
-msgstr "Signatura:"
+# fitxer: mail.ca.po.3
+#: composer/mail-composer-errors.xml.h:34
+#, fuzzy
+msgid "Save Message"
+msgstr "Desa el missatge..."
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2321
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "S'ha adjuntat <b>%d</b> fitxer"
-msgstr[1] "S'han adjuntat <b>%d</b> fitxers"
+# fitxer: camel.ca.po.4
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:36
+#, fuzzy
+msgid "Could not create message."
+msgstr "No s'ha pogut crear el conducte: %s"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2350
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
-"_Oculta la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2353 composer/e-msg-composer.c:3245
-msgid "Show _Attachment Bar (drop attachments here)"
+# fitxer: mail.ca.po.1
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:40
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "No s'ha pogut desar el fitxer de signatura: %s"
+
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:44
+msgid "All accounts have been removed."
 msgstr ""
-"_Mostra la barra de fitxers adjunts (deixeu-hi anar els fitxers adjunts)"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:2370 composer/e-msg-composer.c:3127
-#: composer/e-msg-composer.c:3128
-msgid "Compose a message"
-msgstr "Redacta un missatge"
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "You need to configure an account before you can compose mail."
+msgstr "Heu de configurar un compte abans de poder redactar un correu."
+
+# fitxer: camel.ca.po.4
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "No s'ha pogut crear el conducte: %s"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:3157
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
 msgstr ""
 "No s'ha pogut crear la finestra del redactor:\n"
 "no s'ha pogut activar el control de selecció d'adreces."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:3186
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "No s'ha pogut crear la finestra del redactor:\n"
 "no s'ha pogut activar el component editor d'HTML.\n"
 "Assegureu-vos que teniu instal·lades les versions\n"
 "correctes de gtkhtml i libgtkhtml.\n"
 
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:3290
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"No s'ha pogut crear la finestra del redactor:\n"
-"no s'ha pogut activar el component editor d'HTML."
-
-# fitxer: composer.ca.po
-#: composer/e-msg-composer.c:4295
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(El redactor conté un cos de missatge que no està format per text i no es "
-"pot editar.)</b>"
-
 # fitxer: data.ca.po
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
@@ -14338,7 +15202,8 @@ msgstr ""
 "El voleu sobreescriure?"
 
 # fitxer: e-util.ca.po
-#: e-util/e-dialog-utils.c:251
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
@@ -14365,8 +15230,6 @@ msgstr "Categories de sincronització:"
 # fitxer: e-util.ca.po
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
@@ -14374,8 +15237,6 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 # fitxer: e-util.ca.po
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %m/%d/%Y %H:%M"
@@ -14436,14 +15297,12 @@ msgstr "%m/%d/%Y %H"
 
 # fitxer: e-util.ca.po
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 # fitxer: e-util.ca.po
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
@@ -14451,9 +15310,6 @@ msgstr "%H:%M:%S"
 # fitxer: e-util.ca.po
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
@@ -14461,9 +15317,6 @@ msgstr "%I:%M %p"
 
 # fitxer: e-util.ca.po
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -14532,96 +15385,120 @@ msgstr[0] "fa %d any"
 msgstr[1] "fa %d anys"
 
 # fitxer: filter.ca.po
-#: filter/filter-datespec.c:187
-msgid "You must choose a date."
-msgstr "Heu d'escollir una data."
-
-# fitxer: filter.ca.po
-#: filter/filter-datespec.c:287
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<cliqueu per seleccionar una data>"
 
 # fitxer: filter.ca.po
-#: filter/filter-datespec.c:290 filter/filter-datespec.c:301
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "ara"
 
 # fitxer: filter.ca.po
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:297
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d/%b/%Y"
 
 # fitxer: filter.ca.po
-#: filter/filter-datespec.c:413
+#: filter/filter-datespec.c:406
 msgid "Select a time to compare against"
 msgstr "Seleccioneu amb quina hora es compara"
 
+# fitxer: calendar.ca.po.3
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+#, fuzzy
+msgid "Missing date."
+msgstr "Actualització de la reunió"
+
 # fitxer: filter.ca.po
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "Regles del _filtre"
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Heu d'escollir una data."
+
+# fitxer: addressbook.gui.component.ca.po
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+#, fuzzy
+msgid "Missing file name."
+msgstr "_Nom distingit:"
 
 # fitxer: filter.ca.po
-#: filter/filter-file.c:166
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Heu d'especificar un nom de fitxer."
 
 # fitxer: filter.ca.po
-#: filter/filter-file.c:185
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "El fitxer '%s' no existeix o no és un fitxer normal."
 
 # fitxer: filter.ca.po
-#: filter/filter-file.c:301
-msgid "Choose a file"
-msgstr "Escolliu un fitxer"
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:14
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"S'ha produït un error en l'expressió regular '%s':\n"
+"%s"
 
-# fitxer: calendar.ca.po.3
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Llavors</b>"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:16
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
 
-# fitxer: filter.ca.po
-#: filter/filter-folder.c:153
-msgid "You must specify a folder."
-msgstr "Heu d'especificar una carpeta."
+# fitxer: calendar.ca.po.4
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+#, fuzzy
+msgid "Missing name."
+msgstr "Assignació"
 
 # fitxer: filter.ca.po
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:507
-#: mail/mail-account-gui.c:1153
-msgid "Select Folder"
-msgstr "Seleccioneu una carpeta"
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:20
+msgid "You must name this filter."
+msgstr "Heu d'assignar un nom a aquest filtre."
 
-# fitxer: filter.ca.po
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:22
+msgid "Name \"{0}\" already used."
 msgstr ""
-"S'ha produït un error en l'expressió regular '%s':\n"
-"%s"
+
+# fitxer: mail.ca.po.3
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:24
+#, fuzzy
+msgid "Please choose another name."
+msgstr "Heu de seleccionar un servidor."
 
 # fitxer: filter.ca.po
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:923
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
+#: filter/filter-file.c:288
+msgid "Choose a file"
+msgstr "Escolliu un fitxer"
+
+# fitxer: filter.ca.po
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
 # fitxer: filter.ca.po
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:926 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Per fer"
 
 # fitxer: filter.ca.po
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:927 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Després"
 
@@ -14631,77 +15508,81 @@ msgid "Test"
 msgstr "Prova"
 
 # fitxer: filter.ca.po
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Heu d'assignar un nom a aquest filtre."
-
-# fitxer: filter.ca.po
-#: filter/filter-rule.c:752
+#: filter/filter-rule.c:790
 msgid "Rule name:"
 msgstr "Nom de la regla:"
 
-# fitxer: filter.ca.po
-#: filter/filter-rule.c:756
-msgid "Untitled"
-msgstr "Sense títol"
-
 # fitxer: calendar.ca.po.3
-#: filter/filter-rule.c:779
+#: filter/filter-rule.c:817
 msgid "<b>If</b>"
 msgstr "<b>Si</b>"
 
 # fitxer: filter.ca.po
-#: filter/filter-rule.c:810
-msgid "Execute actions"
-msgstr "Executa les accions"
-
-# fitxer: filter.ca.po
-#: filter/filter-rule.c:814
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
 # fitxer: filter.ca.po
-#: filter/filter-rule.c:819
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
 # fitxer: filter.ca.po
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Executa les accions"
+
+# fitxer: calendar.ca.po.3
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegat"
+
+# fitxer: filter.ca.po
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Destinataris"
+
+# fitxer: mail.ca.po.2
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Respon a %s"
+
+# fitxer: addressbook.printing.ca.po
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inclou:"
+
+# fitxer: filter.ca.po
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "entrada"
 
 # fitxer: filter.ca.po
-#: filter/filter-rule.c:910
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "sortida"
 
-# fitxer: designs.ca.po
-#: filter/filter.glade.h:1
-msgid "    "
-msgstr "    "
-
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:2
+#: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>Regles del _filtre</b>"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Fonts de la vFolder</b>"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Compara amb"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Entrada"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -14710,7 +15591,7 @@ msgstr ""
 "de la data que indiqueu."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -14719,7 +15600,7 @@ msgstr ""
 "amb una hora relativa."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -14728,679 +15609,543 @@ msgstr ""
 "actual quan s'hagi de filtrar."
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr "fa"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr "mesos"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segons"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "només les carpetes específiques"
-
-# fitxer: filter.ca.po
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:18
 msgid "the current time"
 msgstr "l'hora actual"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:19
 msgid "the time you specify"
 msgstr "una hora que indiqueu"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "setmanes"
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "anys"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "amb totes les carpetes remotes actives"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Afegeix una regla"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "amb totes les carpetes locals i les remotes actives"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Edita la regla"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "amb totes les carpetes locals"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Nom de la regla"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferències del redactor"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configureu les preferències del correu, la seguretat i la visualització dels "
+"missatges"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Configureu la correcció ortogràfica, les signatures i el redactor de "
+"missatges"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configureu els vostres comptes de correu"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuració dels comptes de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Component de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Redactor de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuració del redactor de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferències de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Correu"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Comptes de correu"
+
+# fitxer: mail.ca.po.3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Preferències del correu"
+
+# fitxer: shell.ca.po
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Correu:"
+
+# fitxer: mail.ca.po.3
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
+msgstr "[Predeterminat]"
+
+# fitxer: mail.ca.po.3
+#: mail/em-account-prefs.c:472
+msgid "Account name"
+msgstr "Nom del compte"
+
+# fitxer: mail.ca.po.3
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
+msgstr "Protocol"
+
+# fitxer: mail.ca.po.3
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
+msgstr "Sense nom"
+
+# fitxer: mail.ca.po.3
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
+msgstr "Idiomes"
+
+# fitxer: mail.ca.po.1
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
+msgstr "Afegeix una seqüència de signatura"
+
+# fitxer: mail.ca.po.3
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr "Signatures"
+
+# fitxer: mail.ca.po.3
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Missatge reenviat --------"
+
+# fitxer: mail.ca.po.3
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
+msgstr "un/a remitent anònim/a"
+
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "anys"
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "Regles del _filtre"
+
+# fitxer: filter.ca.po
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Seleccioneu una carpeta"
 
 # fitxer: filter.ca.po
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Ajusta una puntuació"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:3
+#: mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Assigna un color"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:4
+#: mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigna una puntuació"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:5
+#: mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Fitxers adjunts"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:6
+#: mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Avís sonor"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:7
+#: mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "conté"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:8
+#: mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:9
+#: mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Data de recepció"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:10
+#: mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Data d'enviament"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:12
+#: mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Suprimit"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:13
+#: mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "no conté"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:14
+#: mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "no acaba amb"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:15
+#: mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "no existeix"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:16
+#: mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "no retorna"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:17
+#: mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "no sona com"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:18
+#: mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "no comença per"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:19
+#: mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "No existeix"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:20
+#: mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Esborrany"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:21
+#: mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "acaba amb"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:22
+#: mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Existeix"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:23
+#: mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "existeix"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:24
+#: mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Expressió"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:25
+#: mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Respondre a"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:27
+#: mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "és"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:28
+#: mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "està després"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:29
+#: mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "està abans"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:30
+#: mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "està senyalat"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:31
+#: mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "és més gran que"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:32
+#: mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "és més petit que"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:33
+#: mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "no és"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:34
+#: mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "no està senyalat"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:36
+#: mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "Prova de brossa"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:777
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:38
+#: mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Llista de correu"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:39
+#: mail/em-filter-i18n.h:39
 msgid "Message Body"
 msgstr "Cos del missatge"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:40
+#: mail/em-filter-i18n.h:40
 msgid "Message Header"
 msgstr "Capçalera del missatge"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:41
+#: mail/em-filter-i18n.h:41
 msgid "Message is Junk"
 msgstr "El missatge és brossa"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:42
+#: mail/em-filter-i18n.h:42
 msgid "Message is not Junk"
 msgstr "El missatge no és brossa"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:43
+#: mail/em-filter-i18n.h:43
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: filter/libfilter-i18n.h:44
+#: mail/em-filter-i18n.h:44
 msgid "Pipe to Program"
 msgstr "Conducte al programa"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:45
+#: mail/em-filter-i18n.h:45
 msgid "Play Sound"
 msgstr "Reprodueix un so"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Llegit"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:47
+#: mail/em-filter-i18n.h:47
 msgid "Recipients"
 msgstr "Destinataris"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:48
+#: mail/em-filter-i18n.h:48
 msgid "Regex Match"
 msgstr "Concorda amb una expressió regular"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:49
+#: mail/em-filter-i18n.h:49
 msgid "Replied to"
 msgstr "S'ha respost a"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:50
+#: mail/em-filter-i18n.h:50
 msgid "returns"
 msgstr "retorna"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:51
+#: mail/em-filter-i18n.h:51
 msgid "returns greater than"
 msgstr "el valor retornat és més gran que"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:52
+#: mail/em-filter-i18n.h:52
 msgid "returns less than"
 msgstr "el valor retornat és més petit que"
 
 # fitxer: calendar.ca.po.5
-#: filter/libfilter-i18n.h:53
+#: mail/em-filter-i18n.h:53
 msgid "Run Program"
 msgstr "Executa el programa"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuació"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:55
+#: mail/em-filter-i18n.h:55
 msgid "Sender"
 msgstr "Remitent"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:56
+#: mail/em-filter-i18n.h:56
 msgid "Set Status"
 msgstr "Defineix l'estat"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:57
+#: mail/em-filter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Mida (kB)"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:58
+#: mail/em-filter-i18n.h:58
 msgid "sounds like"
 msgstr "sona com"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:59
+#: mail/em-filter-i18n.h:59
 msgid "Source Account"
 msgstr "Compte origen"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:60
+#: mail/em-filter-i18n.h:60
 msgid "Specific header"
 msgstr "Capçalera específica"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:61
+#: mail/em-filter-i18n.h:61
 msgid "starts with"
 msgstr "comença per"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:63
+#: mail/em-filter-i18n.h:63
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1538
-#: mail/em-format-quote.c:301 mail/em-format.c:748 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:308
-#: smime/lib/e-cert.c:1079
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Assumpte"
 
 # fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:65
+#: mail/em-filter-i18n.h:65
 msgid "Unset Status"
 msgstr "No defineixis l'estat"
 
-# fitxer: filter.ca.po
-#: filter/rule-context.c:682 filter/rule-editor.c:239 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:1008
-#, c-format
-msgid "Rule name '%s' is not unique, choose another."
-msgstr "Heu d'escollir un altre nom perquè la regla '%s' ja existeix."
-
-# fitxer: filter.ca.po
-#: filter/rule-editor.c:291
-msgid "Add Rule"
-msgstr "Afegeix una regla"
-
-# fitxer: filter.ca.po
-#: filter/rule-editor.c:375
-msgid "Edit Rule"
-msgstr "Edita la regla"
-
-# fitxer: filter.ca.po
-#: filter/rule-editor.c:699
-msgid "Rule name"
-msgstr "Nom de la regla"
-
-# fitxer: filter.ca.po
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Regle_s de puntuació"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "El cos conté"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "El cos no conté"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "El cos o l'assumpte contenen"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "El missatge conté"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Els destinataris contenen"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "El remitent conté"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "L'assumpte conté"
-
-# fitxer: filter.ca.po
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "L'assumpte no conté"
-
-# fitxer: filter.ca.po
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Carpetes _virtuals"
-
-# fitxer: filter.ca.po
-#: filter/vfolder-rule.c:215
-msgid "You must name this vfolder."
-msgstr "Heu d'assignar un nom a aquesta vfolder."
-
-# fitxer: filter.ca.po
-#: filter/vfolder-rule.c:230
-msgid "You need to to specify at least one folder as a source."
-msgstr "Heu d'especificar almenys una carpeta com a font."
-
-# fitxer: filter.ca.po
-#: filter/vfolder-rule.c:587
-msgid "VFolder source"
-msgstr "Origen de la VFolder"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferències del redactor"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configureu les preferències del correu, la seguretat i la visualització dels "
-"missatges"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Configureu la correcció ortogràfica, les signatures i el redactor de "
-"missatges"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configureu els vostres comptes de correu"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Control de configuració dels comptes de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Component de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Redactor de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuració del redactor de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Visualitzador de les carpetes de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferències de correu de l'Evolution"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:831
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1873
-#: mail/importers/pine-importer.c:473
-msgid "Mail"
-msgstr "Correu"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Comptes de correu"
-
-# fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Preferències del correu"
-
-# fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:232
-msgid "Are you sure you want to delete this account?"
-msgstr "Esteu segur de voler suprimir aquest compte?"
-
-# fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:240
-msgid "Don't delete"
-msgstr "No ho suprimeixis"
-
-# fitxer: mail.ca.po.3
-#. translators: default account indicator
-#: mail/em-account-prefs.c:444
-msgid "[Default]"
-msgstr "[Predeterminat]"
-
-# fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:498
-msgid "Account name"
-msgstr "Nom del compte"
-
-# fitxer: mail.ca.po.3
-#: mail/em-account-prefs.c:500
-msgid "Protocol"
-msgstr "Protocol"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:295 mail/em-composer-prefs.c:418
-#: mail/mail-config.c:1048
-msgid "Unnamed"
-msgstr "Sense nom"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:402
-msgid "You must specify a valid script name."
-msgstr "Heu d'especificar un nom de fitxer de seqüència vàlid."
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:902
-msgid "Language(s)"
-msgstr "Idiomes"
-
-# fitxer: mail.ca.po.1
-#: mail/em-composer-prefs.c:948
-msgid "Add signature script"
-msgstr "Afegeix una seqüència de signatura"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-prefs.c:968
-msgid "Signature(s)"
-msgstr "Signatures"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:124
-#, 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 ""
-"Enviareu un missatge en format HTML. Assegureu-vos que els\n"
-"següents destinataris podran rebre correus en format HTML:\n"
-"%sVoleu enviar-lo?"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:138
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-"Aquest missatge no té cap assumpte.\n"
-"Voleu enviar-lo?"
-
-# fitxer: mail.ca.po.3
-#: 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 ""
-"La llista de contactes que esteu enviant està configurada per ocultar les "
-"adreces de la llista, per tant aquest missatge només contindrá destinataris "
-"Bcc."
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:157
-msgid "This message contains only Bcc recipients."
-msgstr "Aquest missatge conté només destinataris Bcc."
-
-# fitxer: mail.ca.po.3
-#: 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 ""
-"És possible que el servidor de correu revel·li els destinataris si afegeix "
-"una capçalera Aparentment-Pera.\n"
-"Voleu enviar-lo?"
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:305
-msgid "You must specify recipients in order to send this message."
-msgstr "Per poder enviar aquest missatge, cal que indiqueu els destinataris."
-
-# fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:578
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-"No s'ha pogut obrir la carpeta d'esborranys d'aquest compte.\n"
-"Voleu fer servir la carpeta d'esborranys predeterminada?"
+# fitxer: calendar.ca.po.3
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Llavors</b>"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-browser.c:138
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crea carpetes _virtuals a partir de la cerca..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Propietats de la carpeta"
 
 # fitxer: mail.ca.po.3
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propietats"
-
-# fitxer: mail.ca.po.3
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nom de la carpeta"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Missatges totals"
+msgstr[1] "Missatges totals"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Missatges totals"
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Missatges sense llegir"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Missatges sense llegir"
+msgstr[1] "Missatges sense llegir"
 
 # fitxer: mail.ca.po.3
 #: mail/em-folder-selection-button.c:120
@@ -15408,383 +16153,365 @@ msgid "<click here to select a folder>"
 msgstr "<cliqueu per seleccionar una carpeta>"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-selector.c:166 shell/e-shell-folder-creation-dialog.c:318
+#: mail/em-folder-selector.c:166
 msgid "Create New Folder"
 msgstr "Crea una carpeta nova"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2232
-#: mail/mail-component.c:638
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:300
+#, fuzzy
+msgid "Create"
+msgstr "Crea una carpeta"
+
+# fitxer: mail.ca.po.3
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:856
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
 msgid "VFolders"
 msgstr "VFolders"
 
 # fitxer: mail.ca.po.3
+#. UNMATCHED is always last
 #: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
 msgid "UNMATCHED"
 msgstr "Cap concordança"
 
 # fitxer: mail.ca.po.3
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:236 mail/em-folder-tree-model.c:238
-msgid "Inbox"
-msgstr "Bústia d'entrada"
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-tree-model.c:493 mail/em-folder-tree-model.c:802
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
 msgid "Loading..."
 msgstr "S'està carregant..."
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:877
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "S'està movent la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:879
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "S'està copiant la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:886
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
+#, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:888
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
+#, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:904
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No s'ha deixar anar els missatges al magatzem de nivell superior"
 
-# fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:1952
-#, c-format
-msgid "Cannot move folder `%s': illegal operation"
-msgstr "No s'ha pogut moure la carpeta '%s'. L'operació no és vàlida"
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copia a la carpeta"
+
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Mou a la carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:1981 mail/em-folder-tree.c:2158
-#, c-format
-msgid "%s"
-msgstr "%s"
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
+msgid "_Move"
+msgstr "_Mou"
+
+# fitxer: ui.evolution-task-editor.xml.h.ca.po
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancel·la la tasca"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:1997 mail/em-folder-tree.c:2010
-#: mail/em-folder-view.c:646 mail/em-folder-view.c:660
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
+# fitxer: addressbook.gui.widgets.ca.po
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
+#, fuzzy
+msgid "C_opy"
+msgstr "Copia"
+
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:2037
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "S'està creant la carpeta '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2232 mail/mail-component.c:638
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2349
-#, c-format
-msgid "Could not delete folder: %s"
-msgstr "No s'ha pogut suprimir la carpeta : %s"
-
-# fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:2374
-#, c-format
-msgid "Cannot delete local %s folder."
-msgstr "No s'ha pogut suprimir la carpeta local %s."
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2380
-#, c-format
-msgid "Really delete folder \"%s\" and all of its subfolders?"
-msgstr "Voleu suprimir la carpeta '%s' i totes les seves subcarpetes?"
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2390
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Suprimeix '%s'"
-
-# fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:2424
-#, c-format
-msgid "Cannot rename local %s folder."
-msgstr "No s'ha pogut canviar el nom de la carpeta local %s."
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2433
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta '%s' a:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2435
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2459
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Ja existeix una carpeta anomenada '%s'. Feu servir un nom diferent."
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2505 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visualitza"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2506
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Obre'l e_n una finestra nova"
 
+# fitxer: calendar.ca.po.3
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copia"
+
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2511
-msgid "_Move"
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
 msgstr "_Mou"
 
 # fitxer: mail.ca.po.3
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2515
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nova carpeta..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2518
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "Ca_nvia el nom"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2521 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propietats..."
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Propietats"
 
 # fitxer: mail.ca.po.3
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:745 mail/em-popup.c:688
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:747
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Im_primeix"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:750 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:751 mail/em-popup.c:808
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:752 mail/em-popup.c:809
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:753 mail/em-popup.c:811
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Reenvia"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:756
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Res_pon..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:757
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "S'ha completat el sen_yalador"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:758
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "N_eteja el senyalador"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:761 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_ca'l com a llegit"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:762
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "No el marq_uis com a llegit"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:763
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marca'l com a _important"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:764
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "No el _marquis com a important"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:765 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marca'l com a bro_ssa"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:766 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "_No el marquis com a brossa"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:770
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Desfés la su_pressió"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_u a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:774 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Afegeix el remitent a la lli_breta d'adreces"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Apl_ica els filtres"
 
 # fitxer: filter.ca.po
-#: mail/em-folder-view.c:786
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltra la brossa"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "C_rea una regla del missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder de l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder del remite_nt"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:792
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolde_r dels destinataris"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:793
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder de _la llista de correu"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:795
-msgid "VFolder on Thread"
-msgstr "VFolder del fil"
-
-# fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtra per l'a_ssumpte"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtra pel remi_tent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:801
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtra pels _destinataris"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:802
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Fil_tra per la llista de correu"
 
-# fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:804
-msgid "Filter on Thread"
-msgstr "Filtra pel fil"
-
 # fitxer: camel.ca.po.3
 #. default charset used in mail view
-#: mail/em-folder-view.c:1587 mail/em-folder-view.c:1625
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Predeterminat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:1661
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:1908
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copia la ubicació de l'enllaç"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:2172
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliqueu per enviar un correu a en/na %s"
 
 # fitxer: mail.ca.po.3
 #. message-search popup match count string
-#: mail/em-format-html-display.c:409
+#: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Concordances: %d"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:645 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 msgid "Unsigned"
 msgstr "Sense signar"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -15793,12 +16520,12 @@ msgstr ""
 "missatge sigui l'autèntic."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "La signatura és vàlida"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -15807,12 +16534,12 @@ msgstr ""
 "sigui el remitent."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "La signatura no és vàlida"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -15821,12 +16548,12 @@ msgstr ""
 "la transmissió."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "La signatura és vàlida però no es pot verificar el remitent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -15835,26 +16562,27 @@ msgstr ""
 "verificar el remitent del missatge."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:654 mail/em-format-html.c:577
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 msgid "Unencrypted"
 msgstr "Sense xifrar"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+#, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
-"the Internet."
+"The Internet."
 msgstr ""
 "Aquest missatge no està xifrat. Es podria visualitzar el seu contingut en el "
 "transport per internet."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "Xifrat, feble"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
 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 "
@@ -15866,12 +16594,12 @@ msgstr ""
 "raonable."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "Xifrat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -15880,12 +16608,12 @@ msgstr ""
 "desconeguda visualitzi el contingut d'aquest missatge."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "Xifrat, fort"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html-display.c:653
 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 "
@@ -15896,7 +16624,7 @@ msgstr ""
 "d'aquest missatge en una quantitat de temps raonable."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:754
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
@@ -15906,219 +16634,210 @@ msgid "This certificate is not viewable"
 msgstr "No es pot visualitzar aquest certificat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1001
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completat el %d de %B del %Y, a les %H:%M"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1009
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Retardat:"
 
 # consulteu man 3 strftime per compendre aquest format
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1012
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "pel %d de %B del %Y, a les %H:%M"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1082
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Visualitza inserit"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "A_maga"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pàgina %d de %d"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:461 mail/em-format-html.c:463
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "S'està obtenint '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:840
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "La signatura és vàlida però no es pot verificar el remitent"
+
+# fitxer: mail.ca.po.3
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "La part del cos externa està mal formada."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:870
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punter al lloc FTP (%s)"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punter a un fitxer local (%s) vàlid al lloc '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:883
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punter al fitxer local (%s)"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:904
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punter a dades remotes (%s)"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:915
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punter a dades externes (tipus '%s')"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1157
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "S'està formatant el missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:304
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "De"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:68
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "Respon"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Per a"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:70
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "Cc"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1432 mail/em-format-quote.c:191 mail/em-format.c:747
-#: mail/em-mailer-prefs.c:71
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "Bcc"
 
 # fitxer: mail.ca.po.3
 #. pseudo-header
-#: mail/em-format-html.c:1542 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Generador del correu"
 
 # fitxer: mail.ca.po.3
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1569
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a a les %R %Z)</I>"
 
 # fitxer: mail.ca.po.3
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1572
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html.c:1582 mail/em-format-quote.c:315 mail/em-format.c:749
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format-html.c:1603 mail/em-format.c:750 mail/em-mailer-prefs.c:74
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:987
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "fitxer adjunt %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:1066 mail/em-format.c:1188
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S'ha produït un error desconegut en analitzar el missatge S/MIME"
 
-# fitxer: camel.ca.po.2
-#: mail/em-format.c:1086 mail/em-format.c:1106 mail/em-format.c:1130
-#: mail/em-format.c:1223
-#, c-format
-msgid "Internal error: expecting CamelMultipart, got \"%s\""
-msgstr ""
-"S'ha produït un error intern: s'esperava un CamelMultipart, s'ha rebut \"%s\""
-
-#: mail/em-format.c:1178
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "No se suporta el tipus de xifratge per a multipart/encrypted"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:1325
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No s'ha pogut analitzar el missatge MIME. Es mostrarà com a codi font."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:1344
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "No se suporta el format de la signatura"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:1352
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "S'ha produït un error en verificar la contrasenya"
 
 # fitxer: mail.ca.po.3
-#: mail/em-format.c:1352
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "S'ha produït un error desconegut en verificar la contrasenya"
 
-# fitxer: camel.ca.po.2
-#: mail/em-format.c:1372
-#, c-format
-msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
-msgstr ""
-"S'ha produït un error intern: s'esperava un CamelMimeMessage, s'ha rebut \"%s\""
-
 # fitxer: mail.ca.po.3
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrat)"
 
 # fitxer: calendar.ca.po.3
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Cada vegada"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Una vegada al dia"
 
 # fitxer: calendar.ca.po.3
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Una vegada a la setmana"
 
 # fitxer: calendar.ca.po.3
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Una vegada al mes"
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:1079
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -16130,215 +16849,177 @@ msgstr ""
 "\n"
 "Espereu mentres l'Evolution migra les vostres carpetes..."
 
-# fitxer: mail.ca.po.3
-#: mail/em-migrate.c:1899 mail/em-migrate.c:1914
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "No s'ha pogut migrar les memòries cau dels identificadors d'usuari: %s"
+# fitxer: camel.ca.po.2
+#: mail/em-migrate.c:1602
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "No s'ha pogut crear la carpeta '%s': %s"
+
+# fitxer: composer.ca.po
+#: mail/em-migrate.c:1628
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"No es pot copiar el descriptor de fitxer: %s\n"
+"%s"
+
+# fitxer: camel.ca.po.1
+#: mail/em-migrate.c:1811
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+# fitxer: camel.ca.po.1
+#: mail/em-migrate.c:2015
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:2002 mail/em-migrate.c:2103
+#: mail/em-migrate.c:2029
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "No s'ha pogut crear el directori '%s': %s"
+
+#: mail/em-migrate.c:2058
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "No s'ha pogut migrar l'estat d'expansió de la carpeta: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:2227 mail/em-migrate.c:2399
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "No s'ha pogut crear el directori '%s': %s"
 
-# fitxer: mail.ca.po.3
-#: mail/em-migrate.c:2239
-#, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "No s'ha pogut obrir el magatzem per a '%s': %s"
+# fitxer: mail.ca.po.1
+#: mail/em-migrate.c:2576
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"No s'ha pogut crear el fitxer de sortida: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2594
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:698
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:716
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:805
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "De_fineix com a fons"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:807
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:855
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:856
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "E_nvia un missatge a..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:857
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Afegeix a la llibreta d'adreces"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:963
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "El magatzem no suporta subscripcions, o no estan habilitades."
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Subscrit"
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:637 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Carpeta"
 
 # fitxer: mail.ca.po.3
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Heu de seleccionar un servidor."
 
 # fitxer: mail.ca.po.3
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No s'ha seleccionat cap missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:100
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "No tornis a mostrar aquest missatge."
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:282
-#, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"S'ha produït un error en carregar la informació del filtre:\n"
-"%s"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:291
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtres"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:536
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Missatge reenviat --------"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:1142
-msgid "an unknown sender"
-msgstr "un/a remitent anònim/a"
-
-# fitxer: mail.ca.po.3
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-utils.c:1152
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "El %A %d de %B del %Y a les %H:%M %%+05d, en/na %%s va escriure:"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:1435 mail/em-utils.c:1519 mail/em-utils.c:1528
-#, c-format
-msgid ""
-"Cannot save to `%s'\n"
-" %s"
-msgstr ""
-"No es pot desar a '%s'\n"
-" %s"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:1440
-#, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix '%s'.\n"
-"El voleu sobreescriure?"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:1483
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "missatge"
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1535
-#, c-format
-msgid "Error: '%s' exists and is not a regular file"
-msgstr "S'ha produït un error: '%s' existeix i no és un fitxer per a dades"
-
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:1589
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Desa el missatge..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-utils.c:1638
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Afegeix una adreça"
 
 # fitxer: mail.ca.po.2
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2073
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Missatges de %s"
 
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:2124
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "No s'ha pogut crear el directori temporal: %s"
+# fitxer: filter.ca.po
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Carpetes _virtuals"
 
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:2455
-#, 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 ""
-"Aquesta operació suprimirà permanentment tots els missatges esborrats de la "
-"carpeta '%s'. Si continueu, no podreu recuperar aquests missatges.\n"
-"\n"
-"Voleu suprimir aquests missatges?"
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Afegeix"
 
-# fitxer: mail.ca.po.3
-#: mail/em-utils.c:2480
-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 ""
-"Aquesta operació suprimirà permanentment tots els missatges esborrats de "
-"totes les carpetes. Si continueu, no podreu recuperar aquests missatges.\n"
-"\n"
-"Voleu suprimir aquests missatges?"
+# fitxer: filter.ca.po
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Origen de la VFolder"
 
 # fitxer: mail.ca.po.3
 #: mail/evolution-mail.schemas.in.in.h:1
@@ -16357,12 +17038,14 @@ msgstr "Comprova si el correu d'entrada és brossa"
 
 # fitxer: mail.ca.po.3
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Color de les cites ressaltades"
 
 # fitxer: mail.ca.po.3
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Color de les cites ressaltades."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -16485,15 +17168,22 @@ msgid "Last time empty trash was run"
 msgstr "La darrera vegada que es va buidar la paperera"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Llista d'etiquetes i els seus colors associats"
 
 # fitxer: mail.ca.po.2
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Llista de comptes"
 
+# fitxer: mail.ca.po.2
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Llista de comptes"
+
+#: mail/evolution-mail.schemas.in.in.h:32
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -16502,28 +17192,33 @@ msgstr ""
 "llista conté cadenes referents a subdirectoris relatius a /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Llista de capçaleres personalitzades i si estan habilitades."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 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."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Llista d'etiquetes que coneix el component de correu de l'Evolution. La "
 "llista conté cadenes de tipus nom:color, on color fa servir la codificació "
 "hexadecimal HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Llista de tipus mime pels que es cercarà components de visualització"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Carrega les imatges dels missatges HTML sobre http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: mail/evolution-mail.schemas.in.in.h:38
 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 - "
@@ -16534,92 +17229,93 @@ msgstr ""
 "remitent està a la llibreta d'adreces, 2 - carrega sempre les imatges"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Registra les accions del filtre"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Registra les accions al fitxer de registre especificat."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Fitxer on registrar accions de filtre"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Fitxer on enregistrar accions de filtre."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Marca com a vist després del temps d'espera"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Marca com a vist després del temps d'espera."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marca les cites en la 'Previsualització' de missatge"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marca les cites en la 'Previsualització' de missatge."
 
-#: mail/evolution-mail.schemas.in.in.h:45
-msgid "Message Window default hight"
+#: mail/evolution-mail.schemas.in.in.h:47
+#, fuzzy
+msgid "Message Window default height"
 msgstr "Alçada predeterminada de la finestra de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Amplada predeterminada de la finestra de missatges"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Estil de visualització de missatges (normal, capçaleres senceres, font)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Dies mínims entre buidatges de la paperera en sortir"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Temps mínim entre buidatges de la paperera en sortir, en dies."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Fitxer de so de correu nou"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Tipus de notificació de correu nou"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Pregunta quan l'assumpte és buit"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pregunta l'usuari quan intenti buidar una contrasenya."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Pregunta quan l'usuari esborri"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Pregunta quan l'usuari només empleni Bcc"
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:57
+#: mail/evolution-mail.schemas.in.in.h:59
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -16628,36 +17324,28 @@ msgstr ""
 "volen rebre correu HTML."
 
 # fitxer: mail.ca.po.2
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Pregunta quan l'usuari intenti enviar un missatge sense destinataris a Per a "
 "o Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pregunta quan l'usuari intenti enviar correu HTML no desitjat"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Reconeix els enllaços en el text i remplaça'ls."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Reconeix les caretes en el text i reemplaça-les per les seves imatges."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Executa una prova de brossa al correu d'entrada"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "0pc1ó s3cr3t4"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "0pc1ó s3cr3t4."
-
 # fitxer: mail.ca.po.2
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
@@ -16712,7 +17400,8 @@ msgid "Spell check inline"
 msgstr "Comprovació ortogràfica al lloc"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+#, fuzzy
+msgid "Subscribe dialog default height"
 msgstr "Alçada predeterminada de la finestra de subscripció"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -16900,17 +17589,17 @@ msgstr "L'Evolution està important el vostre antic correu Elm"
 
 # fitxer: mail.ca.po.2
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "S'està important..."
 
 # fitxer: mail.ca.po.2
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Espereu"
 
@@ -16933,30 +17622,32 @@ msgstr "Elm"
 
 # fitxer: mail.ca.po.2
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Carpeta de destí:"
 
 # fitxer: smime.ca.po
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarà"
 
 # fitxer: shell.ca.po
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "S'està important '%s'"
 
 # fitxer: shell.ca.po
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "S'estan important una bústia"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/mail-importer.c:354
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "S'està examinant %s"
@@ -16967,7 +17658,7 @@ msgstr "S'està examinant %s"
 msgid "Priority Filter \"%s\""
 msgstr "Filtre de prioritat '%s':"
 
-#: mail/importers/netscape-importer.c:651
+#: mail/importers/netscape-importer.c:662
 msgid ""
 "Some of your Netscape email filters are based on\n"
 "email priorities, which are not used in Evolution.\n"
@@ -16994,7 +17685,7 @@ msgstr ""
 "comptes de prioritats. Comproveu els filtres per assegurar-vos\n"
 "que tot funcioni apropiadament."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -17006,7 +17697,7 @@ msgstr ""
 "que no està suportada en l'Evolution.\n"
 "Aquests filtres es perdran."
 
-#: mail/importers/netscape-importer.c:692
+#: mail/importers/netscape-importer.c:703
 msgid ""
 "Some of your Netscape email filters test the\n"
 "body of emails for (in)equality to a given string,\n"
@@ -17020,26 +17711,26 @@ msgstr ""
 "modificar per provar si el cos del missatge conté\n"
 "o no la cadena."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "L'Evolution està important les vostres antigues dades del Netscape"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1678
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "S'està important dades del Netscape"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1878
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Configuració"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/netscape-importer.c:1883
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filtres de correu"
 
-#: mail/importers/netscape-importer.c:1904
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -17052,16 +17743,16 @@ msgid "Evolution is importing your old Pine data"
 msgstr "L'Evolution està important les vostres antigues dades del Pine"
 
 # fitxer: shell.ca.po
-#: mail/importers/pine-importer.c:313
+#: mail/importers/pine-importer.c:314
 msgid "Importing Pine data"
 msgstr "S'està important dades del Pine"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: mail/importers/pine-importer.c:478
+#: mail/importers/pine-importer.c:479
 msgid "Addressbook"
 msgstr "Llibreta d'adreces"
 
-#: mail/importers/pine-importer.c:497
+#: mail/importers/pine-importer.c:498
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -17070,134 +17761,169 @@ msgstr ""
 "Voleu importar-los a l'Evolution?"
 
 # fitxer: mail.ca.po.2
-#: mail/importers/pine-importer.c:505
+#: mail/importers/pine-importer.c:506
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-editor.c:110
-msgid "You have not filled in all of the required information."
-msgstr "No heu emplenat tota la informació necessària."
-
 # fitxer: mail.ca.po.2
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de comptes de l'Evolution"
 
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+# fitxer: smime.ca.po
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Acord quant a la clau"
+
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:796 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Mà_quina:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:800 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Nom d'usuari:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:804 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Camí:"
 
-#: mail/mail-account-gui.c:2095
-msgid "You may not create two accounts with the same name."
-msgstr "No podeu crear dos comptes amb el mateix nom."
-
 # fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "L'assumpte és %s"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Respon a %s"
-
-# fitxer: mail.ca.po.2
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: mail/mail-autofilter.c:430
-msgid "The following filter rule(s):\n"
-msgstr "Les següents regles de filtratge:\n"
+# fitxer: filter.ca.po
+#: mail/mail-component.c:459
+#, fuzzy, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "Suprimit"
+msgstr[1] "Suprimit"
 
-#: mail/mail-autofilter.c:436
+#: mail/mail-component.c:461
 #, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-"S'ha utilitzat la carpeta suprimida:\n"
-"    '%s'\n"
-"I s'ha actualitzat."
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:519
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Teniu missatges sense enviar. Voleu sortir igualment?"
+# fitxer: calendar.ca.po.4
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d dia"
+msgstr[1] "%d dies"
+
+# fitxer: calendar.ca.po.4
+#: mail/mail-component.c:486
+#, fuzzy, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d segon"
+msgstr[1] "%d segons"
+
+# fitxer: calendar.ca.po.4
+#: mail/mail-component.c:488
+#, fuzzy, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d segon"
+msgstr[1] "%d segons"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: mail/mail-component.c:492
+#, fuzzy, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d contacte"
+msgstr[1] "%d contactes"
+
+#: mail/mail-component.c:494
+#, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:587
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nou missatge de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:588
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Missatge de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:589
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Redacta un nou missatge de correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-component.c:594
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nova carpeta de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:595
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Car_peta de correu"
 
 # fitxer: calendar.ca.po.5
-#: mail/mail-component.c:596
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Crea una nova carpeta de correu"
 
-# fitxer: mail.ca.po.2
-#: mail/mail-component.c:760
-msgid "URI of the mail source that the view will display"
-msgstr "La URI de l'origen de correu que mostarà la visualització"
+#: mail/mail-component.c:803
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:366 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitat"
 
-#: mail/mail-config-druid.c:368
+#: mail/mail-config-druid.c:364
 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 "
@@ -17208,12 +17934,12 @@ msgstr ""
 "informació dins el correu que enviareu."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:374 mail/mail-config-druid.c:381
-#: mail/mail-config.glade.h:116
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Rebre correu"
 
-#: mail/mail-config-druid.c:376
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -17221,16 +17947,16 @@ msgstr ""
 "Introduïu informació sobre el vostre servidor d'entrada a sota. Si no "
 "n'esteu segur, pregunteu-ho a l'administrador del sistema o al vostre ISP."
 
-#: mail/mail-config-druid.c:383
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Seleccioneu entre les següents opcions"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:386 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Enviar correu"
 
-#: mail/mail-config-druid.c:388
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -17238,11 +17964,11 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre ISP."
 
-#: mail/mail-config-druid.c:393 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Gestió de comptes"
 
-#: mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -17256,261 +17982,266 @@ msgstr ""
 "Introduïu un nom per a aquest compte a l'espai de sota. Aquest nom només "
 "s'utilitzarà per visualitzar-lo."
 
-#: mail/mail-config.c:898
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Comprovació del servei"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.c:976 mail/mail-config.c:980
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "S'està connectant al servidor..."
 
+# fitxer: designs.ca.po
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Comprova _els tipus suportats "
 
-# fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Previsualització</b>"
-
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>Aquest muntatge de l'evolution no suporta SSL</b>"
 
 # fitxer: designs.ca.po
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignatures</b>"
 
 # fitxer: designs.ca.po
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomes</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informació del compte</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertes</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipus d'autenticació</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticació</span>"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Comprovació de nou correu</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redacció de missatges</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuració</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportament predeterminat</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Suprimeix el correu</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Ca_pçaleres del correu mostrat</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opcions de filtre</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetes i colors</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Carregar imatges</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Visualització del missatge</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Tipus de lletra del missatge</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificació de nou correu</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "span weight=\"bold\">Informació opcional</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcions</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Privatesa força bona (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipus de lletra impresa</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informació necessària</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME segur (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguretat</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Missatges enviats i esborranys</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuració del servidor</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Ta_mbé xifra'm quan enviï correu xifrat"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor de compte"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Afegeix una no_va signatura..."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Afegeix una _seqüència"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Xifra'm sempre quan enviï correu xifrat"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Sempre carbon-copy (Cc) a:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sempre _blind-carbon-copy (Bcc) a:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Signa sempre els missatges de sortida quan facis servir aquest compte"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia sempre en les claus del meu anell de claus quan s'es_tà xifrant"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Adjunta el missatge original"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Fitxer adjunt"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Inserta automàticament caretes"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Comprova automàticame_nt si hi ha nou correu cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bàltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bàltic (ISO-8859-4)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Avisa amb un so quan arri_bi correu nou"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Joc de caràcters:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "Comprova _els tipus suportats "
 
-# fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Comprova correu d'en_trada"
+# fitxer: mail.ca.po.3
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Comprova si el correu d'entrada és brossa"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Comprova l'or_tografia mentre escric"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprova que els missatges d'entrada siguin brossa"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Color de les paraules i_ncorrectes:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Colors"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "Confirma _quan s'està suprimint una carpeta"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -17526,129 +18257,134 @@ msgstr ""
 "Cliqueu 'Aplica' per desar la vostra configuració."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Predeterminat"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Codi_ficació de caràcters per defecte:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Predeterminats"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "No citis el missatge original"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "No signis les sol·licituds de reunió (co_mpatible amb l'Outlook)"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fet"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Carpeta d'es_borranys:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Comptes de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "_Adreça electrònica:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Buida les papereres en sor_tir"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficats de xifratge:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Assitent per als comptes d'Evolution"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Executa l'ordre..."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Amplada fi_xa:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Propietats del tipus de lletra"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Missatges en format _HTML"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correu HTML"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Capçaleres"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Ressalta les _cites amb"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-# fitxer: mail.ca.po.2
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+# fitxer: mail.ca.po.2
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Insertat"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Ubicació de la bústia"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Redactor de missatge"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -17656,167 +18392,162 @@ msgstr ""
 "Nota: no es demanarà contrasenya fins que us connecteu per primera vegada"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganització:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "Id. de _clau PGP/GPG:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Agafa un color"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Re_produeix un fitxer de so quan arribi correu nou"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pregunta quan s'enviïn missatges amb destinataris n_omés al camp Bcc"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cita el missatge original"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citat"
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Recorda la co_ntrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_pon-A:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Rebre correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opcions de recepció"
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Recorda la contrasen_ya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Tipus de lletra estàndard:"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Seguretat"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa per imprimir"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable per imprimir"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Selecciona..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviar correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _missatges enviats:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requereix autenticació"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipus de servidor:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "S'està si_gnant el certificat:"
 
 # fitxer: composer.ca.po
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Signat_ura:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Signatures"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especifica un nom de _fitxer:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificació d'ortografia"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "mbox estàndard de Unix"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "Tipus d_e lletra del terminal:"
 
 # fitxer: addressbook.printing.ca.po
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "T_ipus:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -17826,7 +18557,7 @@ msgstr ""
 "signatura. El nom que especifiqueu només s'usarà per visualitzar-lo."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 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 "
@@ -17837,7 +18568,7 @@ msgstr ""
 "als quals teniu instal·lat un diccionari."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -17846,17 +18577,12 @@ msgstr ""
 "Per exemple: 'Feina' o 'Personal'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Utilitza el _dimoni"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Amplada variable:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -17867,109 +18593,94 @@ msgstr ""
 "Cliqueu 'Endavant' per començar. "
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Afegeix la signatura"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "C_arrega sempre les imatges de la xarxa"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Signa _digitalment els missatges de sortida (per defecte)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No em notifiquis l'arribada de correu electrònic nou"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Habilita"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Xifra _els missatges de sortida (per defecte)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Estil de reen_viament:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "Carrega _les imatges si el remitent és a la llibreta d'adreces"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Només proves _locals"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Fes-lo el _meu compte per defecte"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Marca els missatges com a llegits després de"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:170
-msgid "_Name:"
-msgstr "_Nom:"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_No carreguis mai les imatges d'Internet"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Pregunta quan enviïs missatges HTML als contactes que no ho volen"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Pregunta quan enviïs missatges amb l'assumpte buit"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Estil de la _resposta:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Seqüència:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Mo_stra les imatges animades"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Utilitza una conexió segura (SSL):"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
 
-# fitxer: calendar.ca.po.5
-#: mail/mail-config.glade.h:180
-msgid "_minute(s)"
-msgstr "_minuts"
-
 # fitxer: calendar.ca.po.4
 #: mail/mail-config.glade.h:181
 msgid "color"
@@ -17980,55 +18691,776 @@ msgstr "color"
 msgid "description"
 msgstr "descripció"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+# fitxer: filter.ca.po
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Fonts de la vFolder</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Signatura digital</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Xifratge</span>"
+
+# fitxer: calendar.ca.po.3
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Acceptat"
+
 # fitxer: mail.ca.po.1
-#: mail/mail-folder-cache.c:803
-#, c-format
-msgid "Pinging %s"
-msgstr "S'està enviant un ping a %s"
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "C_omplet"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:261
-#, c-format
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Considera com a diferents els caràcters en majúscula i minúscula"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Cerca en el missatge"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Cerca:"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Senyala per respondre"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Subscripció a carpetes"
+
+# fitxer: smime.ca.po
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Acord quant a la clau"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Cap seleccionat"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_ervidor:"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informació sobre seguretat"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
-"Error while '%s':\n"
-"%s"
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Els missatges que heu seleccionat per respondre es llisten a sota.\n"
+"Seleccioneu una acció per respondre-hi al menú 'Senyalador'."
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
 msgstr ""
-"S'ha produït un error en '%s':\n"
-"%s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:264
-#, c-format
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Venciment:"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "Sen_yalador:"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscriu"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Cancel·la s_ubscripció"
+
+# fitxer: filter.ca.po
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "només les carpetes específiques"
+
+# fitxer: filter.ca.po
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "amb totes les carpetes remotes actives"
+
+# fitxer: filter.ca.po
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "amb totes les carpetes locals i les remotes actives"
+
+# fitxer: filter.ca.po
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "amb totes les carpetes locals"
+
+# fitxer: camel.ca.po.1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autenticació d'SMTP"
+
+# fitxer: camel.ca.po.1
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Error while performing operation:\n"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"El servidor SMTP %s no suporta el tipus d'autenticació sol·licitat (%s)."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+
+# fitxer: calendar.ca.po.5
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Esteu segur de voler suprimir aquesta URL?"
+
+# fitxer: mail.ca.po.3
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Enviareu un missatge en format HTML. Assegureu-vos que els\n"
+"següents destinataris podran rebre correus en format HTML:\n"
+"%sVoleu enviar-lo?"
+
+# fitxer: ui.evolution-message-composer.xml.h.ca.po
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
+msgid "_Send"
+msgstr "Envia"
+
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Pregunta quan l'usuari intenti enviar un missatge sense assumpte."
+
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+
+# fitxer: calendar.ca.po.4
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Esteu segur de voler suprimir %d entrada del diari?"
+
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
+msgstr ""
+
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+
+# fitxer: shell.ca.po
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+#, fuzzy
+msgid "Use default drafts folder?"
+msgstr "Camí de la carpeta de contactes predeterminada"
+
+# fitxer: mail.ca.po.3
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"No s'ha pogut obrir la carpeta d'esborranys d'aquest compte.\n"
+"Voleu fer servir la carpeta d'esborranys predeterminada?"
+
+# fitxer: camel.ca.po.3
+#: mail/mail-errors.xml.h:41
+#, fuzzy
+msgid "Use _Default"
+msgstr "Predeterminat"
+
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Suprimeix permanentment tots els missatges esborrats d'aquesta carpeta"
+
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
+msgstr ""
+
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#: mail/mail-errors.xml.h:46
+#, fuzzy
+msgid "_Expunge"
+msgstr "Suprimei_x"
+
+# fitxer: ui.evolution-mail-global.xml.h.ca.po
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Suprimeix permanentment tots els missatges suprimits de totes les carpetes"
+
+# fitxer: ui.evolution-mail-global.xml.h.ca.po
+#: mail/mail-errors.xml.h:51
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Buida la _paperera"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Teniu missatges sense enviar. Voleu sortir igualment?"
+
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message with the subject \"{0}\" was not delivered."
+msgstr ""
+
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
+
+# fitxer: mail.ca.po.1
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+#, fuzzy
+msgid "Error while {0}."
+msgstr ""
+"S'ha produït un error en '%s':\n"
 "%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+# fitxer: mail.ca.po.1
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+#, fuzzy
+msgid "Error while performing operation."
 msgstr ""
 "S'ha produït un error en realitzar l'operació:\n"
 "%s"
 
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+# fitxer: calendar.ca.po.5
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+#, fuzzy
+msgid "Enter password."
+msgstr "Introduïu la contrasenya"
+
+# fitxer: mail.ca.po.3
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"S'ha produït un error en carregar la informació del filtre:\n"
+"%s"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: camel.ca.po.2
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "No s'ha pogut crear el directori '%s': %s."
+
+# fitxer: mail.ca.po.3
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "No s'ha pogut crear el directori temporal: %s"
+
+# fitxer: composer.ca.po
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "El fitxer existeix. Voleu sobreescriure'l?"
+
+# fitxer: filter.ca.po
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "El fitxer '%s' no existeix o no és un fitxer normal."
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: camel.ca.po.3
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "No s'ha pogut suprimir la carpeta local %s."
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+
+# fitxer: camel.ca.po.3
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "No s'ha pogut canviar el nom de la carpeta local %s."
+
+# fitxer: mail.ca.po.3
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Suprimeix '%s'"
+
+# fitxer: mail.ca.po.3
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Voleu suprimir la carpeta '%s' i totes les seves subcarpetes?"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+msgstr ""
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
+msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: mail.ca.po.3
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Ja existeix una carpeta anomenada '%s'. Feu servir un nom diferent."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
+msgid "Cannot save changes to account."
+msgstr "i un altre contacte."
+
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "No heu emplenat tota la informació necessària."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "No podeu crear dos comptes amb el mateix nom."
+
+# fitxer: ui.evolution-addressbook.xml.h.ca.po
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Suprimeix els contactes seleccionats"
+
+# fitxer: mail.ca.po.3
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Esteu segur de voler suprimir aquest compte?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr ""
+
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#: mail/mail-errors.xml.h:169
+#, fuzzy
+msgid "Don't delete"
+msgstr "Desfés l'esb_orrat"
+
+# fitxer: mail.ca.po.1
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "No s'ha pogut desar el fitxer de signatura: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr ""
+
+# fitxer: mail.ca.po.1
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "No s'ha pogut desar el fitxer de signatura: %s"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+# fitxer: mail.ca.po.1
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Descarta els canvis"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Voleu desar els canvis?"
+
+# fitxer: mail.ca.po.1
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Aquesta signatura s'ha modificat, però no s'ha desat.\n"
+"\n"
+"Voleu desar-ne els canvis?"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Descarta els canvis"
+
+# fitxer: camel.ca.po.2
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "No existeix la carpeta '%s'."
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
+msgstr ""
+
+# fitxer: addressbook.tools.ca.po
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+#, fuzzy
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
+
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:903
-msgid "Working"
-msgstr "S'està treballant"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Les següents vFolders:\n"
+"%sFeien servir la carpeta suprimida:\n"
+"    '%s'\n"
+"I s'han actualitzat."
+
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:88
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Les següents vFolders:\n"
+"%sFeien servir la carpeta suprimida:\n"
+"    '%s'\n"
+"I s'han actualitzat."
+
+# fitxer: calendar.ca.po.3
+#. mail:no-folder primary
+#: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Actualització de la reunió"
+
+# fitxer: filter.ca.po
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Heu d'especificar una carpeta."
+
+# fitxer: filter.ca.po
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Heu d'assignar un nom a aquesta vfolder."
+
+# fitxer: mail.ca.po.3
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "No s'ha seleccionat cap missatge"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
+
+#: mail/mail-errors.xml.h:230
+msgid "Ignore"
+msgstr ""
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Sobreescriu"
+
+# fitxer: calendar.ca.po.5
+#: mail/mail-errors.xml.h:232
+#, fuzzy
+msgid "_Append"
+msgstr "_Obre"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-folder-cache.c:785
+#, c-format
+msgid "Pinging %s"
+msgstr "S'està enviant un ping a %s"
+
+# fitxer: mail.ca.po.1
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "S'està filtrant la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "S'està recollint el correu electrònic"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:534
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'han pogut aplicar els filtres de sortida: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:559
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -18038,120 +19470,120 @@ msgstr ""
 "S'afegirà a la carpeta local 'Enviat'."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No s'han pogut afegir a la carpeta local 'Enviat': %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:664
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està enviant el missatge %d de %d"
 
 # fitxer: camel.ca.po.4
-#: mail/mail-ops.c:695
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "No s'han pogut enviar %d de %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:699
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Complet."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:796
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "S'està desant el missatge a la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "S'estan movent els missatges a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "S'estan copiant els missatges a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1123
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Missatges reenviats"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1166
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "S'està obrint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1238
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "S'està obrint el magatzem %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1316
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "S'està suprimint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S'està emmagatzemant la carpeta '%s'"
 
-#: mail/mail-ops.c:1475
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "S'està buidant i emmagatzemant el compte '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1476
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "S'està emmagatzemant el compte '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "S'està refrescant la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1567 mail/mail-ops.c:1618
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "S'està suprimint la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1615
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està buidant la paperera a '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1616
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Carpetes locals"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "S'està recuperant el missatge %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1771
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -18159,7 +19591,7 @@ msgstr[0] "S'està recuperant %d missatge"
 msgstr[1] "S'estan recuperant %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1857
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -18167,7 +19599,7 @@ msgstr[0] "S'està desant %d missatge"
 msgstr[1] "S'estan desant %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1907
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -18177,7 +19609,7 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -18187,12 +19619,12 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2006
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "S'està desant el fitxer adjunt"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -18202,159 +19634,104 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està desconnectant de %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2201
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està tornant a connectar a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Considera com a diferents els caràcters en majúscula i minúscula"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Cerca en el missatge"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Cerca:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Signatura digital</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Xifratge</span>"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informació sobre seguretat"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:156
+#: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "S'està cancel·lant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:263
+#: mail/mail-send-recv.c:264
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Servidor: %s, tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:265
+#: mail/mail-send-recv.c:266
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Camí: %s, tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:267
+#: mail/mail-send-recv.c:268
 #, c-format
 msgid "Type: %s"
 msgstr "Tipus: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:317
+#: mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Envia i reb el correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:320
+#: mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr "C_ancel·la-ho tot"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:401
+#: mail/mail-send-recv.c:412
 msgid "Updating..."
 msgstr "S'està actualitzant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-send-recv.c:401 mail/mail-send-recv.c:453
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "S'està esperant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:236
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "L'usuari ha cancel·lat l'operació."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:269
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:271
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:298
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Recorda aquesta contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:299
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recorda aquesta contrasenya durant aquesta sessió"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:86
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr "No s'ha pogut desar el fitxer de signatura: %s"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:233
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Aquesta signatura s'ha modificat, però no s'ha desat.\n"
-"\n"
-"Voleu desar-ne els canvis?"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:236
-msgid "_Discard changes"
-msgstr "_Descarta els canvis"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:240
-msgid "Save signature"
-msgstr "Desa la signatura"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:388
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr "Edita la signatura"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:428
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr "Introduïu un nom per a aquesta signatura."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-signature-editor.c:431
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Nom:"
 
@@ -18387,129 +19764,115 @@ msgid "Invalid folder: `%s'"
 msgstr "La carpeta no és vàlida: '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "S'està configurant la vfolder: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "S'està actualitzant les vfolders per a la uri: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:525
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-"Les següents vFolders:\n"
-"%sFeien servir la carpeta suprimida:\n"
-"    '%s'\n"
-"I s'han actualitzat."
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "S'està actualitzant les vfolders per a la uri: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:926
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Edita la VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:985
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "S'està intentant editar una vfolder '%s' que inexistent."
-
-# fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:1057
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:935
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "No vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:936
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:937
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Respost"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:938
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:939
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Missatges múltiples"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:943
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Molt baixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:944
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Abaixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:948
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:949
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Molt alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1270
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1277
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1286
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1298
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1306
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1308
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:3124
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
@@ -18549,103 +19912,89 @@ msgid "Size"
 msgstr "Mida"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Crida"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "No ho reenviïs"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Respondre"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Per a la vostra informació"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Reenvia"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "No és necessària cap resposta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Respon"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Respon a tots"
 
 # fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Ressenya"
 
-# fitxer: mail.ca.po.1
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Senyala per respondre"
-
-# fitxer: mail.ca.po.1
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "C_omplet"
-
-# fitxer: mail.ca.po.1
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Els missatges que heu seleccionat per respondre es llisten a sota.\n"
-"Seleccioneu una acció per respondre-hi al menú 'Senyalador'."
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "El cos conté"
 
-# fitxer: mail.ca.po.1
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Venciment:"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "El cos no conté"
 
-# fitxer: mail.ca.po.1
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "Sen_yalador:"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "El cos o l'assumpte contenen"
 
-# fitxer: mail.ca.po.1
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Subscripció a carpetes"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "El missatge conté"
 
-# fitxer: mail.ca.po.1
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Cap seleccionat"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Els destinataris contenen"
 
-# fitxer: mail.ca.po.1
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_ervidor:"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "El remitent conté"
 
-# fitxer: mail.ca.po.1
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscriu"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "L'assumpte conté"
 
-# fitxer: mail.ca.po.1
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Cancel·la s_ubscripció"
+# fitxer: filter.ca.po
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "L'assumpte no conté"
 
 # fitxer: shell.ca.po
 #: shell/GNOME_Evolution_Shell.server.in.in.h:1
@@ -18669,43 +20018,33 @@ msgstr "480"
 
 # fitxer: shell.ca.po
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Grup de dreceres predeterminat"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Amplada predeterminada de la subfinestra de la barra de carpetes"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Amplada predeterminada de la subfinestra de la barra d'adreces"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Alçada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Amplada predeterminada de la finestra"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Versió de la configuració de l'Evolution"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "ID o àlies del component a mostrar per defecte a l'inici de manera "
 "predeterminada."
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
@@ -18714,7 +20053,7 @@ msgstr ""
 "connectat."
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
@@ -18723,123 +20062,50 @@ msgstr ""
 "el diàleg d'avís."
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Llista de camins de les carpetes a sincronitzar al disc per a la utilització "
 "desconnectat."
 
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Camí de la carpeta de calendari predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Camí de la carpeta de contactes predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Camí de la carpeta de correu predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Camí de la carpeta de tasques predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "L'URI física a la carpeta de calendari predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "L'URI física a la carpeta de contactes predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "L'URI física a la carpeta de correu predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "L'URI física a la carpeta de tasques predeterminada"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Si l'Evolution s'hauria d'iniciar en mode desconnectat"
 
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Si s'ha de mostrar la barra de carpetes"
-
-# fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Si s'ha de mostrar la barra de dreceres"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Si s'ha d'ometre el diàleg d'avís de desenvolupament"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "correu"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Desenvolupat per a vos per"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr "Carpetes de completat extra"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr "Seleccioneu la carpeta predeterminada"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr "Carpetes predeterminades"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr "Carpetes desconnectades"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr "Carpetes de completat automàtic"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Connexions actives</b>"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear la carpeta especificada:\n"
-"%s"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Connexions actives"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "El nom de carpeta especificat no és vàlid: %s"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Cliqueu 'D'acord' per tancar aquestes connexions i desconnectar-se"
 
 # fitxer: shell.ca.po
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -18847,12 +20113,12 @@ msgid "(Untitled)"
 msgstr "(Sense títol)"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:146
 msgid "Choose the type of importer to run:"
 msgstr "Escolliu el tipus d'importador a executar:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:148
+#: shell/e-shell-importer.c:149
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -18867,17 +20133,17 @@ msgstr ""
 "l'Evolution intentarà descobrir-lo."
 
 # fitxer: ui.evolution-event-editor.xml.h.ca.po
-#: shell/e-shell-importer.c:154
+#: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Escolliu la destinació per a aquesta importació"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:157 shell/e-shell-startup-wizard.c:738
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccioneu la informació que voleu importar:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:160
+#: shell/e-shell-importer.c:161
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
@@ -18890,7 +20156,7 @@ msgstr ""
 "tornar a intentar, cliqueu el botó \"Endarrere\".\n"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:228 shell/e-shell-importer.c:259
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -18900,35 +20166,35 @@ msgstr ""
 "S'està important l'element %d."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:332
+#: shell/e-shell-importer.c:333
 msgid "Select importer"
 msgstr "Seleccioneu l'importador"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:449 shell/e-shell-importer.c:1023
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "El fitxer %s no existeix"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:457
+#: shell/e-shell-importer.c:459
 msgid "Importing"
 msgstr "S'està important"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:465
+#: shell/e-shell-importer.c:467
 #, c-format
 msgid "Importing %s.\n"
 msgstr "S'està important %s.\n"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:475 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "S'ha produït un error en carregar %s"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:492
+#: shell/e-shell-importer.c:495
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -18938,37 +20204,38 @@ msgstr ""
 "S'està important l'element 1."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:546
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automàtic"
 
-# fitxer: shell.ca.po
-#: shell/e-shell-importer.c:595
-msgid "_Filename:"
-msgstr "Nom del _fitxer:"
+# fitxer: composer.ca.po
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nom del fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:600
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:610
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Tipus de fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:649
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importa dades i paràmetres de pr_ogrames més antics"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Impo_rta un únic fitxer"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:566
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -18977,85 +20244,49 @@ msgstr ""
 "S'està cercant configuracions prèvies"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:724
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "S'estan iniciant els importadors intel·ligents"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:850 shell/e-shell-startup-wizard.c:693
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 # fitxer: camel.ca.po.3
-#: shell/e-shell-importer.c:1037
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No hi ha cap importador disponible per al fitxer %s"
 
 # fitxer: camel.ca.po.4
-#: shell/e-shell-importer.c:1049
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "No s'ha pogut executar l'importador"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:1159
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importa"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "S'estan tancant les connexions..."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-settings-dialog.c:327
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Configuració de l'Evolution"
 
-# fitxer: shell.ca.po
-#. 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 "Seleccioneu un usuari."
-
-# fitxer: shell.ca.po
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr "S'està obrint la carpeta"
-
-# fitxer: shell.ca.po
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr "S'està obrint la carpeta \"%s\""
-
-# fitxer: shell.ca.po
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr "a \"%s\" ..."
-
-# fitxer: shell.ca.po
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr "No s'ha pogut obrir la carpeta compartida: %s."
-
-# fitxer: shell.ca.po
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr "No s'ha pogut trobar la carpeta compartida especificada."
-
 # fitxer: mail.ca.po.2
-#: shell/e-shell-startup-wizard.c:570
+#: shell/e-shell-startup-wizard.c:575
 msgid "Starting import"
 msgstr "S'està iniciant la importació"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-startup-wizard.c:785
+#: shell/e-shell-startup-wizard.c:795
 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 "
@@ -19096,248 +20327,135 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' són noms de carpeta reservats."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Sembla que aquest sistema no té instal·lades les eines Pilot del GNOME."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "S'ha produït un error en executar %s."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "El Bug buddy no està instal·lat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug buddy."
 
-# fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
-msgstr "Quant al Ximian Evolution"
+# fitxer: calendar.ca.po.3
+#: shell/e-shell-window-commands.c:322
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Treballa connectat"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:327
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "El Ximian Evolution està actualment connectat. Cliqueu aquest botó per "
 "treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:334
-msgid "Ximian Evolution is in the process of going offline."
+#: shell/e-shell-window.c:344
+#, fuzzy
+msgid "Evolution is in the process of going offline."
 msgstr "El Ximian Evolution està en procés de treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:340
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "El Ximian Evolution està actualment desconnectat. Cliqueu aquest botó per "
 "treballar connectat."
 
-# fitxer: shell.ca.po
-#: shell/e-shell.c:537
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Avís: L'Evolution no ha pogut actualitzar les dades de la versió %d.%d.%d.\n"
-"Les dades no s'han suprimit, però aquesta versió de l'Evolution no les "
-"visualitzarà.\n"
+# fitxer: mail.ca.po.2
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Correu per a %s"
+
+# fitxer: calendar.ca.po.5
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Error desconegut"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1063
+#: shell/e-shell.c:1131
 msgid "Invalid arguments"
 msgstr "Els arguments no són vàlids"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1065
+#: shell/e-shell.c:1133
 msgid "Cannot register on OAF"
 msgstr "No s'ha pogut registrar l'OAF"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1067
+#: shell/e-shell.c:1135
 msgid "Configuration Database not found"
 msgstr "No s'ha pogut trobar la base de dades de configuració."
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1069
+#: shell/e-shell.c:1137
 msgid "Generic error"
 msgstr "Error genèric"
 
 # fitxer: shell.ca.po
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Quadre de verificació"
-
-# fitxer: shell.ca.po
-#: shell/e-user-creatable-items-handler.c:601
-#: shell/e-user-creatable-items-handler.c:642
+#: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Nou"
 
 # fitxer: shell.ca.po
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"L'error és desconegut."
-
-# fitxer: shell.ca.po
-#: 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"
-"L'error del sistema del component és:\n"
-"%s"
-
-# fitxer: shell.ca.po
-#: 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"
-"L'error del sistema d'activació és:\n"
-"%s"
-
-# fitxer: shell.ca.po
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Nova prova"
-
-# fitxer: shell.ca.po
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "P_rova"
-
-# fitxer: shell.ca.po
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Crea un nou element de prova"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Connexions actives</b>"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Connexions actives"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Cliqueu 'D'acord' per tancar aquestes connexions i desconnectar-se"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "C_alendari:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Contactes:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Correu:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tasques:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Tipus de carpeta:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Obre la carpeta d'un altre usuari"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Compte:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nom de la carp_eta:"
-
-# fitxer: shell.ca.po
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Usuari:"
-
-# fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistent de configuració de l'Evolution"
 
 # fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "S'estan important els fitxers"
 
 # fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fus horari"
 
 # fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Benvingut"
 
 # fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -19352,7 +20470,7 @@ msgstr ""
 "Cliqueu el botó \"Endavant\" per continuar. "
 
 # fitxer: shell.ca.po
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -19365,6 +20483,21 @@ msgstr ""
 "Cliqueu el botó \"Aplica\" per desar tots els paràmetres. "
 
 # fitxer: shell.ca.po
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Nova prova"
+
+# fitxer: shell.ca.po
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "P_rova"
+
+# fitxer: shell.ca.po
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Crea un nou element de prova"
+
+# fitxer: shell.ca.po
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -19438,13 +20571,13 @@ msgstr "L'Evolution pot importar les dades dels fitxers següents:"
 
 # fitxer: shell.ca.po
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
-#, no-c-format
+#: shell/main.c:225
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"This version of 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"
@@ -19476,67 +20609,56 @@ msgstr ""
 "ansiosament les vostres contribucions!\n"
 
 # fitxer: shell.ca.po
-#: shell/main.c:255
+#: shell/main.c:249
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Gràcies\n"
 "L'equip del Ximian Evolution\n"
 
 # fitxer: shell.ca.po
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "No m'ho tornis a dir"
 
 # fitxer: shell.ca.po
-#: shell/main.c:392
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "No s'ha pogut accedir l'intèrpret d'ordres del Ximian Evolution."
-
-# fitxer: shell.ca.po
-#: shell/main.c:401
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-"No s'ha pogut inicialitzar l'intèrpret d'ordres del Ximian Evolution: %s"
-
-# fitxer: shell.ca.po
-#: shell/main.c:498
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Inicia l'Evolution activant el component especificat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:500
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Inicia desconnectat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:502
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Inicia connectat"
 
 # fitxer: shell.ca.po
-#: shell/main.c:505
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Força l'aturada de tots els components de l'Evolution"
 
-#: shell/main.c:509
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Força tornar a migrar des de l'Evolution 1.4"
 
 # fitxer: shell.ca.po
-#: shell/main.c:512
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Envia la sortida de la depuració de tots els components a un fitxer."
 
 # fitxer: shell.ca.po
-#: shell/main.c:535
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
 # fitxer: shell.ca.po
-#: shell/main.c:539
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19545,36 +20667,127 @@ msgstr ""
 "%s: --online i --offline no es poden utilitzar junts.\n"
 "  Utilitzeu %s --help per a més informació.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+# fitxer: addressbook.gui.component.ca.po
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "S'està connectant"
+
+# fitxer: calendar.ca.po.5
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "No s'ha pogut iniciar el servidor wombat"
+
+# fitxer: mail.ca.po.2
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Assitent per als comptes d'Evolution"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Seleccioneu quin certificat s'importarà..."
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nom del certificat"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Propòsits"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Nombre de sèrie"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Caduca"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Adreça de correu electrònic"
 
@@ -19623,6 +20836,12 @@ msgstr ""
 "  Assumpte: %s\n"
 
 # fitxer: smime.ca.po
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Certificat del client SSL"
+
+# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<No és una part del certificat>"
@@ -19693,7 +20912,7 @@ msgstr ""
 "procediments (si estan disponibles)"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -19717,23 +20936,27 @@ msgstr "Nom comú (CN)"
 msgid "Contact Certificates"
 msgstr "Certificats dels contactes"
 
-# fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Voleu confiar en \"%s\" per als propòsits següents?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Només la finestra tonta"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edita"
 
 # fitxer: smime.ca.po
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Entitat certificadora del correu electrònic"
+
+# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificat del receptor de correu electrònic"
@@ -19774,56 +20997,50 @@ msgid "SHA1 Fingerprint"
 msgstr "Marca SHA1"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificat del client SSL"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificat del servidor SSL"
 
-# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+# fitxer: smime.ca.po
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Confieu en aquesta autoritat certificadora per identificar usuaris de correu "
 "electrònic."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr ""
 "Confieu en aquesta autoritat certificadora per identificar desenvolupadors "
 "de programari."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Confieu en aquesta autoritat certificadora per identificar llocs web."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Visualitza"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Visualitza el certificat"
-
-# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Se us ha demanat que confieu en una nova entitat certificadora (CA)."
-
-# fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Teniu certificats d'aquestes organitzations que us identifiquen:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
@@ -19831,255 +21048,272 @@ msgstr ""
 "certificadores:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Teniu certificats en un fitxer que identifiquen aquestes persones:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Els vostres certificats"
 
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
 # fitxer: smime.ca.po
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:612
 msgid "Certificate already exists"
 msgstr "El certificat ja existeix"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "S'està signant"
+
+# fitxer: mail.ca.po.3
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Xifrat"
+
+# fitxer: smime.ca.po
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versió"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versió 2"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versió 2"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versió 3"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Xifratge #1 MD2 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Xifratge PKCS #1 MD5 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Xifratge PKCS #1 SHA-1 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "Xifratge PKCS #1 RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Ús de la clau de certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Tipus de certificat del Netscape"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de clau de l'entitat certificadora"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de l'objecte (%s)"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identificador de l'algorisme"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Paràmetres de l'algorisme"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informació de clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorisme de clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "S'ha produït un error: no es pot processar l'extensió"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signador de l'objecte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Entitat certificadora de l'SSL"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Entitat certificadora del correu electrònic"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "S'està signant"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "No rebutjable"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Xifrat de clau"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Xifrat de dades"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Acord quant a la clau"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Signador del certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Signador CRL"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "És crític"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "No és crític"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algorisme de la signatura del certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emissor"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Identificador únic de l'emissor"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Identificador únic de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valor de la signatura de certificat"
 
@@ -20132,13 +21366,13 @@ msgstr "Assumpte predeterminat per al missatge."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "No es pot executar '%s': %s\n"
 
 # fitxer: tools.ca.po
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "S'està tancant %s (%s)\n"
@@ -20217,7 +21451,8 @@ msgstr "Selecciona tots els contactes"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Envia un missatge als contactes seleccionats."
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
@@ -20257,7 +21492,7 @@ msgstr "Visualitza el contacte actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
 #: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -20278,7 +21513,8 @@ msgstr "Subfinestra _per previsualitzar"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "De_sa com a VCard"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
@@ -20432,17 +21668,29 @@ msgstr "Visualitza la cita"
 msgid "Week"
 msgstr "Setmana"
 
+# fitxer: calendar.ca.po.5
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Setmana laborable"
+
 # fitxer: ui.evolution-calendar.xml.h.ca.po
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Obre una cita:"
 
+# fitxer: calendar.ca.po.5
+#: 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 "Ta_nca"
+
 # fitxer: ui.evolution-comp-editor.xml.h.ca.po
 #: 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
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Tanca"
 
@@ -20458,7 +21706,7 @@ msgstr "Suprimeix aquest element"
 
 # fitxer: ui.evolution-comp-editor.xml.h.ca.po
 #: 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:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra d'eines principal"
 
@@ -20509,18 +21757,10 @@ msgstr "Desa aquest element al disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fitxer"
 
-# fitxer: ui.evolution-comp-editor.xml.h.ca.po
-#: 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:50
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Desa"
-
 # fitxer: ui.evolution-composer-entries.xml.h.ca.po
 #: ui/evolution-composer-entries.xml.h:1
 msgid "Copy selected text to the clipboard"
@@ -20567,6 +21807,14 @@ msgstr "Desa el contacte i tanca el quadre de diàleg"
 msgid "Send _Message to Contact..."
 msgstr "Envia un _missatge al contacte..."
 
+# fitxer: ui.evolution-comp-editor.xml.h.ca.po
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Desa"
+
 # fitxer: ui.evolution-contact-list-editor.xml.h.ca.po
 #: ui/evolution-contact-list-editor.xml.h:4
 msgid "Delete this list"
@@ -21133,7 +22381,8 @@ msgstr "Obre el missatge seleccionat en una nova finestra"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Obre el missatge seleccionat en el redactor per reenviar-lo"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
@@ -21277,72 +22526,57 @@ msgid "_Attached"
 msgstr "_Adjunt"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copia a la carpeta"
-
-# fitxer: ui.evolution-mail-message.xml.h.ca.po
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crea un filtre del missatge"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Vés a"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Insertat"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Més gran"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Visualització del _missatge"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Mou a la carpeta"
-
-# fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Missatge següe_nt"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Visualització _normal"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Obre un missatge"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Missa_tge anterior"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citat"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "To_rna a enviar..."
-
-# fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -21352,14 +22586,14 @@ msgid "_Undelete"
 msgstr "Desfés l'esb_orrat"
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Tan_ca"
 
@@ -21466,11 +22700,6 @@ msgid "Save the message in a specified folder"
 msgstr "Desa el missatge a una carpeta determinada"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Envia"
-
-# fitxer: ui.evolution-message-composer.xml.h.ca.po
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -21724,7 +22953,8 @@ msgstr "_Obre una tasca"
 
 # fitxer: ui.evolution.xml.h.ca.po
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
 msgstr "Quant al Ximian Evolution..."
 
 # fitxer: ui.evolution.xml.h.ca.po
@@ -21732,123 +22962,140 @@ msgstr "Quant al Ximian Evolution..."
 msgid "Change Evolution's settings"
 msgstr "Canvia la configuració de l'Evolution"
 
-# fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:5
-msgid "Create a new window"
-msgstr "Crea una nova finestra"
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Canvia les propietats de la carpeta"
 
-# fitxer: ui.evolution.xml.h.ca.po
+# fitxer: calendar.ca.po.5
 #: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Crea una nova carpeta de correu"
+
+# fitxer: ui.evolution.xml.h.ca.po
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "S_urt"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Preguntes quant a l'Evolution"
+
+# fitxer: ui.evolution.xml.h.ca.po
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Surt del programa"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Oblida les contrasenyes recordades perquè se us preguntin de nou"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importa dades d'altres programes"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:12
-msgid "Open a new window"
-msgstr "Obre una nova finestra"
+#: ui/evolution.xml.h:14
+#, fuzzy
+msgid "New _Window"
+msgstr "_Finestra"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Configuració de_l Pilot..."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "_Envia / reb"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Envia els elements encuats i obté els nous"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Defineix la configuració del Pilot"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Mostra informació quant al Ximian Evolution"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Envia un informe d'error"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "En_via un informe d'error"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error utilitzant el Bug Buddy"
 
+# fitxer: ui.evolution-comp-editor.xml.h.ca.po
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barra d'eines principal"
+
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr "Commuta entre treballar connectat i desconnectat."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Preguntes quant a l'Evolution"
-
-# fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
 msgstr "_Quant al Ximian Evolution..."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Ajuda"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importa..."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nou"
 
 # fitxer: mail.ca.po.3
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "Referència rà_pida"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Envia / reb"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Finestra"
 
@@ -21932,29 +23179,31 @@ msgstr "Amb _data de venciment:"
 msgid "With _Status"
 msgstr "Amb e_stat"
 
-# fitxer: views.ca.po
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasques"
-
 # fitxer: widgets.ca.po
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:198
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
 # fitxer: widgets.ca.po
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Seleccioneu una zona horària"
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "Zones horàries"
 
 # fitxer: widgets.ca.po
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Zones horàries"
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr "_Selecció:"
 
 # fitxer: widgets.ca.po
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "Seleccioneu una zona horària"
+
+# fitxer: widgets.ca.po
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -21965,11 +23214,6 @@ msgstr ""
 "Useu el botó dret del ratolí per desfer l'ampliació anterior."
 
 # fitxer: widgets.ca.po
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "_Selecció:"
-
-# fitxer: widgets.ca.po
 #: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr "Visualització a_ctual"
@@ -22020,105 +23264,105 @@ msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del percentatge ha d'estar entre 0 i 100, ambdòs inclosos"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Bàltic"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Europeu central"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Xinès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Ciríl·lic"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Grec"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebreu"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Japonès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Coreà"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:70
+#: widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Turc"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:71
+#: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicode"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:72
+#: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Europeu occidental"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:73
+#: widgets/misc/e-charset-picker.c:74
 msgid "Western European, New"
 msgstr "Europeu occidental, nou"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:90 widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "Tradicional"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95 widgets/misc/e-charset-picker.c:96
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Simplificat"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:99
+#: widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:102
+#: widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr "Visual"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:170
+#: widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Conjunt de caràcters desconegut: %s"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:215 widgets/misc/e-charset-picker.c:444
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Codificació dels caràcters"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:224
+#: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr "Introduïu el joc de caràcters que s'utilitzarà"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-charset-picker.c:320
+#: widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Altres..."
 
@@ -22127,6 +23371,39 @@ msgstr "Altres..."
 msgid "..."
 msgstr "..."
 
+# fitxer: shell.ca.po
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+# fitxer: mail.ca.po.3
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Correu de l'Evolution"
+
+# fitxer: calendar.ca.po.3
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informació de la reunió"
+
+# fitxer: shell.ca.po
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Prova de l'Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:417
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Tipus de lletra impresa</span>"
+
 # fitxer: widgets.ca.po
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -22199,18 +23476,18 @@ msgid "Spacing around expander arrow"
 msgstr "Espaiat al voltant de la fletxa de l'expansor"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-filter-bar.c:191
+#: widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
 msgstr "_Cerques"
 
 # fitxer: widgets.ca.po
-#: widgets/misc/e-filter-bar.c:193
+#: widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr "Editor de cerques"
 
 # fitxer: widgets.ca.po
 #. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:214
+#: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "Desa la cerca"
 
@@ -22269,14 +23546,1451 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Troba _ara"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+# fitxer: addressbook.gui.widgets.ca.po
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr ""
+"El %s ja existeix\n"
+"El voleu sobreescriure?"
+
+# fitxer: addressbook.tools.ca.po
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
+# fitxer: addressbook.tools.ca.po
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "No es pot obrir el fitxer"
+
 # fitxer: shell.ca.po
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 # fitxer: shell.ca.po
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Credencials d'autenticació del servidor d'HTTP"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendaris seleccionats per a la publicació"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Login name:"
+#~ msgstr "Nom d'usuari:"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "User Publishes"
+#~ msgstr "Publicacions de l'usuari"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Visualitzador de carpetes de la llibreta d'adreces de l'Evolution"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "New Addressbook Book"
+#~ msgstr "Nou llibre de llibreta d'adreces"
+
+# fitxer: camel.ca.po.3
+#~ msgid "_Address Book"
+#~ msgstr "Llibret_a d'adreces"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "Create a new address book"
+#~ msgstr "Crea una nova llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "No s'ha pogut realitzar la consulta al Root DSE"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Error retrieving schema information"
+#~ msgstr "S'ha produït un error en recuperar la informació de l'esquema"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr ""
+#~ "L'identificador d'usuari (UID) de l'origen dels contactes que mostrarà la "
+#~ "visualització"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "The URI that the address book will display"
+#~ msgstr "La URI que mostrarà la llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Mostra les bas_es suportades "
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Address Book Creation Assistant"
+#~ msgstr "Assistent de creació de la llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "Congratulations, you are\n"
+#~ "\t      finished setting up this address book.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "Felicitats, heu finalitzat\n"
+#~ "\t      el procés de configuració d'aquesta llibreta\n"
+#~ "d'adreces.\n"
+#~ "\n"
+#~ "Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "L'Evolution utilitzarà el DN per autenticar-vos al servidor"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Finished"
+#~ msgstr "Ha finalitzat"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
+#~ "(Secure Sockets Layer)\n"
+#~ "and TLS (Transport Layer Security) protocols are used by some servers to "
+#~ "cryptographically protect\n"
+#~ "your connection. Ask your system administrator if your LDAP server uses "
+#~ "these protocols."
+#~ msgstr ""
+#~ "Heu d'especificar com voleu connectar-vos al servidor d'LDAP. Alguns "
+#~ "servidors utilitzen els\n"
+#~ "protocols SSL (Secure Socket Layer) i TLS (Transport Layer Security) per "
+#~ "protegir les connexions mitjançant xifratge.\n"
+#~ "Consulteu l'administrador de sistemes si el servidor d'LDAP utilitza "
+#~ "aquests protocols."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "One"
+#~ msgstr "One"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "Selecting this option will let you change Evolution's default settings "
+#~ "for LDAP\n"
+#~ "searches, and for creating and editing contacts. "
+#~ msgstr ""
+#~ "Si seleccioneu aquesta opció podreu modificar els paràmetres "
+#~ "predeterminats de les cerques d'LDAP de l'Evolution i de la creació i "
+#~ "edició dels contactes. "
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "Specifying a\n"
+#~ "\t\t\t  display name and group is the first step in setting\n"
+#~ "\t\t\t  up an address book."
+#~ msgstr ""
+#~ "El primer pas\n"
+#~ "\t\t\t  de la configuració d'una llibreta d'adreces és especificar\n"
+#~ "\t\t\t  un nom i grup per a la visualització."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Step 1: Folder Characteristics"
+#~ msgstr "Pas 1: Característiques de la carpeta"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Step 3: Connecting to Server"
+#~ msgstr "Pas 3: Connectar-se al servidor"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Step 4: Searching the Directory"
+#~ msgstr "Pas 4: Cercar el directori"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "The options on this page control how many entries should be included in "
+#~ "your\n"
+#~ "searches, and how long a search should take. Ask your system "
+#~ "administrator if you\n"
+#~ "need to change these options."
+#~ msgstr ""
+#~ "Les opcions d'aquesta pàgina defineixen la quantitat d'entrades que "
+#~ "s'haurien d'incloure\n"
+#~ "a les cerques i la durada esperada de les cerques. Pregunteu a "
+#~ "l'administrador del sistema\n"
+#~ "si heu de modificar aquestes opcions."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "This assistant will help you\n"
+#~ "\t      create a new address book. \n"
+#~ "\n"
+#~ "Depending on the type of address book you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "L'assistent us ajudarà a\n"
+#~ "\t      crear una nova llibreta d'adreces.\n"
+#~ "\n"
+#~ "Es necessitaran més paràmetres en funció del tipus de la llibreta "
+#~ "d'adreces\n"
+#~ "que creeu. Si necessiteu ajuda per trobar la informació poseu-vos en\n"
+#~ "contacte amb l'administrador del sistema."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid ""
+#~ "This is the name that will appear in your Evolution folder list. It is "
+#~ "for display purposes only. "
+#~ msgstr ""
+#~ "El nom que apareixerà a la vostra llista de carpetes de l'Evolution. "
+#~ "Només s'utilitza per visualitzar-la."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "L'opció especifica la durada de l'execució de la cerca."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Utilitza _SSL/TLS:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ 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 ""
+#~ "Heu decidit configurar un servidor d'LDAP. El primer pas és definir-ne el "
+#~ "nom i la\n"
+#~ "informació d'entrada. Si no esteu segur d'aquestes dades pregunteu-ho a "
+#~ "l'administrador del sistema."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Display name:"
+#~ msgstr "Nom _de visualització"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Port number:"
+#~ msgstr "Nombre del _port:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Server name:"
+#~ msgstr "Nom del _servidor:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Temps d'espera (minuts):"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "connecting-tab"
+#~ msgstr "pestanya-connexió"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "general-tab"
+#~ msgstr "pestanya-general"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "searching-tab"
+#~ msgstr "pestanya-cerca"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid " B_usiness:"
+#~ msgstr " F_eina:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "A_ddress..."
+#~ msgstr "A_dreça..."
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "A_ssistant's name:"
+#~ msgstr "Nom de l'a_judant:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Addressbook:"
+#~ msgstr "Llibreta d'adreces:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Blog address:"
+#~ msgstr "Adreça de la bitàcola:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Business fa_x:"
+#~ msgstr "Fa_x de la feina:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Collaboration"
+#~ msgstr "Col·laboració"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Enter the person's instant messenger accounts here."
+#~ msgstr "Introduïu-hi els comptes de missatgeria instantània de la persona."
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "File a_s:"
+#~ msgstr "Anomena i de_sa:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid ""
+#~ "If this person has the ability to participate in a video conference, "
+#~ "enter their address here."
+#~ msgstr ""
+#~ "Si aquest persona pot participar en una videoconferència, introduïu-ne "
+#~ "l'adreça."
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid ""
+#~ "If this person publishes free/busy or other calendar information on the "
+#~ "Internet, enter the address\n"
+#~ "of that information here."
+#~ msgstr ""
+#~ "Si la persona publica informació de lliure/ocupat o qualsevol altra "
+#~ "relacionada amb el calendari a internet,\n"
+#~ "introduïu-ne l'adreça."
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "New phone type"
+#~ msgstr "Nou tipus de telèfon"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Organi_zation:"
+#~ msgstr "Organit_zació:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Primary _email:"
+#~ msgstr "Adreça _electrònica primària:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Business:"
+#~ msgstr "_Feina:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Categories..."
+#~ msgstr "_Categories..."
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Home:"
+#~ msgstr "_Inici"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Job title:"
+#~ msgstr "_Càrrec:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Manager's name:"
+#~ msgstr "Nom de l'ad_ministrador:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Mobile:"
+#~ msgstr "_Mòbil:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Public Calendar URL:"
+#~ msgstr "URL del calendari _públic:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_This is the mailing address"
+#~ msgstr "És l'adreça elec_trònica"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Video Conferencing URL:"
+#~ msgstr "URL del sistema de _videoconferència:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "_Web page address:"
+#~ msgstr "Adreça de la pàgina _web:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Account Name"
+#~ msgstr "Nom del compte"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Save Contact as VCard"
+#~ msgstr "Desa el contacte com a VCard"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Business"
+#~ msgstr "Feina"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr ""
+#~ "No s'ha pogut trobar l'element de la interfície gràfica per a un camp: '%"
+#~ "s'"
+
+# fitxer: addressbook.gui.contact-list-editor.ca.po
+#~ msgid "contact-list-editor"
+#~ msgstr "editor de la llista de contactes"
+
+# fitxer: addressbook.gui.contact-list-editor.ca.po
+#~ msgid "Save List as VCard"
+#~ msgstr "Desa la llista com a VCard"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "S'ha produït un error en el programa de suport\n"
+#~ "de la llibreta d'adreces %s. Haureu de reiniciar l'Evolution per tornar-"
+#~ "lo a utilitzar"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#~ msgid "Error saving %s: %s"
+#~ msgstr "S'ha produït un error en desar el fitxer %s: %s"
+
+# fitxer: addressbook.tools.ca.po
+#~ msgid "Can not load URI"
+#~ msgstr "No es pot carregar la URI"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Could not start wombat"
+#~ msgstr "No s'ha pogut iniciar el wombat"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Visualitzador de l'Evolution Calendar"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Visualitzador de tasques de l'Evolution"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "No s'ha pogut inicialitzar el gnome-vfs"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "The view showing when the calendar starts"
+#~ msgstr "La visualització que mostra quan s'inicia el calendari"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "C_alendar"
+#~ msgstr "C_alendari"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "No s'ha pogut obrir la carpeta a '%s'"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "La URI que mostrarà el calendari"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "The type of view to show"
+#~ msgstr "El tipus de visualització a mostrar"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opcions de l'alarma de l'àudio"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opcions de l'alarma dels missatges"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opcions de l'alarma del correu electrònic"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opcions de l'alarma del programa"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Es desconeixen les opcions de l'alarma"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetició de l'alarma"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Message to Display:"
+#~ msgstr "Missatge a visualitzar:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Message to Send"
+#~ msgstr "Missatge a enviar"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Play sound:"
+#~ msgstr "Reprodueix el so:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Run program:"
+#~ msgstr "Executa el programa:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "With these arguments:"
+#~ msgstr "Amb aquests arguments:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Basics"
+#~ msgstr "Bàsics"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Date/Time:"
+#~ msgstr "Data/hora:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Display a message"
+#~ msgstr "Mostra un missatge"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Reminders"
+#~ msgstr "Recordatoris"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_Options..."
+#~ msgstr "_Opcions..."
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Alerts"
+#~ msgstr "Alertes"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_General"
+#~ msgstr "_General"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Calendar Creation Assistant"
+#~ msgstr "Assistent de creació de calendaris"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Calendar Properties"
+#~ msgstr "Propietats del calendari"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "Congratulations, you are finished setting up this calendar.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "Felicitats, heu finalitzat la configuració d'aquest calendari.\n"
+#~ "\n"
+#~ "Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "Congratulations, you are finished setting up this task list.\n"
+#~ "\n"
+#~ "Please click the \"Apply\" button to save the settings you have entered "
+#~ "here."
+#~ msgstr ""
+#~ "Felicitats, heu finalitzat la configuració d'aquesta llista de tasques.\n"
+#~ "\n"
+#~ "Cliqueu el botó 'Aplica' per desar els paràmetres que heu introduït."
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Remote"
+#~ msgstr "Remota"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "Specifying a display name and group is the first step in setting up a "
+#~ "calendar."
+#~ msgstr ""
+#~ "El primer pas de configuració d'un calendari és especificar un nom i grup "
+#~ "de visualització."
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "Specifying a display name and group is the first step in setting up a "
+#~ "task list."
+#~ msgstr ""
+#~ "El primer pas de configuració d'una llista de tasques és especificar un "
+#~ "nom i grup de visualització."
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Step 2: Remote Folder Parameters"
+#~ msgstr "Pas 2: paràmetres de la carpeta remota"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Task List Creation Assistant"
+#~ msgstr "Assistent de creació de llistes de tasques"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Task List Properties"
+#~ msgstr "Propietats de la llista de tasques"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "This assistant will help you create a new calendar. \n"
+#~ "\n"
+#~ "Depending on the type of calendar you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "Aquest assistent us ajudarà a crear un nou calendari.\n"
+#~ "\n"
+#~ "En funció del tipus de calendari que creeu caldran\n"
+#~ "paràmetres addicionals. Poseu-vos en contacte amb el vostre\n"
+#~ "administrador de sistemes si necessiteu ajuda per trobar\n"
+#~ "aquesta informació."
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "This assistant will help you create a new task list.\n"
+#~ "\n"
+#~ "Depending on the type of task list you create, additional\n"
+#~ "parameters may be required. Please contact your system\n"
+#~ "administrator if you need help finding this information."
+#~ msgstr ""
+#~ "Aquest assistent us ajudarà a crear una nova llista de tasques.\n"
+#~ "\n"
+#~ "En funció del tipus de llista de tasques que creeu caldran paràmetres\n"
+#~ "addicionals. Poseu-vos en contacte amb el vostre administrador de "
+#~ "sistema\n"
+#~ "si necessiteu ajuda per trobar aquesta informació."
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "You're creating a folder in a group that's stored in a remote location. "
+#~ "This requires you\n"
+#~ "to specify additional parameters."
+#~ msgstr ""
+#~ "Esteu creant una carpeta en un grup que està desat en una ubicació "
+#~ "remota. Per a aquesta opció\n"
+#~ "heu d'especificar paràmetres addicionals."
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Intè_rval d'actualització:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_Source URL:"
+#~ msgstr "URL d'o_rigen:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "L'esdeveniment que esteu suprimint és una reunió, voleu enviar una "
+#~ "notificació de cancel·lació?"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "La tasca que se suprimirà està assignada, voleu enviar una notificació de "
+#~ "cancel·lació?"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Esteu segur de voler cancel·lar i suprimir aquesta tasca?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "L'entrada del diari que s'està suprimint està publicada, voleu enviar una "
+#~ "notificació de cancel·lació?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Esteu segur de voler suprimir aquesta tasca sense nom?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Esteu segur de voler suprimir aquesta entrada del diari sense nom?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Addressbook..."
+#~ msgstr "Llibreta d'adreces..."
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Reminder"
+#~ msgstr "Recordatori"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "B_usy"
+#~ msgstr "Oc_upat"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidencial"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "F_ree"
+#~ msgstr "Lliu_re"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Pu_blic"
+#~ msgstr "Pú_blic"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Add A_ttendee"
+#~ msgstr "Afegeix assis_tents"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Invite Others..."
+#~ msgstr "Conv_ida a altres..."
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Preview"
+#~ msgstr "Previsualització"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regla de periodicitat"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Custom recurrence"
+#~ msgstr "Periodi_citat personalitzada"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Modify"
+#~ msgstr "_Modifica"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_No recurrence"
+#~ msgstr "Se_nse periodicitat"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Simple recurrence"
+#~ msgstr "Periodicitat _simple"
+
+# fitxer: calendar.ca.po.4
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "L'esdeveniment s'ha modificat però no s'ha desat.\n"
+#~ "\n"
+#~ "Voleu desar els canvis?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Save Event"
+#~ msgstr "Desa l'esdeveniment"
+
+# fitxer: shell.ca.po
+#~ msgid "Select source"
+#~ msgstr "Seleccioneu la font"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "calendar"
+#~ msgstr "calendari"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "task list"
+#~ msgstr "llista de tasques"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "S'ha creat la informació de la reunió. Voleu enviar-la?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "S'ha modificat la informació de la reunió. Voleu enviar-ne una versió "
+#~ "actualitzada?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "S'ha creat la informació d'assignació de la tasca. Voleu enviar-la?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "S'ha modificat la informació de la tasca. Voleu enviar-ne una versió "
+#~ "actualitzada?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "% _Complete"
+#~ msgstr "% _completada"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Progress"
+#~ msgstr "Progrés"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Due date is before start date!"
+#~ msgstr "La data de venciment és anterior a la data d'inici."
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidencial"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Folder:"
+#~ msgstr "Carpeta:"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Acabat:</b> "
+
+# fitxer: calendar.ca.po.3
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Venciment:</b> "
+
+# fitxer: calendar.ca.po.3
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Cap</i>"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "No s'ha pogut actualitzar el fitxer del calendari.\n"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "S'ha produït un error en el sistema CORBA\n"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Object could not be found\n"
+#~ msgstr "No s'ha pogut trobar l'objecte\n"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "No teniu els permisos necessaris per actualitzar el calendari\n"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "No s'ha pogut actualitzar l'estat de l'assistència.\n"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "_Options"
+#~ msgstr "_Opcions"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Meeting _start time:"
+#~ msgstr "Hora d'_inici de la reunió:"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "Meeting _end time:"
+#~ msgstr "Hora de finalització de la r_eunió:"
+
+# fitxer: calendar.ca.po.3
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "El programa de suport de la tasca per a\n"
+#~ "%s\n"
+#~ " ha fallat."
+
+# fitxer: calendar.ca.po.3
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha produït un error en obrir %s:\n"
+#~ "%s"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "El suport del calendari per a '%s' ha fallat."
+
+# fitxer: calendar.ca.po.3
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "El suport de la tasca per a '%s' ha fallat."
+
+# fitxer: calendar.ca.po.2
+#~ msgid "New task list"
+#~ msgstr "Nova llista de tasques"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "_Task List"
+#~ msgstr "Llista de _tasques"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "Create a new task list"
+#~ msgstr "Crea una llista de tasques nova"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "L'URI de la carpeta de tasques a visualitzar"
+
+# fitxer: calendar.ca.po.2
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "No s'han pogut carregar les tasques a '%s'"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "S'està aprenent si els missatges són brossa"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "El servidor de notícies no permet publicar"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en enviar la capçalera del grup de notícies: %s. No "
+#~ "s'ha publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en publicar al grup de notícies: %s. No s'ha "
+#~ "publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en llegir la resposta al missatge publicat. No s'ha "
+#~ "publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en publicar el missatge: %s. No s'ha publicat el "
+#~ "missatge"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Stream error"
+#~ msgstr "Error en el fluxe"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Connection error: %s"
+#~ msgstr "S'ha produït un error en la connexió: %s"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Could not get group: %s"
+#~ msgstr "No s'ha pogut obtenir el grup: %s"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Could not get messages: unspecificed error"
+#~ msgstr "No s'ha pogut obtenir els missatges. No s'ha especificat l'error"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Resposta desconeguda del servidor: %s"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "S'ha produït un error en llegir el fitxer %s:\n"
+#~ "%s"
+
+# fitxer: composer.ca.po
+#~ msgid "Error saving file: %s"
+#~ msgstr "S'ha produït un error en desar el fitxer: %s"
+
+# fitxer: composer.ca.po
+#~ msgid "Error loading file: %s"
+#~ msgstr "S'ha produït un error en carregar el fitxer: %s"
+
+# fitxer: composer.ca.po
+#~ msgid "Error accessing file: %s"
+#~ msgstr "S'ha produït un error en accedir el fitxer: %s"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No es pot posicionar en el fitxer: %s\n"
+#~ "%s"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Unable to truncate file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "No es pot truncar el fitxer: %s\n"
+#~ "%s"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "S'ha produït un error en desar automàticament el missatge: %s\n"
+#~ " %s"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved messages from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "El Ximian Evolution ha trobat missatges sense desar d'una sessió "
+#~ "anterior.\n"
+#~ "Voleu provar de recuperar-los?"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "The message \"%s\" has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "No s'ha enviat el missatge '%s'.\n"
+#~ "\n"
+#~ "Voleu desar-ne els canvis?"
+
+# fitxer: composer.ca.po
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "No s'ha pogut crear la finestra del redactor:\n"
+#~ "no s'ha pogut activar el component editor d'HTML."
+
+# fitxer: filter.ca.po
+#~ msgid "Rule name '%s' is not unique, choose another."
+#~ msgstr "Heu d'escollir un altre nom perquè la regla '%s' ja existeix."
+
+# fitxer: filter.ca.po
+#~ msgid "_Score Rules"
+#~ msgstr "Regle_s de puntuació"
+
+# fitxer: filter.ca.po
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "Heu d'especificar almenys una carpeta com a font."
+
+# fitxer: mail.ca.po.3
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Visualitzador de les carpetes de correu de l'Evolution"
+
+# fitxer: mail.ca.po.3
+#~ msgid "You must specify a valid script name."
+#~ msgstr "Heu d'especificar un nom de fitxer de seqüència vàlid."
+
+# fitxer: mail.ca.po.3
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Aquest missatge no té cap assumpte.\n"
+#~ "Voleu enviar-lo?"
+
+# fitxer: mail.ca.po.3
+#~ 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 ""
+#~ "La llista de contactes que esteu enviant està configurada per ocultar les "
+#~ "adreces de la llista, per tant aquest missatge només contindrá "
+#~ "destinataris Bcc."
+
+# fitxer: mail.ca.po.3
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Aquest missatge conté només destinataris Bcc."
+
+# fitxer: mail.ca.po.3
+#~ msgid ""
+#~ "It is possible that the mail server may reveal the recipients by adding "
+#~ "an Apparently-To header.\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "És possible que el servidor de correu revel·li els destinataris si "
+#~ "afegeix una capçalera Aparentment-Pera.\n"
+#~ "Voleu enviar-lo?"
+
+# fitxer: mail.ca.po.3
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr ""
+#~ "Per poder enviar aquest missatge, cal que indiqueu els destinataris."
+
+# fitxer: mail.ca.po.3
+#~ msgid "Folder Name"
+#~ msgstr "Nom de la carpeta"
+
+# fitxer: camel.ca.po.3
+#~ msgid "Cannot move folder `%s': illegal operation"
+#~ msgstr "No s'ha pogut moure la carpeta '%s'. L'operació no és vàlida"
+
+# fitxer: mail.ca.po.3
+#~ msgid "%s"
+#~ msgstr "%s"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Could not delete folder: %s"
+#~ msgstr "No s'ha pogut suprimir la carpeta : %s"
+
+# fitxer: mail.ca.po.3
+#~ msgid "_Properties..."
+#~ msgstr "_Propietats..."
+
+# fitxer: mail.ca.po.3
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder del fil"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtra pel fil"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Internal error: expecting CamelMultipart, got \"%s\""
+#~ msgstr ""
+#~ "S'ha produït un error intern: s'esperava un CamelMultipart, s'ha rebut \"%"
+#~ "s\""
+
+# fitxer: camel.ca.po.2
+#~ msgid "Internal error: expecting CamelMimeMessage, got \"%s\""
+#~ msgstr ""
+#~ "S'ha produït un error intern: s'esperava un CamelMimeMessage, s'ha rebut "
+#~ "\"%s\""
+
+# fitxer: mail.ca.po.3
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr ""
+#~ "No s'ha pogut migrar les memòries cau dels identificadors d'usuari: %s"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "No s'ha pogut migrar l'estat d'expansió de la carpeta: %s"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "No s'ha pogut obrir el magatzem per a '%s': %s"
+
+# fitxer: mail.ca.po.3
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "El %A %d de %B del %Y a les %H:%M %%+05d, en/na %%s va escriure:"
+
+# fitxer: mail.ca.po.3
+#~ msgid ""
+#~ "Cannot save to `%s'\n"
+#~ " %s"
+#~ msgstr ""
+#~ "No es pot desar a '%s'\n"
+#~ " %s"
+
+# fitxer: mail.ca.po.3
+#~ msgid ""
+#~ "`%s' already exists.\n"
+#~ "Overwrite it?"
+#~ msgstr ""
+#~ "Ja existeix '%s'.\n"
+#~ "El voleu sobreescriure?"
+
+# fitxer: mail.ca.po.3
+#~ msgid "Error: '%s' exists and is not a regular file"
+#~ msgstr "S'ha produït un error: '%s' existeix i no és un fitxer per a dades"
+
+# fitxer: mail.ca.po.3
+#~ 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 ""
+#~ "Aquesta operació suprimirà permanentment tots els missatges esborrats de "
+#~ "la carpeta '%s'. Si continueu, no podreu recuperar aquests missatges.\n"
+#~ "\n"
+#~ "Voleu suprimir aquests missatges?"
+
+# fitxer: mail.ca.po.3
+#~ 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 ""
+#~ "Aquesta operació suprimirà permanentment tots els missatges esborrats de "
+#~ "totes les carpetes. Si continueu, no podreu recuperar aquests missatges.\n"
+#~ "\n"
+#~ "Voleu suprimir aquests missatges?"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "0pc1ó s3cr3t4"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "0pc1ó s3cr3t4."
+
+#~ msgid "The following filter rule(s):\n"
+#~ msgstr "Les següents regles de filtratge:\n"
+
+#~ msgid ""
+#~ "Used the removed folder:\n"
+#~ "    '%s'\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "S'ha utilitzat la carpeta suprimida:\n"
+#~ "    '%s'\n"
+#~ "I s'ha actualitzat."
+
+# fitxer: mail.ca.po.2
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "La URI de l'origen de correu que mostarà la visualització"
+
+# fitxer: mail.ca.po.2
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Comprova correu d'en_trada"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Use _Daemon"
+#~ msgstr "Utilitza el _dimoni"
+
+# fitxer: mail.ca.po.1
+#~ msgid "_Local Tests Only"
+#~ msgstr "Només proves _locals"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_minute(s)"
+#~ msgstr "_minuts"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Working"
+#~ msgstr "S'està treballant"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Save signature"
+#~ msgstr "Desa la signatura"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
+#~ msgstr "S'està intentant editar una vfolder '%s' que inexistent."
+
+# fitxer: shell.ca.po
+#~ msgid "Default shortcut group"
+#~ msgstr "Grup de dreceres predeterminat"
+
+# fitxer: shell.ca.po
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Amplada predeterminada de la subfinestra de la barra d'adreces"
+
+# fitxer: shell.ca.po
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Camí de la carpeta de calendari predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Camí de la carpeta de correu predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Camí de la carpeta de tasques predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "L'URI física a la carpeta de calendari predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "L'URI física a la carpeta de contactes predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "L'URI física a la carpeta de correu predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "L'URI física a la carpeta de tasques predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Si s'ha de mostrar la barra de carpetes"
+
+# fitxer: shell.ca.po
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Si s'ha de mostrar la barra de dreceres"
+
+# fitxer: shell.ca.po
+#~ msgid "Brought to you by"
+#~ msgstr "Desenvolupat per a vos per"
+
+# fitxer: shell.ca.po
+#~ msgid "Extra Completion folders"
+#~ msgstr "Carpetes de completat extra"
+
+# fitxer: shell.ca.po
+#~ msgid "Select Default Folder"
+#~ msgstr "Seleccioneu la carpeta predeterminada"
+
+# fitxer: shell.ca.po
+#~ msgid "Default Folders"
+#~ msgstr "Carpetes predeterminades"
+
+# fitxer: shell.ca.po
+#~ msgid "Offline Folders"
+#~ msgstr "Carpetes desconnectades"
+
+# fitxer: shell.ca.po
+#~ msgid "Autocompletion Folders"
+#~ msgstr "Carpetes de completat automàtic"
+
+# fitxer: shell.ca.po
+#~ msgid "The specified folder name is not valid: %s"
+#~ msgstr "El nom de carpeta especificat no és vàlid: %s"
+
+# fitxer: shell.ca.po
+#~ msgid "_Filename:"
+#~ msgstr "Nom del _fitxer:"
+
+# fitxer: shell.ca.po
+#~ msgid "Please select a user."
+#~ msgstr "Seleccioneu un usuari."
+
+# fitxer: shell.ca.po
+#~ msgid "Opening Folder"
+#~ msgstr "S'està obrint la carpeta"
+
+# fitxer: shell.ca.po
+#~ msgid "Opening Folder \"%s\""
+#~ msgstr "S'està obrint la carpeta \"%s\""
+
+# fitxer: shell.ca.po
+#~ msgid "in \"%s\" ..."
+#~ msgstr "a \"%s\" ..."
+
+# fitxer: shell.ca.po
+#~ msgid "Could not open shared folder: %s."
+#~ msgstr "No s'ha pogut obrir la carpeta compartida: %s."
+
+# fitxer: shell.ca.po
+#~ msgid "Cannot find the specified shared folder."
+#~ msgstr "No s'ha pogut trobar la carpeta compartida especificada."
+
+# fitxer: shell.ca.po
+#~ msgid "About Ximian Evolution"
+#~ msgstr "Quant al Ximian Evolution"
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Avís: L'Evolution no ha pogut actualitzar les dades de la versió %d.%d.%"
+#~ "d.\n"
+#~ "Les dades no s'han suprimit, però aquesta versió de l'Evolution no les "
+#~ "visualitzarà.\n"
+
+# fitxer: shell.ca.po
+#~ msgid "Checkbox"
+#~ msgstr "Quadre de verificació"
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error és desconegut."
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error del sistema del component és:\n"
+#~ "%s"
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error del sistema d'activació és:\n"
+#~ "%s"
+
+# fitxer: shell.ca.po
+#~ msgid "C_alendar:"
+#~ msgstr "C_alendari:"
+
+# fitxer: shell.ca.po
+#~ msgid "_Contacts:"
+#~ msgstr "_Contactes:"
+
+# fitxer: shell.ca.po
+#~ msgid "_Tasks:"
+#~ msgstr "_Tasques:"
+
+# fitxer: shell.ca.po
+#~ msgid "Folder _type:"
+#~ msgstr "_Tipus de carpeta:"
+
+# fitxer: shell.ca.po
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Obre la carpeta d'un altre usuari"
+
+# fitxer: shell.ca.po
+#~ msgid "_Folder Name:"
+#~ msgstr "Nom de la carp_eta:"
+
+# fitxer: shell.ca.po
+#~ msgid "_User:"
+#~ msgstr "_Usuari:"
+
+# fitxer: shell.ca.po
+#~ msgid "Cannot access the Ximian Evolution shell."
+#~ msgstr "No s'ha pogut accedir l'intèrpret d'ordres del Ximian Evolution."
+
+# fitxer: shell.ca.po
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr ""
+#~ "No s'ha pogut inicialitzar l'intèrpret d'ordres del Ximian Evolution: %s"
+
+# fitxer: smime.ca.po
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Voleu confiar en \"%s\" per als propòsits següents?"
+
+# fitxer: smime.ca.po
+#~ msgid "View Certificate"
+#~ msgstr "Visualitza el certificat"
+
+# fitxer: smime.ca.po
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Se us ha demanat que confieu en una nova entitat certificadora (CA)."
+
+# fitxer: ui.evolution-mail-message.xml.h.ca.po
+#~ msgid "_Resend..."
+#~ msgstr "To_rna a enviar..."
+
+# fitxer: ui.evolution.xml.h.ca.po
+#~ msgid "Create a new window"
+#~ msgstr "Crea una nova finestra"
+
+# fitxer: ui.evolution.xml.h.ca.po
+#~ msgid "Open a new window"
+#~ msgstr "Obre una nova finestra"
diff --git a/po/da.po b/po/da.po
index c8fb13813b..118d021dac 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -27,16 +27,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution adressebog"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakter: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution _vindue"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -62,35 +52,256 @@ msgstr "kort"
 msgid " card"
 msgstr "1 kort"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakter: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _vindue"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Markøren kunne ikke indlæses\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Mislykkedes med godkendelse på LDAP-server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Serveren svarede at ingen søgebaser understøttes"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Kunne ikke hente gruppe: %s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Serveren svarede ikke med gyldig schemainformation"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Kunne ikke indlæse %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategori-redigering ikke tilgængelig."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Gem i adressebog"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Fejl ved indlæsning af adressebog."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Fejl ved søgning"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Vil du gemme ændringene?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Forkast"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "og ét andet kort."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Kunne ikke hente besked fra redigering"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Fejl ved tilføjelse af kort"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adressebog - adressevisning"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Kunne ikke indlæse %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Tilslutter LDAP-serveren anonymt"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Mislykkedes med godkendelse.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Mapper for automatisk udfyldning"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sAngiv adgangskode for %s (bruger %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Certifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfigurér dine e-post-konti her"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebog - adresse-pop-op"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebog - adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebog - kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressebogskomponent"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -125,7 +336,7 @@ msgstr "Ny kontakt:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakter:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -150,15 +361,15 @@ msgid "Migrating `%s':"
 msgstr "Pinger %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -167,22 +378,22 @@ msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Mapper for automatisk udfyldning"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -190,58 +401,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adressebog"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Tilslutter LDAP-serveren anonymt"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Mislykkedes med godkendelse.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -261,63 +481,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Mapper for automatisk udfyldning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "_Certifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Konfigurér dine e-post-konti her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebog - adresse-pop-op"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebog - adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebog - kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressebogskomponent"
-
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappeindstillingsopsætnings-styreelement"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -325,7 +488,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -334,8 +497,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -361,6 +523,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autenticering"
@@ -410,13 +573,11 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlæggende"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
@@ -680,34 +841,26 @@ msgid "cards"
 msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Vælg kontakter fra adressebogen"
+#: 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:208
+msgid "Remove All"
+msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -722,7 +875,7 @@ msgid "Send HTML Mail?"
 msgstr "Send HTML-baseret e-post?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Tilføj i kontakter"
 
@@ -730,15 +883,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Kilde"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Vælg kontakter fra adressebogen"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -765,6 +926,11 @@ msgstr "_Kategori:"
 msgid "_Find"
 msgstr "Søg"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Søg"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -811,9 +977,8 @@ msgid "<b>Work</b>"
 msgstr "Arbejdsuge"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -838,7 +1003,6 @@ msgid "Birthday:"
 msgstr "Fø_dselsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alender:"
@@ -854,15 +1018,15 @@ msgid "Company:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -972,8 +1136,8 @@ msgstr "_Hjemmeside-adresse:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -995,44 +1159,28 @@ msgid "_File under:"
 msgstr "Filnavn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"fjerne disse kontakter?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2014,141 +2162,133 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Post meddelelse"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Navnløs liste"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Gruppe"
+msgid "Service"
+msgstr "Tjeneste klar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Sted:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Bruger_navn:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Andre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Gruppe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Kilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Gentagelsesdatoen er ugyldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Ugyldigt formål"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Post meddelelse"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Tjeneste klar"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Sted:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Bruger_navn:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtig kontakt-tilføjelse"
@@ -2169,6 +2309,22 @@ msgstr "_Fulde navn:"
 msgid "E-_mail:"
 msgstr "E-post"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"fjerne disse kontakter?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2297,50 +2453,71 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Vælg kontakter fra adressebogen"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Fjern valgte opføringer fra bilagslisten"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Valgt"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skjul adresser når du sender e-post til listen"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "Listenavn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Skriv en e-post-adresse eller træk en kontakt ind i feltet nedenfor:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "kontakt-liste-redigering"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Bog"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Obligatoriske deltagere"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Gem liste som VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Ændret kontakt:"
@@ -2379,11 +2556,414 @@ msgstr ""
 "i denne mappe. Vil du tilføje den alligevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Vis kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakter"
+msgstr[1] "Kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Forespørgsel"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Fejl ved bogvisning"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Fejl ved ændring af kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Navn begynder med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-postadresse begynder med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategorien er"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Et felt indeholder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Avanceret..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Adressebog"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Gem som VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Ny kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Ny kontaktliste..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Gå til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Importér..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Søg efter kontakter..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Adressbogskilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Pilotindstillinger..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Send besked til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Udskriv"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Udskriv konvolut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Adressebog..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Adressebog..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klip ud"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopier"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Indsæt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Aktuel visning"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Enhver kategori"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistents telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Fax på arbejde"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Arbejdstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Arbejdstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Telefon for tilbageringing"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: 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:3
+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:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: 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
+#, fuzzy
+msgid "Given Name"
+msgstr "Feltnavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Fax hjemme"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
+
+#: 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 "Jordan"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Leder"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Anden fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Anden telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Personsøger"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primær telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TTD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Titel"
+
+#: 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"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Højde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Felt"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Tekstmodel"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maksimal feltnavnslængde"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Der findes ingen objekter at vise i denne visning.\n"
+"\n"
+"Dobbeltklik her for at oprette en ny kontakt."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Der findes ingen objekter at vise i denne visning."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2395,117 +2975,90 @@ msgid "map"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Gruppe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Arbejde"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Kommentar"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hjemme"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Succes"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressbogen findes ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ny kontaktliste"
@@ -2513,74 +3066,74 @@ msgstr "Ny kontaktliste"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kort ikke fundet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Afbrudt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Kunne ikke åbne den delte mappe: %s."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Ingen sådan besked"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2589,7 +3142,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/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2599,7 +3152,7 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2611,7 +3164,7 @@ msgstr ""
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2621,7 +3174,7 @@ msgstr ""
 "at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
 "kunne nåes."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2633,7 +3186,7 @@ msgstr ""
 "Gør din søgning mere specifik eller øg resultatgrænsen i\n"
 "katalogserverindstillingerne for denne adressebog."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2646,48 +3199,48 @@ msgstr ""
 "specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
 "for denne adressbog."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bagenden for denne adressebog kunne ikke forstå forespørgslen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 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/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2696,7 +3249,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:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2705,49 +3258,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Overskriv"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2757,48 +3310,38 @@ msgstr "VCard for %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Vælg en handling"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opret en ny kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Kører forespørgsel i adressebog..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Redigér kontaktinfo"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Flet e-postadresse"
 
@@ -2824,377 +3367,6 @@ msgstr "Gem kontakt som VCard"
 msgid "Save in addressbook"
 msgstr "Gem i adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Vis kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Kontakter"
-msgstr[1] "Kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Forespørgsel"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Fejl ved bogvisning"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Fejl ved ændring af kort"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Navn begynder med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "E-postadresse begynder med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategorien er"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Et felt indeholder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Avanceret..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Adressebog"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Gem som VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Ny kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Ny kontaktliste..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Gå til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Importér..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Søg efter kontakter..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Adressbogskilder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Pilotindstillinger..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Send besked til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Udskriv"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Udskriv konvolut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Adressebog..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Adressebog..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klip ud"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Indsæt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Aktuel visning"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Enhver kategori"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistents telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Fax på arbejde"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Arbejdstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Arbejdstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Telefon for tilbageringing"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-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: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
-#, fuzzy
-msgid "Given Name"
-msgstr "Feltnavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Fax hjemme"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Hjemmetelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Hjemmetelefon 2"
-
-#: 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 "Jordan"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Kaldenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Anden fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Anden telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Personsøger"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primær telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: 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:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "TTY/TTD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Titel"
-
-#: 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"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Bredde"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Højde"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Felt"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Feltnavn"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Tekstmodel"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maksimal feltnavnslængde"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Der findes ingen objekter at vise i denne visning.\n"
-"\n"
-"Dobbeltklik her for at oprette en ny kontakt."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Der findes ingen objekter at vise i denne visning."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kortvisning"
@@ -3237,6 +3409,11 @@ msgstr "Evolutions VCard-importerer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Udskriv konvolut"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3248,11 +3425,6 @@ msgstr "Udskriv valgte kontakter"
 msgid "Print contact"
 msgstr "Udskriv valgte kontakter"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Udskriv konvolut"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3439,6 +3611,23 @@ msgstr "Kontakt_liste"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Kan ikke åbne besked"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke indlæse %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kunne ikke åbne adressebogen"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3496,23 +3685,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Intern fejl"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Kan ikke åbne besked"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunne ikke indlæse %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Kunne ikke åbne adressebogen"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fejl ved indlæsning af adressebog."
@@ -3529,40 +3701,368 @@ msgstr "Intet filnavn angivet."
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Slet ikke"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Send-til:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Er du sikker på, at du vil aflyse og slette dette møde?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Er du sikker på at du vil slette %d opgaver?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Er du sikker på at du vil slette %d journalopføringer?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Er du sikker på at du vil slette aftalen `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Er du sikker på at du vil slette %d aftaler?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Er du sikker på at du vil slette opgaven `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Er du sikker på at du vil slette aftalen `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Er du sikker på at du vil slette opgaven `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Aftale"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Vil du gemme ændringene?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
+"opdateres?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Forkast ændringer"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution kalender lokalfil-backend"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Indtast adgangskode"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Dél flerdagshændelser:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Kunne ikke starte wombat-server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Kunne ikke starte wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke læse pilotens kalender-programblok"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Standardprioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 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 "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-opsætnings-styringselement"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendertilrettelægnings-beskedvisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender/opgave-redigering"
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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
 msgid "Starting:"
@@ -3659,10 +4159,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
@@ -3811,9 +4307,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar indeholder"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ingen træffere"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3837,8 +4354,8 @@ msgid "Purge events older than"
 msgstr "returnerer mindre end"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dage"
 
@@ -3849,7 +4366,7 @@ msgstr "%A den %d. %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d. %b"
@@ -3899,68 +4416,56 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Mød_e"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nyt heldagsmøde"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmøde"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "K_alender:"
+msgid "Cale_ndar"
+msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Opret en ny mappe"
@@ -3991,27 +4496,6 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentar indeholder"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Ingen træffere"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fejl under åbning af kalender"
@@ -4029,227 +4513,132 @@ msgstr "Du har ikke rettigheder til at åbne kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Valgmuligheder for lyd-alarmer"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Valgmuligheder for beskedsalarmer"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Valgmuligheder for e-post-alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Valgmuligheder for program-alarmer"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Valgmuligheder for ukendte alarmer"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Gentagelse af alarm"
+msgid "<b>Alarm</b>\t"
+msgstr "Kalenderinformation"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Meddelelsesvisning"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Besked som skal sendes"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Afspil lyd:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Gentag alarmen"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Kør program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Send-til:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Med disse argumenter:"
+msgid "<b>Options</b>"
+msgstr "Beskrivelse:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Påmindelser"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "ekstra gange hver"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "timer"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Skriv en besked"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Tilføj"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Basis"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Dato/klokke:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Beskeder"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Afspil en lyd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Påmindelse"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Kør et program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send-til:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send en besked"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sammendrag:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Konto:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Kør program:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Valgmuligheder..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Gentag alarmen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "efter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "slutning på aftale"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "ekstra gange hver"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "timer"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "start på aftale"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Du skal angive et filnavn."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Ny-kaledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Opgaveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "F_arver"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Vælg en farve"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Ny-kaledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Ny gruppe..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Opdatér"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Tilføj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "uger"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmer"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4367,7 +4756,7 @@ msgid "Free/Busy Publishing"
 msgstr "Forespørgsel om ledig/optaget"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Fredag"
@@ -4381,7 +4770,7 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Mandag"
@@ -4391,7 +4780,7 @@ msgid "S_un"
 msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Lørdag"
@@ -4405,7 +4794,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Søndag"
@@ -4419,7 +4808,7 @@ msgid "T_hu"
 msgstr "T_or"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torsdag"
@@ -4433,7 +4822,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tirsdag"
@@ -4443,7 +4832,7 @@ msgid "W_eek starts:"
 msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -4477,7 +4866,8 @@ msgstr "_Komprimér weekender i månedsvisning"
 msgid "_Day begins:"
 msgstr "_Dagen begynder:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4527,6 +4917,81 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før hvert møde"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Du skal angive et filnavn."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Ny-kaledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Opgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "F_arver"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Vælg en farve"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Ny-kaledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Ny gruppe..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Opdatér"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "uger"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hændelse er slettet."
@@ -4575,83 +5040,77 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfejl: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Færdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Færdig "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Gem som..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 #, 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Kan ikke hente versionsdata!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfejl: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Færdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Færdig "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4720,8 +5179,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adressebog..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Kontakter..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4731,164 +5191,222 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Påmindelse"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Information"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møde"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Slutdatoen er forkert"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Starttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Sluttiden er forkert"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "før hvert møde"
+msgstr[1] "før hvert møde"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "slutning på aftale"
+msgstr[1] "slutning på aftale"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "før hvert møde"
+msgstr[1] "før hvert møde"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Varer he_le dagen"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "før hvert møde"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Optaget"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "før hvert møde"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorier..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "før hvert møde"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Kalenderinformation"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klassificering"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Dato & tid"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Fortroligt"
+msgid "A_ll day event"
+msgstr "Varer he_le dagen"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Dato/klokke:"
+msgid "C_ustomize..."
+msgstr "Gem tilrettet visning..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "L_edig"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorier..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Sted:"
+msgid "Cale_ndar:"
+msgstr "K_alender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klassificering"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Of_fentlig"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Fortroligt"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Vis tid som"
+msgid "L_ocation:"
+msgstr "Sted:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Offentlig"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Vis tid som"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmer"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Beskrivelse:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "S_lut-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 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:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "En organisator er påkrævet."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Slet"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Fje_rn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4927,36 +5445,45 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Deltager"
+msgid "<b>Attendees</b>"
+msgstr "<b>Begynder:</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Tilføj afsenderen til adresse_bogen"
+msgid "<b>Organizer</b>"
+msgstr "<b>Udføres inden:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Æn_dr organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Kontakter..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Æn_dr organisator"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organisator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5033,152 +5560,144 @@ msgstr "Denne og fremtidige indstanser"
 msgid "All Instances"
 msgstr "All indstanser"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale har genindtræffelser som ikke kan redigeres af Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Gentagelsesdatoen er ugyldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "første"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "anden"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "sidste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Anden dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "gentagelser"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Hver"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Undtagelser"
+msgid "<b>Exceptions</b>"
+msgstr "Beskrivelse:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Forhåndsvis:"
+msgid "<b>Preview</b>"
+msgstr "Forhåndsvis"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Regel for genindtræffelse"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "E_gendefineret genindtræffelse"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Ændr"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "I_ngen genindtræffelse"
+msgid "<b>Recurrence</b>"
+msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Fje_rn"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Hver"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Simpel genindtræffel_se"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "R_edigér aftale"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "for altid"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "måned(er)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "til"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "uge(r)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Vælg en målmappe til at importere data"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Slet denne mappe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Besked som skal vises:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% færdig"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Besked som skal vises:"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Fuldført"
 
@@ -5190,8 +5709,8 @@ msgstr "Høj"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "I gang"
@@ -5203,23 +5722,22 @@ msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikke startet"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "I gang"
+msgid "P_ercent complete:"
+msgstr "Færdige procenter: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5244,37 +5762,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Hjemmeside-adresse:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Opgave"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kunne ikke åbne adressebogen"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidensiel"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Besked som skal vises:"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Besked som skal vises:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_Mappe:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5285,60 +5808,58 @@ msgstr "Sta_rt dato:"
 msgid "_Due date:"
 msgstr "Fær_dig-dato:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Ugyldigt svar på autenticering fra server."
+msgid "_Group:"
+msgstr "Gruppe"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Kalenderinformation"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Dag"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Ledig/optaget-information"
+msgid "<b>Publishing _Location</b>"
+msgstr "Forespørgsel om ledig/optaget"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Forespørgsel om ledig/optaget"
+msgid "Free/Busy Editor"
+msgstr "Ledig/optaget-information"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Listenavn:"
+msgid "_Daily"
+msgstr "Dag"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Adgangskode"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Adgangskode"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Husk denne adgangskode"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruger_navn:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Uge"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5420,7 +5941,7 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klik for at tilføje en opgave"
@@ -5429,6 +5950,11 @@ msgstr "Klik for at tilføje en opgave"
 msgid "Untitled"
 msgstr "Uden navn"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Sammendrag:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5442,7 +5968,7 @@ msgstr "Fær_dig-dato:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Status:"
 
@@ -5456,20 +5982,93 @@ msgstr "_Prioritet:"
 msgid "Web Page:"
 msgstr "_Hjemmeside-adresse:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Offentlig"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Slutdato"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privat"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Fortroligt"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Optaget"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske positionen skal skrives ind på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nej"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Genindtræffer"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Tildelt"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5515,96 +6114,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Optaget"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åbn"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Åbn besked"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gem _som..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ud..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiér"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Tildel opgave"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Markér som fuldført"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Markér valgte opgaver som komplette"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Slet"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Sle_t valgte opgaver"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Gem som..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik for at tilføje en opgave"
 
@@ -5613,181 +6218,112 @@ msgstr "Klik for at tilføje en opgave"
 msgid "% Complete"
 msgstr "% færdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Fuldført"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Fuldført dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Færdig-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Flytter beskeder"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopierer meddelelser"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vælg _tråd"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Slet..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiér til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_yt til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Slutdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Startdato"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Genindtræffer"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nej"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske positionen skal skrives ind på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5811,36 +6347,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters opdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr " "
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr " "
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5907,37 +6443,36 @@ msgid ", ending on "
 msgstr ", sluttende på "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Begynder:</b>"
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Slutter:<b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Færdig:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Udføres inden:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Færdig "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5945,308 +6480,288 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Sted:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-msgid "Object could not be found\n"
-msgstr "Objektet kunne ikke findes\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Deltagerstatus kunne ikke opdateres!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
@@ -6275,6 +6790,10 @@ msgstr "Indlæser kalender"
 msgid "Loading calendar..."
 msgstr "Indlæser kalender..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serverbesked:"
@@ -6291,11 +6810,6 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Formænd"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Obligatoriske deltagere"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltagere"
@@ -6363,6 +6877,28 @@ msgstr "Delegeret"
 msgid "In Process"
 msgstr "I gang"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A den %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m-%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ude"
@@ -6371,98 +6907,64 @@ msgstr "Ude"
 msgid "No Information"
 msgstr "Ingen information"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Tilføj afsenderen til adresse_bogen"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Tilvalg"
+msgid "O_ptions"
+msgstr "Valgmuligheder"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Vis k_un arbejdstid"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ud"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Opdatér ledig/optaget"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autovælg"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Alle mennesker og ressourser"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Alle _mennesker og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Tid for mødets _start:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Tid for mødets slutning:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m-%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6471,120 +6973,53 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Åbner lager %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Fejl ved %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Åbner lager %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Opgaver"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Opdaterer objekter"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ingen aftaler."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Åbn i %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalender-opsætnings-styringselement"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendertilrettelægnings-beskedvisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender/opgave-redigering"
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Opgaver"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6924,10 +7359,6 @@ msgstr "Valgt måned (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Opgave"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6958,7 +7389,7 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
@@ -6987,7 +7418,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Ingen opgaver"
 msgstr[1] "Ingen opgaver"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7008,35 +7439,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opret en ny opgave"
@@ -8715,69 +9140,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig beskedstrøm modtaget fra %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fejl under læsning af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fejl under kørsel af filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åbne spool-mappen"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter besked %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Kan ikke åbne besked"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Mislykkedes på besked %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter besked %d af %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Mislykkedes på besked %d af %d"
@@ -8799,43 +9224,6 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Uunderstøttet operation: tillæg besked: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
-
-#: camel/camel-folder.c:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "Flytter beskeder"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopierer meddelelser"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Henter %d beskeder"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8881,7 +9269,44 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Uunderstøttet operation: tillæg besked: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
+
+#: camel/camel-folder.c:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Flytter beskeder"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopierer meddelelser"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Henter %d beskeder"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8892,15 +9317,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Mislykkedes med at tolke gpg-tips for brugerid."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Mislykkedes med at tolke gpg-løsen."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8909,28 +9334,28 @@ msgstr ""
 "Du skal bruge et gpg-løsen for at låse nøglen op\n"
 "for brugeren: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Mislykkedes med at kryptere: ingen gyldige modtagere angivet."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8941,87 +9366,67 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Mislykkedes med at GPG'e %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg kunne ikke udføres: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg kunne ikke udføres."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksér meddelelsers indhold"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikke oprette låsefil for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Tidsafbrud under ventning på låsefil for %s. Prøv igen senere."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Fejl under låsning ved brug af fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Fejl under låsning ved brug af flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9042,6 +9447,26 @@ msgstr "Kunne ikke låse '%s': protokolfejl med låsehjælper"
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke låse '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Kunne ikke oprette låsefil for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Tidsafbrud under ventning på låsefil for %s. Prøv igen senere."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Fejl under låsning ved brug af fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Fejl under låsning ved brug af flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9288,7 +9713,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -9371,55 +9796,55 @@ msgstr "POP før SMTP-godkendelse via ikke-pop kilde"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Oversættelse af regulært udtryk mislykkedes: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' skal indeholde et brugernavn"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' skal indeholde et værtsnavn"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' skal indeholde en sti"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finder: \"%s\""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fejl i navneopslag: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Værtsopslag mislykkedes: %s: vært ikke fundet"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Værtsopslag mislykkedes: %s: ukendt årsag"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Slår adresse op"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Opslag af værtsnavn mislykkedes: vært kunne ikke findes"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Opslag af værtsnavn mislykkedes: ukendt årsag"
 
@@ -9495,7 +9920,7 @@ msgstr "_Certifikat-ID:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
@@ -9591,7 +10016,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Redigér signatur"
 
 #: camel/camel-smime-context.c:651
@@ -9606,49 +10031,48 @@ msgstr "IMAP-kommando mislykkedes: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Kunne ikke finde certifikat for \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Kunne ikke finde en normal bulk-algoritme."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Ska_b regel fra meddelelse"
+msgid "Cannot create CMS Message"
+msgstr "Kan ikke åbne besked"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Kan ikke åbne besked"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Kan ikke vedlægge fil %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Kan ikke vedlægge fil %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Kan ikke åbne besked"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9695,7 +10119,8 @@ msgstr "Finder ikke mappe: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
@@ -9704,8 +10129,8 @@ msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 msgid "Trash"
 msgstr "Affald"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juni"
@@ -9826,7 +10251,7 @@ msgstr "Nøgleanvendelse understøtter ikke certifikatsignering"
 msgid "Error in application verification"
 msgstr "Fejl i programverifikation"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9839,11 +10264,11 @@ msgstr ""
 "Fingeraftryk:      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "DÅRLIG"
 
@@ -9867,7 +10292,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9882,7 +10307,7 @@ msgstr ""
 "\n"
 "Vil du acceptere?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9891,7 +10316,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9900,7 +10325,7 @@ msgstr ""
 "Fejlagtigt certifikatdomæne: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9909,7 +10334,7 @@ msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9918,7 +10343,7 @@ msgstr ""
 "Certifikattilbagekaldelseslisten er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
@@ -9942,7 +10367,7 @@ msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
@@ -9963,8 +10388,8 @@ msgid "Checking for new mail"
 msgstr "Ser efter nye beskeder"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Se efter nye beskeder i alle mapper"
 
@@ -9997,8 +10422,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10019,324 +10444,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Tyk tåge"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Uventet svar fra IMAP-server: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Server koblet fra uventet: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abonnerede mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Tilsidesæt servers navneområde for mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Navneområde"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For læsning og lagring af e-post på IMAP-servere."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
-"adgangskode."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-tjeneste for %s på %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS er ikke tilgængelig"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilkobling afbrudt"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Ukendt fejl"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Kan ikke tilslutte POP-servern %s: Ingen understøttelse for ønskede "
-"godkendelsesmekanisme."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Firma"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Finder ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Uventet svar fra IMAP-server: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Ingen opgaver"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Server koblet fra uventet: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10405,7 +10534,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10480,6 +10609,27 @@ msgstr "Tilslutning til LDAP-serveren mislykkedes"
 msgid "Command:"
 msgstr "Firma"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerede mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Tilsidesæt servers navneområde for mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Navneområde"
+
 #: 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"
@@ -10502,43 +10652,93 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-tjeneste for %s på %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Kunne ikke koble til %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS er ikke tilgængelig"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilkobling afbrudt"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-udvidelsen understøttes ikke."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10549,30 +10749,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Server koblet fra uventet: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For læsning og lagring af e-post på IMAP-servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
+"adgangskode."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kan ikke tilslutte POP-servern %s: Ingen understøttelse for ønskede "
+"godkendelsesmekanisme."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Firma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Ingen opgaver"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server koblet fra uventet: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10739,18 +11191,26 @@ msgstr "Kunne ikke gemme sammendrag: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke tilføje besked i sammendraget: ukendt grund"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Indbakke"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Besked aflyst"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilføje besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10766,48 +11226,48 @@ msgstr ""
 "Kan ikke hente besked: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' er ikke en maildir katalog."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11406,20 +11866,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Kunne ikke tilslutte POP-serveren %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte POP-servern %s i sikker tilstand: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke tilslutte POP-servern %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11428,28 +11893,28 @@ msgstr ""
 "Kan ikke tilslutte POP-servern %s: Ingen understøttelse for ønskede "
 "godkendelsesmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL \"%s\"-godkendelse mislykkedes for POP-serveren %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan ikke logge ind i POP-servern %s: SASL-protokollfejl"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sAngiv POP-adgangskoden for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11458,7 +11923,16 @@ msgstr ""
 "Kan ikke tilslutte POP-serveren %s.\n"
 "Fejl ved afsendelse af adgangskode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Kan ikke tilslutte POP-serveren %s.\n"
+"Fejl ved afsendelse af adgangskode: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%s'."
@@ -11672,97 +12146,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende besked: afsenderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Sender besked"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende besked: ingen modtagere definerte."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende meddelelse: en eller flere ugyldige modtagere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP-autenticering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Fejl under opretelse af SASL-autenticeringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autenticering fra server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Tidsafbrud for \"MAIL FROM\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Tidsafbrud for \"RCPT TO\"-forespørgsel: %s: besked ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislykkedes"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
@@ -11770,28 +12244,28 @@ msgstr "Tidsafbrud for DATA-forespørgsel: %s: besked ikke sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP-kommando mislykkedes: %s"
@@ -11855,101 +12329,6 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Altid signér udgående beskeder når denne konto bruges"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "_Altid signér udgående beskeder når denne konto bruges"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Kan ikke åbne besked"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente besked fra redigering"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Besked uden titel)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Åbn fil"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automatisk genereret"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Skriv en besked"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Kunne ikke oprette vindue:\n"
-"adresseudvælgelses-kontrol kunne ikke aktiveres."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Kunne ikke oprette redigerervinduet:\n"
-"Kan ikke aktivere HTML-redigeringskomponenten.\n"
-"Verficér at du har de rette versioner af\n"
-"gtkhtml og libgtkhtml installeret.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Kunne ikke oprette vindue:\n"
-"En komponent i HTML tekstbehandler kunne ikke aktiveres."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
-"ikke kan redigeres.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postdestination"
@@ -12032,17 +12411,92 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Altid signér udgående beskeder når denne konto bruges"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Altid signér udgående beskeder når denne konto bruges"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kan ikke åbne besked"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente besked fra redigering"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Besked uden titel)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Åbn fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatisk genereret"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Skriv en besked"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Videresendt besked - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Vedhæft originalmeddelelse"
+msgstr[1] "Vedhæft originalmeddelelse"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
+"ikke kan redigeres.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Vedlæg en fil til beskeden"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12060,54 +12514,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kunne ikke oprette kanal: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Næste _ulæste meddelelse"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vil du gemme ændringene?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Fjern ikke"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Fjern"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunne ikke gemme signaturfilen: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Fejl ved gemning af genveje."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Ændret besked"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12115,60 +12583,77 @@ msgid ""
 msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Forkast ændringer"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Gem besked som..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Kunne ikke oprette kanal: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Kunne ikke gemme signaturfilen: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Kunne ikke oprette kanal: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Kunne ikke oprette vindue:\n"
+"adresseudvælgelses-kontrol kunne ikke aktiveres."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Kunne ikke oprette redigerervinduet:\n"
+"Kan ikke aktivere HTML-redigeringskomponenten.\n"
+"Verficér at du har de rette versioner af\n"
+"gtkhtml og libgtkhtml installeret.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12466,11 +12951,6 @@ msgstr "%d %b %Y"
 msgid "Select a time to compare against"
 msgstr "Vælg en tid at sammenligne med"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Filterregler"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12499,19 +12979,8 @@ msgstr "Du skal angive et filnavn."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Fjerner mappe %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Du skal angive en mappe."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12519,160 +12988,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Tildeling"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Du skal give navn til dette filter."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Du skal give navn til denne vfolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Ingen server er valgt"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vælg en fil"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Udføres inden:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Vælg mappe"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Filterregler"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "vFolder kilder"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Sammenlign med"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Indkommende"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Meddelelsesdatorn vil blive sammenlignet med\n"
-"klokken 12.00 på den angivne dato."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Meddelelsedatoen vil blive sammenlignet med\n"
-"en tid som er relativ til den når filtret\n"
-"kørs."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Meddelelsedatoen vil blive sammenlignet med\n"
-"den aktuelle tiden når filtreringen kørs."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "en tid relativ til tiden nu"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "siden"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "måneder"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr " sekunder"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "kun specifikke mapper"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "tiden nu"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "den tid du angiver"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "med alle aktive eksterne mapper"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "med alle lokale og aktive eksterne mapper"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "med alle lokale mapper"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "år"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Vigtig"
 
@@ -12742,6 +13088,72 @@ msgstr "indkommende"
 msgid "outgoing"
 msgstr "udgående"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filterregler"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Sammenlign med"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Indkommende"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Meddelelsesdatorn vil blive sammenlignet med\n"
+"klokken 12.00 på den angivne dato."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Meddelelsedatoen vil blive sammenlignet med\n"
+"en tid som er relativ til den når filtret\n"
+"kørs."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Meddelelsedatoen vil blive sammenlignet med\n"
+"den aktuelle tiden når filtreringen kørs."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "en tid relativ til tiden nu"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "siden"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "måneder"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr " sekunder"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "tiden nu"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "den tid du angiver"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "år"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Tilføj regel"
@@ -12754,60 +13166,71 @@ msgstr "Rediger regel"
 msgid "Rule name"
 msgstr "Regelnavn"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Pointregler"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Point"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Redigererindstillinger"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Krop indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
+"hér"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Krop indeholder ikke"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Krop eller emne indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfigurér dine e-post-konti her"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Besked indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Modtagere indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-kontoopsætnings-styreelement"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Afsender indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolutions e-post-komponent"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Emne indeholder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-post-redigering"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne indeholder ikke"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-post-redigereropsætnings-styreelement"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtuelle mapper"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post-indstillings-styreelement"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Tilføj"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Post"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Kilde for virtuel mappe"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "E-post-indstillinger"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_E-post"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12840,51 +13263,313 @@ msgstr "_Tilføj signatur"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt besked"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+msgid "_Filter Rules"
+msgstr "Filterregler"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Vælg mappe"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Justér point"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Tilknyt farve"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Giv point"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Bilag"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Bip"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "indeholder"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopier til mappe"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Dato modtaget"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Dato sendt"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Slettet"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "indeholder ikke"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "slutter ikke med"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "eksisterer ikke"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "returnerer ikke"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "starter ikke med"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Skitse"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "slutter med"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Eksisterer"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "eksisterer"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Udtryk"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Følg op"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "er"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "er efter"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "er inden"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "er markeret med flag"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "er større end"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "er mindre end"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "er ikke"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "er ikke markeret med flag"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Juni"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiket"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "E-post-liste"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Beskedskrop"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Beskedshoved"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Beskeder"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Markér som v_igtig"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Flyt til mappe"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Afslut programmet"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Afspil lyd"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Læs"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Modtagere"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Træffer på regulært udtryk"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Svaret til"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "returnerer"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "returnerer større end"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "returnerer mindre end"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Kør program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Point"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Afsender"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Sæt status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "lyder som"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Kildekonto"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Specifik header"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "starter med"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Stop behandling"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Emne"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Neutraliser status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Udføres inden:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra søgning..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Skrifttypeegenskaber"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Egenskaber"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenavn:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Hjælpebesked"
+msgstr[1] "Hjælpebesked"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Hjælpebesked"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Næste _ulæste meddelelse"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Næste _ulæste meddelelse"
+msgstr[1] "Næste _ulæste meddelelse"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12894,414 +13579,431 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Specificér hvor mappen skal oprettes:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Virtuelle mapper "
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Indlæser..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Flyt"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Annullér opgave"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopier"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Opret en ny mappe"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbn i nyt vindue"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopiér..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Flyt..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Omdøb"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Egenska_ber..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Virtuelle mapper "
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Indbakke"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Omdøb..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Indlæser..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Post"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Egenskaber"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_kér som læst"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiket"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filterregler"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post-_liste"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiér henvisning"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at tilføje en opgave"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Fra"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Træffere:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Svar-til"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Redigér signatur"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc:"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Emne"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Redigér signatur"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilag"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+msgid "Unencrypted"
+msgstr "Afbrudt"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Et ikke understøttet skema"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Kan ikke verificere bladsignatur"
+msgid "Encrypted"
+msgstr "Kryptér med PGP"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Kan ikke verificere bladsignatur"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter besked %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Tildelt"
+msgid "_View Certificate"
+msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Redigér signatur"
+msgid "This certificate is not viewable"
+msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Redigér signatur"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Overskredet:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Afbrudt"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Vis indlejret"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Kryptér med PGP"
+msgid "_Hide"
+msgstr "Skjul"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d af %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Henter besked %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13338,9 +14040,35 @@ msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
 msgid "Formatting message"
 msgstr "Flytter beskeder"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Fra"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -13354,106 +14082,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Træffere:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Certifikat-ID:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s-bilag"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Certifikatet er ikke gyldigt endnu"
+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:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "den %d. %B %Y %H:%M"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Overskredet:"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "den %d. %B %Y %H:%M"
+msgid "Unsupported signature format"
+msgstr "Et ikke understøttet skema"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Vis indlejret"
+msgid "Error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Skjul"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d af %d"
+msgid "Unknown error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13572,7 +14241,7 @@ msgstr "Send _besked til liste..."
 msgid "_Add to Addressbook"
 msgstr "Tilføj afsenderen i adressebogen"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
@@ -13587,7 +14256,7 @@ msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mappe"
 
@@ -13624,11 +14293,24 @@ msgid "Add address"
 msgstr "Adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "E-post fra %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuelle mapper"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Kilde for virtuel mappe"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14120,64 +14802,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Redigererindstillinger"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Konfigurér dine e-post-konti her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-post-kontoopsætnings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolutions e-post-komponent"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution elm-importering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-post-redigering"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape-Mail-importering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook-Express-4-importering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-post-indstillings-styreelement"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "E-post-indstillinger"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_E-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14239,34 +14890,6 @@ msgstr "Importerer"
 msgid "Importing mailbox"
 msgstr "Importerer filer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution elm-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape-Mail-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook-Express-4-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importering"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14434,80 +15057,86 @@ msgstr "%s e-post-liste"
 msgid "Add Filter Rule"
 msgstr "Tilføj filterregel"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d valgte"
+msgid_plural "%d deleted"
+msgstr[0] "%d valgte"
+msgstr[1] "%d valgte"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d usendte"
+msgid_plural "%d junk"
+msgstr[0] "%d usendte"
+msgstr[1] "%d usendte"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Skitser"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Skitser"
+msgstr[1] "Skitser"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d sendte"
+msgid_plural "%d sent"
+msgstr[0] "%d sendte"
+msgstr[1] "%d sendte"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d usendte"
+msgid_plural "%d unsent"
+msgstr[0] "%d usendte"
+msgstr[1] "%d usendte"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d totalt"
+msgid_plural "%d total"
+msgstr[0] "%d totalt"
+msgstr[1] "%d totalt"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d usendte"
+msgid_plural ", %d unread"
+msgstr[0] "%d usendte"
+msgstr[1] "%d usendte"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-post-filtre"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Opret en ny mappe"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Tjekker tjeneste"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Kobler til server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
@@ -14569,16 +15198,24 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tjekker tjeneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kobler til server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Søg efter understøttede typer"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Forhåndsvis"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14854,7 +15491,7 @@ msgstr "Citér ikke originalmeddelelse"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Færdig"
 
@@ -15217,6 +15854,119 @@ msgstr "farve"
 msgid "description"
 msgstr "beskrivelse"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vFolder kilder"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepteret"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "F_ærdigt"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Skeln mellem store og små bogstaver"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Find i besked"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Find:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Flag at følge op"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Mappeabonnementer"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ingen valgt"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontoinformation"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"De meddelelser du har valgt for opfølgning listes nedenfor.\n"
+"Vælg en opfølgningshandling fra menuen \"Flag\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "E-post-konti"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Skal leveres den:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Flag:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Abonnér"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Fjern abonnement"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "kun specifikke mapper"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "med alle aktive eksterne mapper"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "med alle lokale og aktive eksterne mapper"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "med alle lokale mapper"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15423,14 +16173,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15535,8 +16277,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Kan ikke flytte mappe: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15586,8 +16329,9 @@ msgstr "Kunne ikke åbne den delte mappe: %s."
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "og ét andet kort."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15616,8 +16360,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Slet ikke"
+msgstr "Fortryd sletning"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15681,8 +16426,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Kunne ikke slette mappe:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15724,13 +16472,44 @@ msgstr ""
 "    '%s'\n"
 "Og er blevet opdateret."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Fjerner mappe %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Du skal angive en mappe."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Du skal give navn til denne vfolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ingen server er valgt"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15738,16 +16517,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overskriv"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15907,7 +16686,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15916,46 +16695,21 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Skeln mellem store og små bogstaver"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Find i besked"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Kontoinformation"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Afbryder..."
@@ -15991,24 +16745,24 @@ msgstr "Opdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -16065,15 +16819,15 @@ msgstr "Opdaterer vfoldere for URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
@@ -16137,7 +16891,7 @@ msgstr "%d %b %H:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -16193,10 +16947,6 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Læs"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
@@ -16209,50 +16959,51 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "Gennemse"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Flag at følge op"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Krop indeholder"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "F_ærdigt"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Krop indeholder ikke"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"De meddelelser du har valgt for opfølgning listes nedenfor.\n"
-"Vælg en opfølgningshandling fra menuen \"Flag\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Krop eller emne indeholder"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Skal leveres den:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Besked indeholder"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Modtagere indeholder"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Mappeabonnementer"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Afsender indeholder"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ingen valgt"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne indeholder"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne indeholder ikke"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Abonnér"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skallen"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Fjern abonnement"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolutions testkomponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16322,31 +17073,18 @@ msgstr ""
 msgid "mail"
 msgstr "E-post"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Ukendt fejl"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktive opkoblinger"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabase ikke fundet"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktive opkoblinger"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generisk fejl"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik o.k. for at lukke disse forbindelser og gå frakoblet"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16529,28 +17267,6 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i færd med at koble fra."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "E-post til %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16569,113 +17285,92 @@ msgstr "Bug buddy er ikke installeret."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke køres."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Gruppe"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Afkrydsningsboks"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Ny"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Ny opgave"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Test"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Opret en ny opgave"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution er i færd med at koble fra."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktive opkoblinger"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktive opkoblinger"
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik o.k. for at lukke disse forbindelser og gå frakoblet"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post til %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alender:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontakter: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_E-post:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Opgaver:"
+msgid "Uknown system error."
+msgstr "Ukendt fejl"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Mappe_type:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Åbn en anden brugers mappe"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Konto:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Mappenavn:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generisk fejl"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Bruger:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Ny"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Opsætningsassistent for Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidszone "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16689,7 +17384,7 @@ msgstr ""
 "\n"
 "Venligst klik 'Næste' for at fortsætte. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16701,19 +17396,20 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme dine indstillinger. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skallen"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Ny opgave"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolutions testkomponent"
+msgid "Create a new test item"
+msgstr "Opret en ny opgave"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16779,7 +17475,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16818,7 +17514,7 @@ msgstr ""
 "vi\n"
 "venter med spænding på dine bidrag!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16827,40 +17523,40 @@ msgstr ""
 "Tack\n"
 "Ximians Evolution-hold\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Fortæl mig det ikke igen"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Start i frakoblet tilstand"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Start i opkoblet tilstand"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gennemtving opgradering af konfigurationsfiler fra Evolution 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16935,6 +17631,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17202,6 +17920,12 @@ msgstr "_Certifikat-ID:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-ID eksisterer allerede"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17432,12 +18156,6 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfejl"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-ID eksisterer allerede"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17581,8 +18299,8 @@ msgstr "Vis den aktuelle kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -18069,16 +18787,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:5
-msgid "Close this window"
-msgstr "Luk dette vindue"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "L_uk"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18492,6 +19200,16 @@ msgstr "_Værktøjer"
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Luk dette vindue"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "L_uk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedlæg"
@@ -18574,10 +19292,6 @@ msgstr "Gem aktiv fil med et nyt navn"
 msgid "Save the message in a specified folder"
 msgstr "Gem beskeden i en specificeret mappe"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Send"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19162,7 +19876,7 @@ msgid "Evolution Query"
 msgstr "Evolution sammenfatning"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19326,27 +20040,277 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Ugyldigt svar på autenticering fra server."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Listenavn:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "kontakt-liste-redigering"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Gem liste som VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Gruppe"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Kunne ikke starte wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "K_alender:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Valgmuligheder for lyd-alarmer"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Valgmuligheder for beskedsalarmer"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Valgmuligheder for e-post-alarm"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Valgmuligheder for program-alarmer"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Valgmuligheder for ukendte alarmer"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Gentagelse af alarm"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Meddelelsesvisning"
+
+#~ msgid "Message to Send"
+#~ msgstr "Besked som skal sendes"
+
+#~ msgid "Play sound:"
+#~ msgstr "Afspil lyd:"
+
+#~ msgid "Run program:"
+#~ msgstr "Kør program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Med disse argumenter:"
+
+#~ msgid "Basics"
+#~ msgstr "Basis"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Dato/klokke:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Påmindelse"
+
+#~ msgid "_Options..."
+#~ msgstr "_Valgmuligheder..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adressebog..."
+
+#~ msgid "Reminder"
+#~ msgstr "Påmindelse"
+
+#~ msgid "B_usy"
+#~ msgstr "_Optaget"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Fortroligt"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Dato/klokke:"
+
+#~ msgid "F_ree"
+#~ msgstr "L_edig"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Of_fentlig"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Deltager"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Tilføj afsenderen til adresse_bogen"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Undtagelser"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Forhåndsvis:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for genindtræffelse"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "E_gendefineret genindtræffelse"
+
+#~ msgid "_Modify"
+#~ msgstr "_Ændr"
+
+#~ msgid "_No recurrence"
+#~ msgstr "I_ngen genindtræffelse"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Simpel genindtræffel_se"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% færdig"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "I gang"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Kon_fidensiel"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_Mappe:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Begynder:</b>"
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Slutter:<b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Færdig:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Udføres inden:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Der opstod en fejl i CORBA-systemet\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objektet kunne ikke findes\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Deltagerstatus kunne ikke opdateres!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Tilføj afsenderen til adresse_bogen"
+
+#~ msgid "_Options"
+#~ msgstr "_Tilvalg"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Tid for mødets _start:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Tid for mødets slutning:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fejl ved %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Kunne ikke finde certifikat for \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Ska_b regel fra meddelelse"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Kunne ikke oprette vindue:\n"
+#~ "En komponent i HTML tekstbehandler kunne ikke aktiveres."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Pointregler"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Mappenavn:"
+
+#~ msgid "_Rename"
+#~ msgstr "Omdøb"
+
+#~ msgid "_Properties..."
+#~ msgstr "Egenska_ber..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Afkrydsningsboks"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alender:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontakter: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_E-post:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Opgaver:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Mappe_type:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Åbn en anden brugers mappe"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Mappenavn:"
+
+#~ msgid "_User:"
+#~ msgstr "_Bruger:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Tilslutning til LDAP-serveren mislykkedes"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Mislykkedes med godkendelse på LDAP-server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Serveren svarede at ingen søgebaser understøttes"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Fejl ved hentning af schemainformation"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Serveren svarede ikke med gyldig schemainformation"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  _Vis de baser som understøttes "
 
@@ -19419,9 +20383,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Webcam:"
 #~ msgstr "Side"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategori-redigering ikke tilgængelig."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19476,9 +20437,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr ""
 #~ "Hændelsen som fjernes er et møde. Vil du sende en aflysningsmeddelelse?"
 
-#~ 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?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19495,45 +20453,15 @@ msgstr "%s (%d%% fuldført)"
 #~ "Journalindgangen som fjernes er offentliggjort. Vil du sende en "
 #~ "aflysningsmeddelelse?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Er du sikker på at du vil slette aftalen `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Er du sikker på at du vil slette opgaven `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Er du sikker på at du vil slette denne opgave uden titel?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Er du sikker på at du vil slette %d aftaler?"
-#~ msgstr[1] "Er du sikker på at du vil slette %d aftaler?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Er du sikker på at du vil slette %d opgaver?"
-#~ msgstr[1] "Er du sikker på at du vil slette %d opgaver?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Er du sikker på at du vil slette %d journalopføringer?"
-#~ msgstr[1] "Er du sikker på at du vil slette %d journalopføringer?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Invitér andre..."
 
@@ -19567,10 +20495,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Kunne ikke hente gruppe: %s"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Fejl under autogemning af besked: %s:\n"
@@ -19594,179 +20518,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Ukendt serversvar: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Justér point"
-
-#~ msgid "Assign Color"
-#~ msgstr "Tilknyt farve"
-
-#~ msgid "Assign Score"
-#~ msgstr "Giv point"
-
-#~ msgid "Attachments"
-#~ msgstr "Bilag"
-
-#~ msgid "Beep"
-#~ msgstr "Bip"
-
-#~ msgid "contains"
-#~ msgstr "indeholder"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopier til mappe"
-
-#~ msgid "Date received"
-#~ msgstr "Dato modtaget"
-
-#~ msgid "Date sent"
-#~ msgstr "Dato sendt"
-
-#~ msgid "Deleted"
-#~ msgstr "Slettet"
-
-#~ msgid "does not contain"
-#~ msgstr "indeholder ikke"
-
-#~ msgid "does not end with"
-#~ msgstr "slutter ikke med"
-
-#~ msgid "does not exist"
-#~ msgstr "eksisterer ikke"
-
-#~ msgid "does not return"
-#~ msgstr "returnerer ikke"
-
-#~ msgid "does not sound like"
-#~ msgstr "ligner ikke"
-
-#~ msgid "does not start with"
-#~ msgstr "starter ikke med"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Eksisterer ikke"
-
-#~ msgid "Draft"
-#~ msgstr "Skitse"
-
-#~ msgid "ends with"
-#~ msgstr "slutter med"
-
-#~ msgid "Exist"
-#~ msgstr "Eksisterer"
-
-#~ msgid "exists"
-#~ msgstr "eksisterer"
-
-#~ msgid "Expression"
-#~ msgstr "Udtryk"
-
-#~ msgid "Follow Up"
-#~ msgstr "Følg op"
-
-#~ msgid "is"
-#~ msgstr "er"
-
-#~ msgid "is after"
-#~ msgstr "er efter"
-
-#~ msgid "is before"
-#~ msgstr "er inden"
-
-#~ msgid "is Flagged"
-#~ msgstr "er markeret med flag"
-
-#~ msgid "is greater than"
-#~ msgstr "er større end"
-
-#~ msgid "is less than"
-#~ msgstr "er mindre end"
-
-#~ msgid "is not"
-#~ msgstr "er ikke"
-
-#~ msgid "is not Flagged"
-#~ msgstr "er ikke markeret med flag"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Juni"
-
-#~ msgid "Mailing list"
-#~ msgstr "E-post-liste"
-
-#~ msgid "Message Body"
-#~ msgstr "Beskedskrop"
-
-#~ msgid "Message Header"
-#~ msgstr "Beskedshoved"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Beskeder"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Markér som v_igtig"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Flyt til mappe"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Afslut programmet"
-
-#~ msgid "Play Sound"
-#~ msgstr "Afspil lyd"
-
-#~ msgid "Recipients"
-#~ msgstr "Modtagere"
-
-#~ msgid "Regex Match"
-#~ msgstr "Træffer på regulært udtryk"
-
-#~ msgid "Replied to"
-#~ msgstr "Svaret til"
-
-#~ msgid "returns"
-#~ msgstr "returnerer"
-
-#~ msgid "returns greater than"
-#~ msgstr "returnerer større end"
-
-#~ msgid "returns less than"
-#~ msgstr "returnerer mindre end"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Kør program:"
-
-#~ msgid "Sender"
-#~ msgstr "Afsender"
-
-#~ msgid "Set Status"
-#~ msgstr "Sæt status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Størrelse (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "lyder som"
-
-#~ msgid "Source Account"
-#~ msgstr "Kildekonto"
-
-#~ msgid "Specific header"
-#~ msgstr "Specifik header"
-
-#~ msgid "starts with"
-#~ msgstr "starter med"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Stop behandling"
-
-#~ msgid "Unset Status"
-#~ msgstr "Neutraliser status"
-
 #~ msgid "Working"
 #~ msgstr "Arbejder"
 
@@ -19978,10 +20729,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Finished"
 #~ msgstr "Færdig"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Gruppe"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20538,9 +21285,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "component"
 #~ msgstr "Aftale"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmer"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Geografisk placering"
 
@@ -21080,10 +21824,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kan ikke oprette katalog %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Vælg kontakter fra adressebogen"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "Fø_dselsdag:"
 
@@ -21153,22 +21893,10 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kalenderinformation"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Kalenderinformation"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klassificering"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Dato & tid"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Beskrivelse:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Begynder:</b>"
 
@@ -21581,9 +22309,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Modtager søgeresultater fra LDAP-server..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Fejl ved søgning"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "\"Offline\" lager"
@@ -21725,9 +22450,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution adressebog lokal-LDAP-backend"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution kalender lokalfil-backend"
-
 #, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolution adressebog lokal-LDAP-backend"
@@ -21828,9 +22550,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Use Score"
 #~ msgstr "Anvend point"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Markøren kunne ikke indlæses\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mappe som indeholder kontaktinformation"
 
@@ -24115,9 +24834,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -25501,9 +26217,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25894,9 +26607,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -28273,9 +28983,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "South Dakota"
 #~ msgstr "South Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30492,9 +31199,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "View the selected folder"
 #~ msgstr "Vis den valgte mappe"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopiér..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Mappelinje"
 
@@ -30504,27 +31208,18 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Gå til mappe..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Flyt..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Ny mappe"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Fjern en anden brugers mappe"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Omdøb..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Genvejslinje"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Genvej..."
 
-#~ msgid "Information"
-#~ msgstr "Information"
-
 #~ msgid "Error"
 #~ msgstr "Fejl"
 
@@ -30609,9 +31304,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Opret _ny mappe..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontakter..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Fabrik til import af LDIF filer i Evolution."
 
diff --git a/po/el.po b/po/el.po
index f40c4d2554..d25bd9fa7b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -35,14 +35,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-13 13:49+0300\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-13 13:51+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\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.3.1\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -51,14 +51,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Βιβλίο διευθύνσεων του Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "κεφαλίδα επαφής: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "μινι καρτέλα του evolution "
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "φάκελος τρέχοντος βιβλίου διευθύνσεων"
@@ -79,34 +71,257 @@ msgstr "κάρτες"
 msgid " card"
 msgstr "κάρτα"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "κεφαλίδα επαφής: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "μινι καρτέλα του evolution "
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή ΙMAP.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+"Αυτός ο αποθηκευτικός χώρος δεν υποστηρίζει συνδρομές, ή δεν είναι "
+"ενεργοποιημένες."
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Αδυναμία λήψης λίστας ομάδας από τον διακομιστή"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Η απάντηση του διακομιστή ΙΜΑΡ δεν περιείχε την πληροφορία %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Σφάλμα κατά την φόρτωση του βιβλίου διευθύνσεων."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Αδυναμία ανάλυσης φακέλου spool"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "Α_πόρριψη"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "δεν περιέχει"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Αδύνατη η ανάλυση του περιεχομένου του μηνύματος"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Σφάλμα προσθήκης επαφής"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Αν εγκαταλείψετε τώρα αυτά τα μηνύματα δεν θα σταλούν μέχρι το Evolution "
+"ξεκινήσει ξανά."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Προεπιλεγμένη διεύθυνση συγχρονισμού:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
-msgstr "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Αυτόματη συμπλήρωση"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "Ε_παφές"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Πιστοποιητικά"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Ρυθμίστε εδώ την αυτόματη συμπλήρωση"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Έλεγχος Διαχείρισης Πιστοποιητικών S/Mime του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Έλεγχος ρυθμίσεων φακέλου του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Διαχείριση των πιστοποιητικών S/MIME εδώ"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -137,7 +352,8 @@ msgid "New Contacts Group"
 msgstr "Νέα ομάδα επαφών"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Ομάδα Ε_παφών"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -160,18 +376,14 @@ msgid "Migrating `%s':"
 msgstr "Εισαγωγή  `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Σε αυτό τον υπολογιστή"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -236,36 +448,46 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τα δεδομένα Pilot Sync ..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
-msgstr "Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Νέο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Επαφές"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -289,58 +511,6 @@ msgstr ""
 "URI για τον φάκελο που χρησιμοποιήθηκε τελευταία στον διάλογο επιλογής "
 "ονομάτων"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Αυτόματη συμπλήρωση"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "Ε_παφές"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Πιστοποιητικά"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Ρυθμίστε εδώ την αυτόματη συμπλήρωση"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Έλεγχος Διαχείρισης Πιστοποιητικών S/Mime του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Έλεγχος ρυθμίσεων φακέλου του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Διαχείριση των πιστοποιητικών S/MIME εδώ"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -348,7 +518,7 @@ msgstr "Διαχείριση των πιστοποιητικών S/MIME εδώ"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -357,7 +527,7 @@ msgstr "Διαχείριση των πιστοποιητικών S/MIME εδώ"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -383,6 +553,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Πιστοποίηση</b>"
 
@@ -424,13 +595,11 @@ msgid "Anonymously"
 msgstr "Ανώνυμα"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Βασικό"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
@@ -447,8 +616,11 @@ msgid "Email address"
 msgstr "Διεύθυνση Email"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Το Evolution θα χρησιμοποίησει αυτήν τη διεύθυνση για την πιστοποίησή σας στο διακομιστή"
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Το Evolution θα χρησιμοποίησει αυτήν τη διεύθυνση για την πιστοποίησή σας "
+"στο διακομιστή"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
@@ -686,33 +858,26 @@ msgid "cards"
 msgstr "κάρτες"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "λεπτά"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "Αφαίρεση Όλων"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Προβολή Λίστας Επαφών"
@@ -727,7 +892,7 @@ msgid "Send HTML Mail?"
 msgstr "Να αποσταλεί το μήνυμα HTML;"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Προσθήκη στις Επαφές"
 
@@ -735,15 +900,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Επιλογή Επαφών από το Βιβλίο Διευθύνσεων"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -765,6 +937,11 @@ msgstr "_Κατηγορία:"
 msgid "_Find"
 msgstr "Εύ_ρεση"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Ανα_ζήτηση"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -802,9 +979,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Εργασία</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -825,7 +1001,6 @@ msgid "Birthday:"
 msgstr "Γενέθλια:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Ημερολόγιο:"
 
@@ -838,7 +1013,7 @@ msgid "Company:"
 msgstr "Εταιρία:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -846,7 +1021,7 @@ msgid "Contact"
 msgstr "Επαφή"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Επεξεργαστής Επαφών"
 
@@ -942,8 +1117,8 @@ msgstr "Ιστοσελίδα:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -966,39 +1141,23 @@ msgstr "Αρχειοθέτηση κάτω:"
 msgid "_Where:"
 msgstr ":"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφούν αυτές οι επαφές?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφεί η επαφή;"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Διεύθυνση:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -1970,130 +2129,122 @@ msgstr "Ζάμπια"
 msgid "Zimbabwe"
 msgstr "Ζιμπάμπουε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "Novell GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Υπηρεσία"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Όνομα Χρήστη:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Οικία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Άλλα"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Πηγαίο βιβλίο"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Βιβλίο στόχου"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Είναι νέα επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Εγγράψιμα Πεδία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Αλλάχθηκε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Αυτή η επαφή ανήκει στις κατηγορίες:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Παρακαλώ επιλέξτε μια εικόνα για αυτή την επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2434
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Χωρίς εικόνα"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2637
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Η ημερομηνία επανεμφάνισης δεν είναι έγκυρη"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2665
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Μή έγκυρη υπογραφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/contact-editor/e-contact-editor.c:2752
-msgid "_Discard"
-msgstr "Α_πόρριψη"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2747
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Υπηρεσία"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Όνομα Χρήστη:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Γρήγορη Προσθήκη Επαφής"
@@ -2111,6 +2262,22 @@ msgstr "Π_λήρες Όνομα:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφεί η επαφή;"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Διεύθυνση _2:"
@@ -2266,19 +2433,20 @@ msgstr "Λίστα _ονόματος:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
+msgstr ""
+"Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "διάλογος1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Βιβλίο"
 
@@ -2339,419 +2507,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(χάρτης)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "χάρτης"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Μέλη λίστας"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Οργανισμός"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Θέση"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Τηλεδιάσκεψη"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Φαξ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "εργασία"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Κινητό Τηλέφωνο"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "προσωπικό"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Σημείωση"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Τίτλος εργασίας:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Αρχική σελίδα"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Επιτυχία"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Το Backend είναι απασχολημένο"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Αρχείο φύλαξης εκτός δικτύου"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Νέα Λίστα Επαφών"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Δεν επιτρέπεται η πρόσβαση"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Η επαφή δεν βρέθηκε"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Ακυρώθηκε"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Δεν ήταν δυνατή η ακύρωση"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Η πιστοποίηση απέτυχε."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Απαιτείται πιστοποίηση"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS δεν είναι διαθέσιμο"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "Δεν υπάρχει τέτοια πηγή"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Άλλο σφάλμα"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν η "
-"διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
-"εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Το Evolution δε διαθέτει στη σύνθεσή του υποστήριξη LDAP. Αν θέλετε να "
-"κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
-"πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
-"εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Βρέθηκαν περισσότερες κάρτες από όσες ο διακομιστής ή το Evolution\n"
-"έχει ρυθμιστεί να εμφανίζει. Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
-"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
-"για αυτό το ευρετήριο διευθύνσεων."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
-"του διακομιστή ή το\n"
-"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων. Κάνετε την αναζήτηση σας "
-"πιό συγκεκριμένη\n"
-"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
-"για αυτό το ευρετήριο διευθύνσεων. "
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
-"ερώτημα."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
-"ερώτημα."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Σφάλμα προσθήκης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Σφάλμα προσθήκης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Σφάλμα τροποποίησης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Σφάλμα τροποποίησης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Σφάλμα κατάργησης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Σφάλμα αφαίρεσης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 επαφών θα ανοίξει και %d νέα παράθυρα.\n"
-"Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Το %s υπάρχει ήδη.\n"
-"Θέλετε να αντικατασταθεί;"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "λίστα"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Μετακίνηση επαφής σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Αντιγραφή επαφής σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Μετακίνηση επαφών σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Αντιγραφή επαφών σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Πολλαπλές Εκάρτες"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard για %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(κανένα)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Πρωτεύον Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Επιλογή Ενέργειας"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Δημιουργία νέας επαφής \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επαφή \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων"
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Επεξεργασία Πληροφοριών Επαφής"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Συγχώνευση Διεύθυνσης E-mail"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "δεν περιέχει"
-msgstr[1] "δεν περιέχει"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Εμφάνιση πλήρους VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Εμφάνιση μικρής VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Όχι επαφές"
@@ -2765,9 +2520,9 @@ msgstr[1] "Όχι επαφές"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Ερώτημα"
 
@@ -2783,129 +2538,129 @@ msgstr "Μοντέλο"
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Για Προχωρημένους..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Αποθήκευση ως VCard.."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Μετάβαση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση για επαφές..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Αντιγραφή στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Μετακίνηση στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
@@ -2939,6 +2694,8 @@ msgid "Car Phone"
 msgstr "Τηλέφωνο Αυτοκινήτου"
 
 #: 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:3
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -2946,6 +2703,21 @@ msgstr "Κατηγορίες"
 msgid "Company Phone"
 msgstr "Τηλέφωνο Εταιρείας"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Οικογενειακό Όνομα"
@@ -2982,14 +2754,29 @@ msgstr "Ημερήσια καταγραφή"
 msgid "Manager"
 msgstr "Διευθυντής"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Κινητό Τηλέφωνο"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Σημείωση"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Γραφείο"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Οργανισμός"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Άλλο Φαξ"
@@ -3041,29 +2828,21 @@ msgstr "Μονάδα"
 msgid "Web Site"
 msgstr "Ιστοσελίδα"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Πλάτος"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Ύψος"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Έχει εστίαση"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Επιλεγμένα"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Έχει δρομέα"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Πεδίο"
@@ -3080,7 +2859,11 @@ msgstr "Μοντέλο Κειμένου"
 msgid "Max field name length"
 msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Πλάτος στήλης"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3094,7 +2877,7 @@ msgstr ""
 "\n"
 "Κάντε κλικ εδώ για να προσθέσετε μια νέα Επαφή"
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3104,13 +2887,394 @@ msgstr ""
 "\n"
 "Δεν υπάρχουν στοιχεία προς εμφάνιση σε αυτή την προβολή."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Προσαρμογέας"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Πλάτος στήλης"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Επιλεγμένα"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Έχει δρομέα"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(χάρτης)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "χάρτης"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Μέλη λίστας"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Θέση"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Τηλεδιάσκεψη"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Φαξ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "εργασία"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "προσωπικό"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Τίτλος εργασίας:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Αρχική σελίδα"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Επιτυχία"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Το Backend είναι απασχολημένο"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Αρχείο φύλαξης εκτός δικτύου"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Νέα Λίστα Επαφών"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Δεν επιτρέπεται η πρόσβαση"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Η επαφή δεν βρέθηκε"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Ακυρώθηκε"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Δεν ήταν δυνατή η ακύρωση"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Η πιστοποίηση απέτυχε."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Απαιτείται πιστοποίηση"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS δεν είναι διαθέσιμο"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Δεν υπάρχει τέτοια πηγή"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Άλλο σφάλμα"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν η "
+"διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
+"εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Το Evolution δε διαθέτει στη σύνθεσή του υποστήριξη LDAP. Αν θέλετε να "
+"κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
+"πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
+"εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Βρέθηκαν περισσότερες κάρτες από όσες ο διακομιστής ή το Evolution\n"
+"έχει ρυθμιστεί να εμφανίζει. Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
+"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
+"για αυτό το ευρετήριο διευθύνσεων."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
+"του διακομιστή ή το\n"
+"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων. Κάνετε την αναζήτηση σας "
+"πιό συγκεκριμένη\n"
+"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
+"για αυτό το ευρετήριο διευθύνσεων. "
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
+"ερώτημα."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
+"ερώτημα."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Σφάλμα προσθήκης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Σφάλμα προσθήκης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Σφάλμα τροποποίησης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Σφάλμα τροποποίησης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Σφάλμα κατάργησης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Σφάλμα αφαίρεσης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 επαφών θα ανοίξει και %d νέα παράθυρα.\n"
+"Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Το %s υπάρχει ήδη.\n"
+"Θέλετε να αντικατασταθεί;"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "λίστα"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Μετακίνηση επαφής σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Αντιγραφή επαφής σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Μετακίνηση επαφών σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Αντιγραφή επαφών σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Πολλαπλές Εκάρτες"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard για %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(κανένα)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Πρωτεύον Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Επιλογή Ενέργειας"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Δημιουργία νέας επαφής \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Προσθήκη διεύθυνσης στην υπάρχουσα επαφή \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Υποβολή ερωτήματος στο Βιβλίο Διευθύνσεων"
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Επεξεργασία Πληροφοριών Επαφής"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Συγχώνευση Διεύθυνσης E-mail"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "δεν περιέχει"
+msgstr[1] "δεν περιέχει"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Εμφάνιση πλήρους VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Εμφάνιση μικρής VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Αποθήκευση στο Βιβλίο Διευθύνσεων"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3120,17 +3284,17 @@ msgstr "Προβολή Κάρτας"
 msgid "GTK Tree View"
 msgstr "Προβολή δένδρου GTK "
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow Test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Πνευματικά Δικαιώματα (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
@@ -3154,6 +3318,11 @@ msgstr "Εισαγωγέας VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Εκτύπωση φακέλου"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Εκτύπωση επαφών"
@@ -3163,11 +3332,6 @@ msgstr "Εκτύπωση επαφών"
 msgid "Print contact"
 msgstr "Εκτύπωση επαφής"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Εκτύπωση φακέλου"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3342,7 +3506,8 @@ msgstr "Δοκιμή εκτύπωσης επεξεργαστή στυλ επαφ
 
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr "Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
+msgstr ""
+"Αυτό θα δοκιμάσει το γραφικό συστατικό εκτύπωσης επεξεργαστή στυλ επαφώ"
 
 #: addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
@@ -3352,6 +3517,22 @@ msgstr "Δοκιμή εκτύπωσης επαφής"
 msgid "This should test the contact print code"
 msgstr "Αυτό θα δοκιμάσει τον κώδικα εκτύπωσης επαφής"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Καθορίστε το αρχείο αποτελέσματος αντί για το καθορισμένο αποτέλεσμα"
@@ -3377,7 +3558,8 @@ msgid "Export in asynchronous mode "
 msgstr "Εξαγωγή σε ασύγχρονη κατάσταση"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "Ο αριθμός των καρτών σε ένα αρχείο αποτελέσματος σε ασύγχρονη κατάσταση, "
 "προεπιλεγμένο μέγεθος 100."
@@ -3387,7 +3569,8 @@ msgid "NUMBER"
 msgstr "ΑΡΙΘΜΟΣ"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Σφάλμα παραμέτρων γραμμής εντολών, παρακαλώ χρησιμοποιήστε --help για να "
 "δείτε την χρήση."
@@ -3408,22 +3591,6 @@ msgstr "Σε κανονική λειτουργία, δεν χρειάζεστε
 msgid "Impossible internal error."
 msgstr "Αδύνατο εσωτερικό σφάλμα."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Σφάλμα κατά την φόρτωση του βιβλίου διευθύνσεων."
@@ -3440,6 +3607,280 @@ msgstr "Δεν έχετε δώσει όνομα αρχείου."
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Να μην διαγραφεί"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Αποστολή Σε:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφεί η επαφή;"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Ραντεβού"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο "
+"επεξεργαστής;"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Απόρριψη Αλλαγών"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Αποθήκευση μηνύματος"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Αποστολή"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Αν εγκαταλείψετε τώρα αυτά τα μηνύματα δεν θα σταλούν μέχρι το Evolution "
+"ξεκινήσει ξανά."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Εισαγωγέας vCalendar  Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Αν εγκαταλείψετε τώρα αυτά τα μηνύματα δεν θα σταλούν μέχρι το Evolution "
+"ξεκινήσει ξανά."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3450,28 +3891,94 @@ msgid "Split Multi-Day Events:"
 msgstr "Διαχωρισμός Γεγονότων Multi-Day:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος ημερολογίου του Υπολογιστή Παλάμης"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Προκαθορισμένη Προτεραιότητα:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
-msgstr "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Ημερολόγια"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Ημερολόγιο και Εργασίες του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Έλεγχος ρυθμίσεων του Ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Εφαρμογή προβολής μηνυμάτων ραντεβού του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Επεξεργαστής Ημερολογίου/Εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Στοιχείο Ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Στοιχείο Εργασιών του Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "Ημερο_λόγια"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
@@ -3570,10 +4077,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
@@ -3620,7 +4123,8 @@ msgstr "Ώρα έναρξης της εργάσιμης μέρας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Intervals shown in Day and Work Week views"
-msgstr "Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
+msgstr ""
+"Διαατήματα που προβάλλονται στις προβολές Ημέρας και εργάσιμης εβδομάδας"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
 msgid "List of urls for free/busy publishing"
@@ -3688,7 +4192,8 @@ msgstr "Ημέρα που ξεκινάει η εβδομάδα"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr "Αν θα γίνετε η χρήση της περιοχής ειδοποίησης για την εμφάνιση συναγερμών"
+msgstr ""
+"Αν θα γίνετε η χρήση της περιοχής ειδοποίησης για την εμφάνιση συναγερμών"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -3714,8 +4219,28 @@ msgstr "Αν θα εμφανίζεται η ώρα σε 24ώρη μορφή αν
 msgid "Whether to show week numbers in date navigator"
 msgstr "Αν θα εμφανίζονται οι αριθμοί εβδομάδων στον περιηγητή ημερολογίου"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Η περίληψη περιέχει"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Το σχόλιο περιέχει"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Η τοποθεσία περιέχει"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Αταίριαστο"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3737,8 +4262,8 @@ msgid "Purge events older than"
 msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "ημέρες"
 
@@ -3748,12 +4273,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%d %a %b"
@@ -3782,7 +4303,8 @@ msgstr "%d %B"
 #: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
-msgstr "Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
 #: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
@@ -3801,64 +4323,55 @@ msgstr ""
 
 #: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
-msgstr "Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
-
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
 msgstr ""
+"Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
 
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Ημερολόγια"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Νέο Ραντεβού"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "Ρ_αντεβού"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Δημιουργία νέου ραντεβού"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Νέα συνάντηση"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Συ_νάντηση"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Νέο ολοήμερο ραντεβού"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "All _Day Ραντεβού"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου ολοήμερου ραντεβού"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Νέη ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "Η_μερολόγιο"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Δημιουργία νέου ημερολογίου"
 
@@ -3888,26 +4401,6 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Η περίληψη περιέχει"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Η περιγραφή περιέχει"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Το σχόλιο περιέχει"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Η τοποθεσία περιέχει"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Αταίριαστο"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Σφάλμα κατά το άνοιγμα του ημερολογίου"
@@ -3925,215 +4418,133 @@ msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγ
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Επιλογές Ηχητικής Ειδοποίησης"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Επιλογές Ειδοποίησης Μηνύματος"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Επιλογές Ειδοποίησης Email"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Επιλογές Ειδοποίησης Προγράμματος"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Άγνωστες Επιλογές Ειδοποίησης"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Επανάληψη Ειδοποίησης"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Μήνυμα προς εμφάνιση:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Μήνυμα προς Αποστολή"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Εκτέλεση ήχου:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Επανάληψη ειδοποίησης"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Εκτέλεση προγράμματος:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Αποστολή Σε:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Με αυτές τις παραμέτρους:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Συναγερμοί:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "επιπλέον φορές κάθε"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Επιλογές λίστας εργασιών</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ώρες"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Γενικά</b> "
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Ενέργεια/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Προσθήκη ημερολογίου"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Προσθήκη"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Συγγραφή νέου μηνύματος"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Βασικά"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Ημερομηνία/Ώρα:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Μηνύματα"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Εκτέλεση ήχου"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Ανάδυση ενός συναγερμού"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Υπενθυμίσεις"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Εκτέλεσε ένα πρόγραμμα"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Αποστολή Σε:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Αποστολή e-mail"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Περίληψη:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Διεύθυνση:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Επιλογές..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Εκτέλεση προγράμματος:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Επανάληψη ειδοποίησης"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Απο_στολή"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "μετά"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "πριν"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "ημέρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "τέλος του ραντεβού"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "επιπλέον φορές κάθε"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ώρα(ες)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ώρες"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "αρχή ραντεβού"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-"Θα πρέπει να καθορίσετε μια τοποθεσία από την οποία θα γίνει η λήψη του "
-"ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Η τοποθεσία πηγής '%s' δεν είναι σωστά διατυπωμένη"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Η τοποθεσία πηγής '%s' δεν είναι πηγή webcal "
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Η πηγή  με το όνομα  '%s' υπάρχει ήδη στην επιλεγμένη ομάδα"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Η ομάδα '%s' είναι απομακρυσμένη. Θα πρέπει να καθορίσετε μια τοποθεσία από "
-"την οποία θα γίνει η λήψη του ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Προσθήκη ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Προσθήκη ομάδας εργασιών"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "Χ_ρώμα:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Διαλέξτε χρώμα"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "Π_ροσθήκη ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Προσθήκη Ομάδας"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "Α_νανέωση"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Τύπος:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Ενέργεια/Trigger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Προσθήκη"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "εβδομάδες"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Ειδοποίηση στις %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4242,7 +4653,7 @@ msgid "Free/Busy Publishing"
 msgstr "Γνωστοποίηση διαθεσιμότητας"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Παρασκευή"
@@ -4256,7 +4667,7 @@ msgid "Minutes"
 msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Δευτέρα"
@@ -4266,7 +4677,7 @@ msgid "S_un"
 msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Σάββατο"
@@ -4280,7 +4691,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Εμφάνιση αριθμών εβδομάδων στον περιηγητή ημερολογίου"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Κυριακή"
@@ -4294,7 +4705,7 @@ msgid "T_hu"
 msgstr "_Πέμ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Πέμπτη"
@@ -4308,7 +4719,7 @@ msgid "Time format:"
 msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Τρίτη"
@@ -4318,7 +4729,7 @@ msgid "W_eek starts:"
 msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Τετάρτη"
@@ -4351,7 +4762,8 @@ msgstr "Συμπίεση σαββατοκύριακων στη μηνιαία π
 msgid "_Day begins:"
 msgstr "Η _μέρα αρχίζει στις :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4401,6 +4813,76 @@ msgstr "_Τετ"
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+"Θα πρέπει να καθορίσετε μια τοποθεσία από την οποία θα γίνει η λήψη του "
+"ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Η τοποθεσία πηγής '%s' δεν είναι σωστά διατυπωμένη"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Η τοποθεσία πηγής '%s' δεν είναι πηγή webcal "
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Η πηγή  με το όνομα  '%s' υπάρχει ήδη στην επιλεγμένη ομάδα"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Η ομάδα '%s' είναι απομακρυσμένη. Θα πρέπει να καθορίσετε μια τοποθεσία από "
+"την οποία θα γίνει η λήψη του ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Προσθήκη ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Προσθήκη ομάδας εργασιών"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "Χ_ρώμα:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Διαλέξτε χρώμα"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "Π_ροσθήκη ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Προσθήκη Ομάδας"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "Α_νανέωση"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Τύπος:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "εβδομάδες"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Το συμβάν έχει διαγραφεί."
@@ -4449,81 +4931,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Σφάλμα πιστοποίησης: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " με "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Ολοκληρωμένο"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Ολοκληρωμένο "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(Λήξη"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Λήξη "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ραντεβού - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Εργασία - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Ημερολογιακή καταχώριση - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Αποθήκευση ως..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Οι αλλαγές που έγιναν σε αυτό το αντικείμενο μπορεί να απορριφθούν αν "
 "καταφθάσει μια ενημέρωση"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Δεν ήταν δυνατή η εκτέλεση της τρέχουσας έκδοση!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Σφάλμα πιστοποίησης: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " με "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Ολοκληρωμένο"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Ολοκληρωμένο "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(Λήξη"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Λήξη "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
@@ -4562,7 +5038,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας
 
 #: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
 #: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -4585,8 +5062,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω ενός σφάλματος"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Βιβλίο Διευθύνσεων..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Επαφές"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4596,132 +5074,193 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Υπενθύμιση"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Δρομολόγηση"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Προσανατολισμός"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Συνάντηση"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Γεγονός χωρίς ημερομηνία έναρξης!"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Γεγονός χωρίς ημερομηνία λήξης"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λάθος"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Η ώρα έναρξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Η ώρα λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Αδυναμία ανοίγματος του ημερολογίου '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "πριν από κάθε ραντεβού"
+msgstr[1] "πριν από κάθε ραντεβού"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "τέλος του ραντεβού"
+msgstr[1] "τέλος του ραντεβού"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "πριν από κάθε ραντεβού"
+msgstr[1] "πριν από κάθε ραντεβού"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Γεγονός ολόκληρης ημέρας"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "πριν από κάθε ραντεβού"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Απασχολημένος"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "πριν από κάθε ραντεβού"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Κατηγορίες..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "πριν από κάθε ραντεβού"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Λίστα εργασιών</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Ταξινόμηση"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Ώρα:</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Εμ_πιστευτικό"
+msgid "A_ll day event"
+msgstr "Γεγονός ολόκληρης ημέρας"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Ημερομηνία & Ώρα"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Αποθήκευση Προσαρμοσμένης Προβολής..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Ελεύθερο"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Κατηγορίες..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "Το_ποθεσία:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Ημερολόγιο:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Ιδιωτι_κό"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Ταξινόμηση"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Δη_μόσιο"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Εμπιστευτικό"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Εμφάνιση Ώρας Ως"
+msgid "L_ocation:"
+msgstr "Το_ποθεσία:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Ιδιωτικό"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Δημόσιο"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Εμφάνιση Ώρας Ως"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Περ_ίληψη:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Καθαρισμός"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Περιγραφή:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Χρόνος Λήξης:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Χρόνος Έ_ναρξης:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4730,32 +5269,26 @@ msgstr "Χρόνος Έ_ναρξης:"
 msgid "None"
 msgstr "Κανένα"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Το επιλεγμένο organizer δεν έχει πια ένα λογαριασμό."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Χρειάζεται ένας διοργανωτής."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2583 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Διαγραφή"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Α_φαίρεση"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4800,29 +5333,39 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Κατάσταση"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Προσθήκη πα_ρευρισκόμενου"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Συναγερμοί:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+msgid "<b>Organizer</b>"
+msgstr "<b>Άλλο</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Α_λλάξτε Διοργανωτή"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Διοργανωτής:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Επαφές"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Α_λλάξτε Διοργανωτή"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Διοργανωτής:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4862,15 +5405,19 @@ msgstr "Όνομα λίστας εργασιών"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε ένα επαναλαμβανόμενο γεγονός, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
+msgstr ""
+"Τροποποιείτε μια επαναλαμβανόμενη εργασία, τι θα θέλατε να τροποποιήσετε?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Τροποποιείτε μια επαναλαμβανόμενη καταχώρηση, τι θα θέλατε να τροποποιήσετε?"
+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"
@@ -4888,148 +5435,139 @@ msgstr "Αυτή και μελλοντικές εμφανίσεις"
 msgid "All Instances"
 msgstr "Όλες τις εμφανίσεις"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Αυτή η συνάντηση περιέχει επαναλήψεις που το Evolution δεν μπορεί να "
 "επεξεργαστεί."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Η ημερομηνία επανεμφάνισης δεν είναι έγκυρη"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "στο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "πρώτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "δευτερόλεπτο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "τρίτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "τέταρτη"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "τελευταία"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Άλλη Ημερομηνία"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "ημέρα"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "στο"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "εμφανίσεις"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Ημερομηνία/Ώρα"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Κάθε"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Εξαιρέσεις"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Προεπισκόπηση"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Κανόνας Επανεμφάνισης"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Παραμετροποιημένη επανεμφάνιση"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Τροποποίηση"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Προεπισκόπηση</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Χωρίς επανεμφάνιση"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Α_φαίρεση"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Κάθε"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Απλή επανεμφάνιση"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Επεξεργασία ραντεβού"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "για"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "για πάντα"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "μήνας(ες)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "μέχρι"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "εβδομάδα(ες)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "χρόνος(ια)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Επιλογή προορισμού"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Προορισμός:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Λίστα Εργασιών"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Γραμματοσειρές μηνύματος</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Ολοκληρωμένο"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Συναγερμοί</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -5043,8 +5581,8 @@ msgstr "Υψηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Σε Εξέλιξη"
@@ -5056,22 +5594,22 @@ msgid "Low"
 msgstr "Χαμηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Κανονική"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Δεν έχει ξεκινήσει"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Πρόοδος"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "%i Ολοκληρωμένο"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5094,36 +5632,42 @@ msgstr "_Κατάσταση:"
 msgid "_Web Page:"
 msgstr "Ιστοσε_λίδα:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Εργασία"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιών στο '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Εμπιστευτικό"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Επιλογές</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Διαγραφή αλληλογραφίας</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Φάκελος:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Ημερομηνία Έ_ναρξης:"
@@ -5132,52 +5676,58 @@ msgstr "Ημερομηνία Έ_ναρξης:"
 msgid "_Due date:"
 msgstr "Ημερομηνία _Λήξης:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Διαπιστευτήρια πιστοποίησης για τον εξυπηρετητή  HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Ομάδα"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Επιλεγμένα ημερολόγια για δημοσίευση"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Επιλογές ημερολογίου</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Ημερησίως"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Συχνότητα δημοσιεύσεων"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Επεξεργαστής διαθεσιμότητας"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Τοποθεσία γνωστοποίησης διαθεσιμότητας"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Τοποθεσία γνωστοποίησης διαθεσιμότητας"
+msgid "Free/Busy Editor"
+msgstr "Επεξεργαστής διαθεσιμότητας"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "¨Όνομα εισόδου:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Ημερησίως"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Κωδικός:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Αλληλογραφία:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Συχνότητα δημοσιεύσεων"
+#, fuzzy
+msgid "_Password:"
+msgstr "Κωδικός:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Απομνημόνευση κωδικού"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Όνομα Χρήστη:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Ο χρήστης δημοσιεύει"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Εβδομαδιαίως"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5259,7 +5809,7 @@ msgstr "%s στις %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Κλικ για άνοιγμα %s"
@@ -5268,6 +5818,11 @@ msgstr "Κλικ για άνοιγμα %s"
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Περίληψη:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5291,20 +5846,93 @@ msgstr "Προτεραιότητα:"
 msgid "Web Page:"
 msgstr "Ιστοσελίδα:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Δημόσιο"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Ημερομηνία λήξης"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Ιδιωτικό"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Ημερομηνία Έναρξης"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Εμπιστευτικό"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Περίληψη"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Διαθέσιμη"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Απασχολημένη"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Β"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ν"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Α"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Δ"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ναι"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Όχι"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Άγνωστο"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Επανάληψη"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Ανάθεση"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5350,15 +5978,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Διαθέσιμη"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Απασχολημένη"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
@@ -5369,7 +5988,7 @@ msgstr "Αναβάθμιση Αντικειμένων"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
@@ -5379,7 +5998,7 @@ msgstr "Άνοιγμα Ιστο_σελίδας"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Αποθήκευση _ως..."
@@ -5402,7 +6021,7 @@ msgstr "_Αποκοπή"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5433,12 +6052,27 @@ msgstr "_Σημείωση ως Ολοκληρωμένο"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Σημείωση επιλεγμένων εργασιών ως ολοκληρωμένες"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Διαγραφή"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Διαγραφή Επιλεγμένων Εργασιών"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Αποθήκευση ως..."
+
 #: calendar/gui/e-calendar-table.c:1350
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Κλικ εδώ για προσθήκη εργασίας"
 
@@ -5447,33 +6081,28 @@ msgstr "Κλικ εδώ για προσθήκη εργασίας"
 msgid "% Complete"
 msgstr "% Ολοκληρωμένο"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
 #: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Ολοκληρώθηκε"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Ημερομηνία ολοκλήρωσης"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Ημερομηνία λήξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Ημερομηνία έναρξης"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Περίληψη"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
@@ -5551,95 +6180,13 @@ msgstr "_Μετάβαση στην Ημερομηνία..."
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Ημερομηνία λήξης"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Ημερομηνία Έναρξης"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1704 camel/camel-gpg-context.c:1755
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Επανάληψη"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Ανάθεση"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ναι"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Όχι"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Β"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ν"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Α"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Δ"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5656,43 +6203,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "πμ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "μμ"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i τμήματα λεπτών"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i τμήματα λεπτών"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "πμ"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "μμ"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5828,7 +6368,7 @@ msgstr "Ενημέρωση"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
@@ -6039,61 +6579,47 @@ msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει �
 
 #: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
-msgstr "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
+msgstr ""
+"Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
 #: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
-"δεν υπάρχει πλέον"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
+msgstr ""
+"Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
+"δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
@@ -6122,6 +6648,10 @@ msgstr "Φόρτωση Ημερολογίου"
 msgid "Loading calendar..."
 msgstr "Φόρτωση Ημερολογίου..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Διοργανωτής:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Μήνυμα Διακομιστή:"
@@ -6205,6 +6735,28 @@ msgstr "Εξουσιοδοτήθηκε"
 msgid "In Process"
 msgstr "Σε Εξέλιξη"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
@@ -6213,100 +6765,58 @@ msgstr "Εκτός Γραφείου"
 msgid "No Information"
 msgstr "Χωρίς Πληροφορίες"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Επιλογές"
+msgid "O_ptions"
+msgstr "Επιλογές"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Εμφάνιση Σμίκρυνσης"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Αυτόματη επιλογή"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Όλα τα Άτομα και ένας _Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Απαιτούμενα Άτομα"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Απαιτούμενα Άτομα και ένας Πόρος"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Χρόνος έ_ναρξης συνάντησης:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Χρόνος _περάτωσης συνάντησης:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6325,9 +6835,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
@@ -6344,15 +6852,6 @@ msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Εργασίες"
-
 #: calendar/gui/gnome-cal.c:704
 #, fuzzy
 msgid "Updating query"
@@ -6377,55 +6876,6 @@ msgstr "Άνοιγμα %s."
 msgid "Purging"
 msgstr "Εκκαθάριση"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Έλεγχος ρυθμίσεων του Ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Εφαρμογή προβολής μηνυμάτων ραντεβού του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Επεξεργαστής Ημερολογίου/Εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Στοιχείο Ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Στοιχείο Εργασιών του Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "Ημερο_λόγια"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Εργασίες"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Απρίλιος"
@@ -6771,10 +7221,6 @@ msgstr "Επιλεγμένος μήνας (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Επιλεγμένο έτος (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Εργασία"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6805,7 +7251,7 @@ msgid "Contacts: "
 msgstr "Επαφές: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
@@ -6835,7 +7281,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d σύνολο"
 msgstr[1] "%d σύνολο"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6857,35 +7303,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία εργασιών"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Η επιλεγμένη λίστα εργασιών είναι μόνο για ανάγνωση, και δεν μπορούν να "
-"δημιουργηθούν γεγονότα. Παρακαλώ επιλέξτε ένα άλλο ημερολόγιο."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Εργασία"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Δημιουργία νέας εργασίας"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Νέα ομάδα εργασιών"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "Ομάδα εργασιών"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Δημιουργία νέας ομάδας εργασιών"
 
@@ -8561,7 +9000,8 @@ msgstr "Προετοιμασία φακέλου  '%s' για εργασία χω
 
 #: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
-msgstr "Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
+msgstr ""
+"Πρέπει να είστε συνδεμένοι στο δίκτυο για να ολοκληρωθεί αυτή η διαδικασία"
 
 #: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
@@ -8647,42 +9087,6 @@ msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Μετακίνηση μηνυμάτων"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Αντιγραφή μηνυμάτων"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Προειδοποίηση"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Φιλτράρισμα νέων μηνυμάτων"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8726,6 +9130,43 @@ msgstr "(ταίρισμα-όλων) απαιτεί folder set"
 msgid "Performing query on unknown header: %s"
 msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει ταυτοτήτων χρήστη: για %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Μετακίνηση μηνυμάτων"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Αντιγραφή μηνυμάτων"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Προειδοποίηση"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Φιλτράρισμα νέων μηνυμάτων"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8755,8 +9196,8 @@ msgstr ""
 "χρήστη: \"%s\" "
 
 #: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
@@ -8798,16 +9239,16 @@ msgstr "Αποτυχία GPG %s: %s\n"
 msgid "Could not generate signing data: %s"
 msgstr "Δεν ήταν δυνατή η υπογραφή δεδομένων:%s"
 
-#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Αποτυχία εκτέλεσης gpg: %s"
 
-#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
-#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
-#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
-#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Αποτυχία εκτέλεσης gpg"
 
@@ -8815,56 +9256,37 @@ msgstr "Αποτυχία εκτέλεσης gpg"
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
+msgstr ""
+"Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: Εσφαλμένη μορφή μηνύματος"
 
-#: camel/camel-gpg-context.c:1416
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
 "δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-gpg-context.c:1507
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία κρυπτογραφημένων δεδομένων: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Αυτό το μέρος του μηνύματος είναι  ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Κρυπτογραφημένο περιεχόμενο"
 
-#: camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Αδύνατη η ανάλυση του περιεχομένου του μηνύματος"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8878,13 +9300,35 @@ msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμ
 #: 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: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+msgstr ""
+"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
 
 #: camel/camel-lock-client.c:204
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Δεν ήταν δυνατή η δημιουργία αρχείου κλειδώματος για %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Εκτός χρόνου για την λήψη αρχείου κλειδώματος στο %s. Προσπαθήστε αργότερα."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9056,7 +9500,8 @@ msgstr "Μη έγκυρο challenge διακομιστή\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
+msgstr ""
+"Το challenge διακομιστή περιέχει μη έγκυρο κουπόνι \"Ποιότητας Προστασίας\"\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9064,7 +9509,8 @@ msgstr "Στην απάντηση του διακομιστή δεν υπάρχ�
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
+msgstr ""
+"Στην απάντηση του διακομιστή δεν υπάρχουν όλα τα δεδομένα εξουσιοδότησης\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9126,7 +9572,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
+msgstr ""
+"Το παρεχόμενο χειριστήριο περιεχομένου δεν αναφέρετε σε έγκυρο περιεχόμενο."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9143,7 +9590,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -9162,7 +9609,8 @@ msgstr "Kerberos 4"
 
 #: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
+msgstr ""
+"Με την επιλογή αυτή θα συνδεθεί στο διακομιστή με την πιστοποίηση Kerberos 4."
 
 #: camel/camel-sasl-kerberos4.c:162
 #, c-format
@@ -9179,7 +9627,8 @@ msgstr "Είσοδος"
 
 #: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
-msgstr "Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
+msgstr ""
+"Με την επιλογή αυτή θα γίνει σύνδεση στο διακομιστή με χρήση ενός κωδικού."
 
 #: camel/camel-sasl-login.c:127
 msgid "Unknown authentication state."
@@ -9228,55 +9677,56 @@ msgstr "ΡΟΡ Πριν από SMTP εξουσιοδότηση με χρήση �
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Αποτυχία σύνταξης κανονικής έκφρασης: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s'χρειάζεται ένα συστατικό ονόματος χρήστη"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' χρειάζεται ένα στοιχείο συστήματος"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "Η ηλεκτρονική διεύθυνση '%s' χρειάζεται ένα συστατικό θέσης"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ανάλυση: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Αποτυχία στην αναζήτηση ονόματος: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
-msgstr "Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
+msgstr ""
+"Αποτυχία στην αναζήτηση συστήματος: Αδυναμία δημιουργίας αλληλουχίας: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Αποτυχία στην αναζήτηση συστήματος:%s: Αδυναμία εύρεσης συστήματος"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Αποτυχία στην αναζήτηση συστήματος:%s: άγνωστος λόγος"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Ανάλυση διεύθυνσης"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: εξυπηρετητής δεν βρέθηκε"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Αποτυχία συσχέτισης εξυπηρετητή: άγνωστος λόγος"
 
@@ -9348,7 +9798,7 @@ msgstr "Αποτυχία προσθήκης πιστοποιητικού κρυ�
 msgid "Cannot add CMS SignerInfo"
 msgstr "Αδυναμία προσθήκης CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
@@ -9433,7 +9883,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Έγκυρη υπογραφή"
 
 #: camel/camel-smime-context.c:651
@@ -9446,47 +9896,48 @@ msgid "Decoder failed"
 msgstr "Αποτυχία αποκωδικοποιητή"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Δεν είναι δυνατή η εύρεση πιστοποιητικού για  `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Δεν είναι δυνατή η εύρεση πιστοποιητικού για  '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "Αποτυχία δημιουργίας μηνύματος CMS"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Δεν ήταν δυνατή η δημιουργία μηνύματος CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Αδυναμία δημιουργίας  EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Αδυναμία επισύναψης CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Αδυναμία επισύναψης αντικειμένου δεδομένων CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Αδυναμία δημιουργίας CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr "Αδυναμία προσθήκης CMS RecipientInfo"
-
-#: camel/camel-smime-context.c:877
 #, fuzzy
-msgid "Can't create encoder context"
-msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
+msgid "Cannot add CMS RecipientInfo"
+msgstr "Αδυναμία προσθήκης CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
@@ -9512,7 +9963,8 @@ msgstr "εξαγωγή κλειδιών: δεν έχει εφαρμοστεί"
 
 #: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
 #: camel/camel-store.c:243
 #, c-format
@@ -9521,7 +9973,8 @@ msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s
 
 #: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
+msgstr ""
+"Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
 #: camel/camel-store.c:325
 #, c-format
@@ -9533,7 +9986,8 @@ msgstr "Δεν είναι δυνατή η δημιουργία φακέλου %s
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
@@ -9542,8 +9996,8 @@ msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλ
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
@@ -9779,10 +10233,11 @@ msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυ
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Δεν υπάρχει ο φάκελος"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Δεν υπάρχει τέτοιος φάκελος"
 
 #: camel/camel-vtrash-folder.c:44
 msgid "Cannot copy messages to the Trash folder"
@@ -9790,7 +10245,8 @@ msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων σ
 
 #: camel/camel-vtrash-folder.c:46
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
+msgstr ""
+"Δεν ήταν δυνατή η αντιγραφή μηνυμάτων στον φάκελο ανεπιθύμητης αλληλογραφίας"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
 #: camel/providers/imap4/camel-imap4-provider.c:35
@@ -9798,14 +10254,15 @@ msgid "Checking for new mail"
 msgstr "Έλεγχος για νέα μηνύματα"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα Εισερχόμενα σ' αυτόν τον διακομιστή"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
@@ -9829,8 +10286,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Για την πρόσβαση σε εξυπηρετητές Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9850,345 +10307,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, fuzzy, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, fuzzy, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η επιλογή φακέλου `%s': Άκυρη όνομα αρχείου"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Δεν ήταν δυνατή η επιλογή φακέλου `%s': Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Απροσδόκητη αποσύνδεση του διακομιστή IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Λήψη απάντησης BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:748
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος %s από τον φάκελο `%s': Δεν υπάρχει "
-"τέτοιο μήνυμα"
-
-#: camel/providers/imap4/camel-imap4-folder.c:753
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος %s από τον φάκελο `%s': Εσφαλμένη "
-"εντολή"
-
-#: camel/providers/imap4/camel-imap4-folder.c:878
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:907
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:986
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:990
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:998
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1002
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Φάκελοι"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Εμφάνιση μόνο των φακέλων με συνδρομή"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Παράκαμψη φακέλου namespace που παρέχεται από τον διακομιστή"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Με την επιλογή αύτη θα γίνει σύνδεση στο διακομιστή IMAP με χρήση κωδικού "
-"απλού κειμένου."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Διακομιστής IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Υπηρεσία IMAP για %s στο %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (θύρα %d) : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL δεν είναι διαθέσιμο"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Η σύνδεση ακυρώθηκε"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Άγνωστο Σφάλμα"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με το διακομιστή POP %s: Δεν υποστηρίζεται ο "
-"μηχανισμός πιστοποίησης."
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s στο σύστημα %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
-"χαρακτήρα \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s':' Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Ειδικός φάκελος"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Μη έγκυρο όνομα mailbox"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου`%s': Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Ειδικός φάκελος"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s':' Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Δεν είναι δυνατή η αποχώρηση απο τον φάκελο`%s': Εσφαλμένη εντολή"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Δεν έχουν δοθεί δεδομένα"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Απροσδόκητη αποσύνδεση του διακομιστή %s  IMAP: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Άγνωστο Σφάλμα"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10257,7 +10397,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10286,7 +10426,8 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2660
@@ -10327,9 +10468,31 @@ msgstr "Χρήση προσαρμοσμένης εντολής για την σ�
 msgid "Command:"
 msgstr "Εντολή:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Φάκελοι"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Εμφάνιση μόνο των φακέλων με συνδρομή"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Παράκαμψη φακέλου namespace που παρέχεται από τον διακομιστή"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Namespace"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
+msgstr ""
+"Εφαρμογή φίλτρων στα νέα μηνύματα στα ΕΙΣΕΡΧΟΜΕΝΑ σ' αυτόν τον διακομιστή"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 msgid "Check new messages for Junk contents"
@@ -10347,43 +10510,94 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Διακομιστής IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Υπηρεσία IMAP για %s στο %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (θύρα %d) : %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL δεν είναι διαθέσιμο"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Η σύνδεση ακυρώθηκε"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με την εντολή \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
+msgstr ""
+"Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10394,30 +10608,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
+"χαρακτήρα \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: `%s': ο φάκελος υπάρχει"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η επιλογή φακέλου `%s': Άκυρη όνομα αρχείου"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Δεν ήταν δυνατή η επιλογή φακέλου `%s': Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Απροσδόκητη αποσύνδεση του διακομιστή IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Λήψη απάντησης BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος %s από τον φάκελο `%s': Δεν υπάρχει "
+"τέτοιο μήνυμα"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος %s από τον φάκελο `%s': Εσφαλμένη "
+"εντολή"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στον mh φάκελο: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Με την επιλογή αύτη θα γίνει σύνδεση στο διακομιστή IMAP με χρήση κωδικού "
+"απλού κειμένου."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με το διακομιστή POP %s: Δεν υποστηρίζεται ο "
+"μηχανισμός πιστοποίησης."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s στο σύστημα %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s':' Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Ειδικός φάκελος"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Μη έγκυρο όνομα mailbox"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου`%s': Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': Ειδικός φάκελος"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s':' Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η αποχώρηση απο τον φάκελο`%s': Εσφαλμένη εντολή"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Δεν έχουν δοθεί δεδομένα"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Απροσδόκητη αποσύνδεση του διακομιστή %s  IMAP: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10570,7 +11036,8 @@ msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου �
 #: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
-msgstr "Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
+msgstr ""
+"Δεν ήταν δυνατή η διαγραφή του αρχείου περιεχομένων του φακέλου `%s': %s"
 
 #: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
@@ -10587,18 +11054,26 @@ msgstr "Δεν ήταν δυνατή η αποθήκευση της περίλη
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Δεν ήταν δυνατή η προσθήκη του μηνύματος στην περίληψη : άγνωστη αιτία"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Εισερχόμενα"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Ακυρώθηκε η προθήκη μηνύματος Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στο φάκελο maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10614,48 +11089,48 @@ msgstr ""
 "Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Μη έγκυρα περιεχόμενα στο μήνυμα"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου`%s' . Ο φάκελος δεν υπάρχει."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου `%s' :δεν είναι κατάλογος maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "δεν είναι κατάλογος maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10781,7 +11256,8 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα του φακέλου:
 #: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
+msgstr ""
+"Μοιραίο σφάλμα ανάλυσης αλληλογραφίας κοντά στην τοποθεσία %ld στο φάκελο %s"
 
 #: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
@@ -11036,8 +11512,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Εμφάνιση φακέλων σε σύντμηση (π.χ l.g.linux αντί για local.greek.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -11251,20 +11729,26 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση στο διακομιστή  POP %s (θύρα %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s σε ασφαλή λειτουργία: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s "
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11273,28 +11757,28 @@ msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με το διακομιστή POP %s: Δεν υποστηρίζεται ο "
 "μηχανισμός πιστοποίησης."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Είσοδος απέτυχε για τον διακομιστή POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Αδυναμία εισόδου στο διακομιστή POP %s: Σφάλμα πρωτοκόλου SASL "
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης POP για %s στο σύστημα %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11303,7 +11787,16 @@ msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s.\n"
 "Σφάλμα κατά την αποστολή κωδικού πρόσβασης %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή POP %s.\n"
+"Σφάλμα κατά την αποστολή κωδικού πρόσβασης %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%s'."
@@ -11355,7 +11848,8 @@ msgstr "Δεν είναι δυνατό να εκτελεστεί το %s: το �
 #: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
+msgstr ""
+"το πρόγραμμα sendmail τερματίστηκε σε κατάσταση %d: το μήνυμα δεν στάλθηκε."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
@@ -11449,7 +11943,8 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
-msgstr "Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
+msgstr ""
+"Η αιτηθείσα ενέργεια δεν εκτελέστηκε: το όνομα του mailbox δεν επιτρέπεται"
 
 #: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
@@ -11487,7 +11982,8 @@ msgstr "Σφάλμα απάντησης Welcome"
 #: camel/providers/smtp/camel-smtp-transport.c:382
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή SMTP %s  σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
@@ -11505,7 +12001,8 @@ msgstr "Η εντολή STARTTLS  απέτυχε"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgstr ""
+"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11523,97 +12020,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Διακομιστής SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Παράδοση μηνυμάτων μέσω %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκε υπηρεσία"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Δεν είναι δυνατή η αποστολή του μηνύματος: η διεύθυνση αποστολέα δεν είναι "
 "έγκυρη."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Γίνεται αποστολή μηνύματος"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
-msgstr "Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
+msgstr ""
+"Δεν είναι δυνατή η αποστολή του μηνύματος: δεν καθορίστηκαν παραλήπτες."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Δεν είναι δυνατή η αποστολή του μηνύματος: ένας ή περισσότεροι μη έγκυροι "
 "παραλήπτες"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Χαιρετισμός SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Η εντολή HELO απέτυχε: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Η εντολή HELO απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Πιστοποίηση SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Σφάλμα κατά την δημιουργία του αντικειμένου πιστοποίησης SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Η εντολή AUTH απέτυχε: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Η εντολή AUTH απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστής.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Η εντολή MAIL FROM απέτυχε: %s: το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Η εντολή MAIL FROM απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Η εντολή RCPT TO απέτυχε: %s:το μήνυμα δεν στάλθηκε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Η εντολή DATA απέτυχε: %s:το μήνυμα δεν στάλθηκε"
@@ -11621,26 +12119,26 @@ msgstr "Η εντολή DATA απέτυχε: %s:το μήνυμα δεν στά�
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Η εντολή DATA απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Η εντολή RSET απέτυχε: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Η εντολή RSET απέτυχε"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Η εντολή QUIT απέτυχε: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Η εντολή QUIT απέτυχε"
 
@@ -11703,72 +12201,6 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
-#: composer/e-msg-composer.c:704
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
-"υπογραφής από τον λογαριασμό."
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Αδυναμία κρυπτογράφησης εξερχόμενου μηνύματος: Δεν έχει ορισθεί "
-"πιστοποιητικό κρυπτογράφησης  από τον λογαριασμό."
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Μήνυμα χωρίς τίτλο"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Άνοιγμα αρχείου"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Αυτόματη δημιουργία"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Υπογραφή:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Απόκρυψη εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Εμφάνιση εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Συγγραφή νέου μηνύματος"
-
-#: composer/e-msg-composer.c:4270
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
-"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Προορισμός αποστολής"
@@ -11843,24 +12275,99 @@ msgstr "Αποστολή Σε:"
 
 #: composer/e-msg-composer-hdrs.c:619
 msgid "Click here to select folders to post to"
-msgstr "Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
+msgstr ""
+"Κάντε κλικ εδώ για να επιλέξετε τους φάκελους στους οποίους θα στείλετε"
 
 #: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου(ων)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
+"υπογραφής από τον λογαριασμό."
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Αδυναμία κρυπτογράφησης εξερχόμενου μηνύματος: Δεν έχει ορισθεί "
+"πιστοποιητικό κρυπτογράφησης  από τον λογαριασμό."
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Μήνυμα χωρίς τίτλο"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Άνοιγμα αρχείου"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Αυτόματη δημιουργία"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Υπογραφή:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Απόκρυψη εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Εμφάνιση εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Συγγραφή νέου μηνύματος"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Προωθημένο μήνυμα - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Επισύναψη αρχικού μηνύματος"
+msgstr[1] "Επισύναψη αρχικού μηνύματος"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
+"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Δεν είναι δυαντή η επισύναψη του αρχείου `${0}' στο μήνυμα."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11881,49 +12388,63 @@ msgstr ""
 "τα αρχεία του καταλόγου ξεχωριστά ή να δημιουργήσετε ένα συμπιεσμένο αρχείο "
 "του καταλόγου και να το επισυνάψετε."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Δεν ήταν δυνατή η δημιουργία μηνύματος"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Λόγω του \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Βρέθηκαν μη ολοκληρωμένα μηνύματα"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Θέλετε να ανακτήσετε τα μή ολοκληρωμένα μηνύματα?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Να μην γίνει ανάκτηση"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Ανάκτηση"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Δεν ήταν δυνατή η αποθήκευση στο αρχείο αυτόματης αποθήκευσης \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11931,28 +12452,24 @@ msgid ""
 msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Απόρριψη Αλλαγών"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Αποθήκευση μηνύματος"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Δεν ήταν δυνατή η δημιουργία μηνύματος"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 #, fuzzy
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
@@ -11960,42 +12477,30 @@ msgstr ""
 "αλληλογραφίας."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Λόγω του \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Όλοι οι λογαριασμοί απομακρύνθηκαν"
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Πρέπει να ρυθμίσετε έναν λογαριασμό πριν από την συγγραφή μηνύματος."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Δεν ήταν δυνατή η δημιουργία μηνύματος"
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 #, fuzzy
 msgid "Unable to activate the address selector control."
 msgstr ""
@@ -12003,7 +12508,7 @@ msgstr ""
 "Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 #, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -12156,7 +12661,8 @@ msgstr "Απομνημόνευση του κωδικού πρόσβασης"
 
 #: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
-msgstr "Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απομνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
@@ -12168,16 +12674,12 @@ msgstr "Κατηγορίες Συγχρονισμού:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12229,31 +12731,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12330,10 +12824,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "Κανόνες _Φίλτρων"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12350,7 +12840,6 @@ msgid "Missing file name."
 msgstr "Λείπει το όνομα αρχείου."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
@@ -12360,169 +12849,42 @@ msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Το αρχείο \"{0}\" δεν υπάρχει ή δεν είναι κανονικό αρχείο."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Λείπει ο φάκελος."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Σφάλμα στη κανονική έκφραση \"{0}\""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Λείπει το όνομα"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Το όνομα \"${0}\" χρησιμοποιείται ήδη"
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο όνομα"
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Δεν έχουν επιλεγεί πηγές"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Επιλογή ενός αρχείου"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Τότε</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Επιλογή Φακέλου"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Κανόνες _Φίλτρων</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Πηγές εΦακέλων/b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Σύγκριση με"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Εισερχόμενα"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
-"12:00am της ημερομηνίας που δίνετε εδώ."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
-"με ώρα σχετική όταν λειτουργεί το φίλτρο."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
-"την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "η ώρα σχετική με την τρέχουσα ώρα"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "πριν"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "μήνες"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "δευτερόλεπτα"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "για τον συγκεκριμένους φακέλους"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "η τρέχουσα ώρα"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "ή ώρα που ορίζετε"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "με όλους τους ενεργούς απομακρυσμένους φακέλους"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "με όλους τους τοπικούς φακέλους"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "χρόνια"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Σημαντικό"
 
@@ -12586,6 +12948,70 @@ msgstr "εισερχόμενα"
 msgid "outgoing"
 msgstr "εξερχόμενα"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Κανόνες _Φίλτρων</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Σύγκριση με"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Εισερχόμενα"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
+"12:00am της ημερομηνίας που δίνετε εδώ."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
+"με ώρα σχετική όταν λειτουργεί το φίλτρο."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Η ημερομηνία του μηνύματος θα συγκριθεί με\n"
+"την τρέχουσα ώρα  όταν λειτουργεί το φίλτρο."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "η ώρα σχετική με την τρέχουσα ώρα"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "πριν"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "μήνες"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "δευτερόλεπτα"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "η τρέχουσα ώρα"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "ή ώρα που ορίζετε"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "χρόνια"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Προσθήκη Κανόνα"
@@ -12598,58 +13024,72 @@ msgstr "Επεξεργασία Κανόνα"
 msgid "Rule name"
 msgstr "'Όνομα κανόνα: "
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Κανόνες _Σκορ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Σκορ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Το σώμα περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
+"ασφάλειας και της προβολής μηνυμάτων"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Το σώμα δεν περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Το σώμα ή το θέμα περιέχουν"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Μήνυμα περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Παραλήπτες περιέχουν"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Έλεγχος λογαριασμών αλληλογραφίας Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Αποστολέας περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Συστατικό αλληλογραφίας του Evolution."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Θέμα περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Θέμα δεν περιέχει"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Έλεγχος ρυθμίσεων επεξεργαστή  μηνυμάτων του Evolution"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Εικονικοί _Φάκελοι"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Έλεγχος προτιμήσεων Evolution Mail "
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Προσθήκη"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Μηνύματα"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Αλληλογραφία:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12681,45 +13121,352 @@ msgstr "Προσθήκη δέσμης ενεργειών υπογραφής"
 msgid "Signature(s)"
 msgstr "Υπογραφή(ές)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "--------Προωθημένο Μήνυμα --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "Κανόνες _Φίλτρων"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Επιλογή Φακέλου"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Ανάθεση Εργασίας"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Ανάθεση"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Συννημένο"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Μπελίζ"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Το σώμα περιέχει"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Αντιγραφή σε Φάκελο"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Ελήφθη"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Το στοιχείο στάλθηκε!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Διαγραφή"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Το σώμα δεν περιέχει"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "Το αρχείο %s δεν υπάρχει"
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Το αρχείο %s δεν υπάρχει"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Το σώμα δεν περιέχει"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Το σώμα δεν περιέχει"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "Δεν ήταν δυνατή η εκκίνηση του wombat"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Ημερομηνία"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Όνομα αρχίζει με"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "Έξ_οδος"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Κείμενο"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Λήγει"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Παρακολούθηση"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Λίστα"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "μετά"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "πριν"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Σημειωμένο"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Λίστα"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Σημειωμένο"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Ιούνιος"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Ετικέτα"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s λίστα ταχυδρομείου"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Μήνυμα προς Αποστολή"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Μήνυμα προς Αποστολή"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Μηνύματα"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Σήμανση ως  επιθ_υμητή αλληλογραφία"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Μετακίνηση σε φάκελο"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Έξοδος από το πρόγραμμα"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Εκτέλεση ήχου:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Αναγνωσμένα"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Παραλήπτες περιέχουν"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Απαντήσεις"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Εκτέλεση προγράμματος:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Σκορ"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Αποστολή"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Κατάσταση"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Μέγεθος"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Πηγαίο βιβλίο"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "για τον συγκεκριμένους φακέλους"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Τερματισμός Φόρτωσης"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Θέμα"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Ηνωμένες Πολιτείες"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Τότε</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Ιδιότητες φακέλου"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Ιδιότητες"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Όνομα φακέλου"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Σύνολο μηνυμάτων"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Σύνολο μηνυμάτων"
+msgstr[1] "Σύνολο μηνυμάτων"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Μη αναγνωσμένα μηνύματα"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Μη αναγνωσμένα μηνύματα"
+msgstr[1] "Μη αναγνωσμένα μηνύματα"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12729,8 +13476,8 @@ msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2309
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
 
@@ -12742,448 +13489,280 @@ msgstr "Δημιουργία"
 msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "ΕΦάκελοι"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "ΑΤΑΙΡΙΑΣΤΑ"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Γίνεται φόρτωση..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Μετακίνηση φακέλου %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Αντιγραφή φακέλου %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Μετακίνηση μηνυμάτων στο φάκελο %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Αντιγραφή μηνυμάτων στο φάκελο %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα toplevel store"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε φάκελο"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Ακύρωση _Drag"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "Α_ντιγραφή"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Δημιουργία φακέλου '%s'"
 
-#: mail/em-folder-tree.c:2309 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Δημιουργία φακέλου"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: mail/em-folder-tree.c:2500
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: mail/em-folder-tree.c:2571 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Προβολή"
 
-#: mail/em-folder-tree.c:2572
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
-#: mail/em-folder-tree.c:2576
+#: mail/em-folder-tree.c:2608
 #, fuzzy
 msgid "_Copy..."
 msgstr "Αντι_γραφή"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2609
 #, fuzzy
 msgid "_Move..."
 msgstr "_Μετακίνηση"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2581
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: mail/em-folder-tree.c:2584
+#: mail/em-folder-tree.c:2616
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Μετονομασία"
 
-#: mail/em-folder-tree.c:2587 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 #, fuzzy
 msgid "_Properties"
 msgstr "Ιδιότητες"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "ΕΦάκελοι"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "ΑΤΑΙΡΙΑΣΤΑ"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Εισερχόμενα"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Γίνεται φόρτωση..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Μηνύματα"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Εκτύπωση"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Απάντηση σε _Όλους"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Προώθηση"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Παρα_κολούθηση..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Ση_μαία Ολοκληρώθηκε"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Εκκα_θάριση Σημαίας"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Σήμανση _ως Αναγνωσμένο"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένο"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Σή_μανση ως Μη Σημαντικά"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Σήμανση ως ανεπι_θύμητη αλληλογραφία"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Σήμανση ως  επιθ_υμητή αλληλογραφία"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Α_κύρωση Διαγραφής"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Αντιγραφή στο Φάκελο..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Ετικέτα"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Εφαρμο_γή Φίλτρων"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "Κανόνες _Φίλτρων"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "ΕΦάκελος στο _Θέμα"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "ΕΦάκελος στους παραλήπτες"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Φίλτρο στο Θ_έμα"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Φίλτρο στον Α_ποστολέα"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Φίλτρο στους Παρα_λήπτες"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Αντι_γραφή τοποθεσίας δεσμού"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Από"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Απάντηση Σε"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Προς"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Αντίγραφο:"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Ιδιαίτερη Κοινοποίηση"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Θέμα"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Ομάδες συζήτησης"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr " %s επισύναψη"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωστο σφάλμα"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Σφάλμα επιβεβαίωσης υπογραφής"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Παραλαμβάνεται  %s"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Μη υπογεγραμμένο"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Έγκυρη υπογραφή"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Μή έγκυρη υπογραφή"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Αποκρυπτογραφημένο"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Αδύναμα κρυπτογραφημένο"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Κρυπτογραφημένο"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Ισχυρά κρυπτογραφημένο"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Δείκτης σε σελίδα FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Δείκτης σε τοπικό αρχείο (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Μορφοποίηση μηνυμάτων"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Πρόγραμμα αλληλογραφίας"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Ταιριάσματα: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Μη υπογεγραμμένο"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13191,7 +13770,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμαείναι "
 "αυθεντικό."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Έγκυρη υπογραφή"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13199,7 +13782,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο και έγκυρο, ο αποστολέας του μηνύματος "
 "είναι και αυτός που ισχυρίζεται ότι είναι."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Μή έγκυρη υπογραφή"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13207,11 +13794,11 @@ msgstr ""
 "Η υπογραφή του μηνύματος δεν μπορεί να επιβεβαιωθεί, μπορεί να έχει "
 "αλλοιωθεί κατά  την μεταφορά."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13219,7 +13806,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο με μια έγκυρη υπογραφή, αλλά δεν είναι "
 "δυνατή η επιβεβαίωση του αποστολέα."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Αποκρυπτογραφημένο"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13227,7 +13818,11 @@ msgstr ""
 "Αυτό το μήνυμα δεν είναι κρυπτογραφημένο. Το περιεχόμενο του μπορεί να "
 "αναγνωστεί κατά την μεταφορά του στο διαδίκτυο."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Αδύναμα κρυπτογραφημένο"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13237,7 +13832,11 @@ msgstr ""
 "κρυπτογράφησης. Θα είναι  δύσκολο αλλά όχι αδύνατο σε ένα τρίτο να διαβάσει "
 "το περιεχόμενο του μηνύματος μέσα  σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Κρυπτογραφημένο"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13245,7 +13844,11 @@ msgstr ""
 "Αυτό το μήνυμα είναι κρυπτογραφημένο. Θα είναι δύσκολο σε ένα τρίτο να "
 "διαβάσει το περιεχόμενο του μηνύματος."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Ισχυρά κρυπτογραφημένο"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13255,39 +13858,161 @@ msgstr ""
 "Θα είναι εξαρετικά δύσκολο σε ένα τρίτο να διαβάσει το περιεχόμενο του "
 "μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Προ_βολή πιστοποιητικού"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Το πιστοποιητικό δεν είναι αναγνώσιμο"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ολοληρώθηκε σε %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "'Εχουν λήξει:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "από %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "Προβολή μέ_σα στο μήνυμα"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "Απόκρυ_ψη"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Παραλαμβάνεται  %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Δείκτης σε σελίδα FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Δείκτης σε τοπικό αρχείο (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Μορφοποίηση μηνυμάτων"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Από"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Απάντηση Σε"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Προς"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Αντίγραφο:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Ιδιαίτερη Κοινοποίηση"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Πρόγραμμα αλληλογραφίας"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Ομάδες συζήτησης"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr " %s επισύναψη"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωστο σφάλμα"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Σφάλμα επιβεβαίωσης υπογραφής"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ενσωματωμένος)"
@@ -13353,12 +14078,14 @@ msgstr "Αδυναμία αντιγραφής POP3 keep-on-server data `%s': %s"
 #: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
+msgstr ""
+"Αποτυχία δημιουργίας τοπικού καταλόγου αποθήκευσης αλληλογραφίας `%s': %s"
 
 #: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία τοπικών φακέλων αλληλογραφίας σε `%s': %s"
 
 #: mail/em-migrate.c:2594
 msgid ""
@@ -13397,7 +14124,7 @@ msgstr "Αποστολή _μηνύματος στο..."
 msgid "_Add to Addressbook"
 msgstr "Προσ_ήκη στο Βιβλίο Διευθύνσεων"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
@@ -13446,11 +14173,23 @@ msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Μήνυμα από %s "
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Εικονικοί _Φάκελοι"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Προσθήκη"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Πηγή εΦακέλων"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Αυτόματη αναγνώριση δεσμών"
@@ -13537,7 +14276,8 @@ msgstr "Άδειασμα Φακέλων Απορριμάτων στην έξοδ
 
 #: mail/evolution-mail.schemas.in.in.h:22
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  Evolution."
+msgstr ""
+"Άδειασμα όλων των φακέλων  Απορριμάτων κατά την έξοδο από το  Evolution."
 
 #: mail/evolution-mail.schemas.in.in.h:23
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -13666,7 +14406,8 @@ msgstr "Προεπιλεγμένο πλάτος του παραθύρου μυν
 
 #: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
-msgstr "Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
+msgstr ""
+"Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
 
 #: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
@@ -13693,7 +14434,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -13732,7 +14474,8 @@ msgstr "Αναγνώριση smileys στο κείμενο και αντικατ
 
 #: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
-msgstr "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
+msgstr ""
+"Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
@@ -13752,7 +14495,8 @@ msgstr "Εμφάνιση κινούμενων εικόνων ως κινούμε
 
 #: mail/evolution-mail.schemas.in.in.h:69
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
+msgstr ""
+"Εμφάνιση διαγραμμένων μηνυμάτων (με strike-through) στην λίστα μηνυμάτων."
 
 #: mail/evolution-mail.schemas.in.in.h:70
 msgid "Show deleted messages in the message-list"
@@ -13772,7 +14516,8 @@ msgstr "Αρχείο για αναπαραγωγή ήχου κατά την άφ
 
 #: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
+msgstr ""
+"Καθορίζει τον τύπο της ειδοποίησης νέου μηνύματος που ο χρήστης επιθυμεί."
 
 #: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
@@ -13792,7 +14537,8 @@ msgstr "Γραμματοσειρά τερματικού"
 
 #: mail/evolution-mail.schemas.in.in.h:79
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "Η τελευταία φορά που έγινε άδειασμα απορριμάτων, σε ημέρες από την εποχή."
+msgstr ""
+"Η τελευταία φορά που έγινε άδειασμα απορριμάτων, σε ημέρες από την εποχή."
 
 #: mail/evolution-mail.schemas.in.in.h:80
 msgid "The terminal font for mail display"
@@ -13922,63 +14668,33 @@ msgstr "θύρα για έναρξη spamd εκτελεσμένου από χρ�
 msgid "spamd port"
 msgstr "θύρα spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
-"ασφάλειας και της προβολής μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Έλεγχος λογαριασμών αλληλογραφίας Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Συστατικό αλληλογραφίας του Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Εισαγωγέας Elm του Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Εισαγωγέας αλληλογραφίας Netscape του Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Έλεγχος ρυθμίσεων επεξεργαστή  μηνυμάτων του Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Εισαγωγέας Outlook Express 4 του Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Έλεγχος προτιμήσεων Evolution Mail "
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Εισαγωγέας Pine του Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Λογαριασμοί Αλληλογραφίας"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Εισαγωγέας mbox του Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Αλληλογραφία:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14036,34 +14752,6 @@ msgstr "Εισάγεται`%s'"
 msgid "Importing mailbox"
 msgstr "Γίνεται Εισαγωγή mailbox"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Εισαγωγέας Elm του Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Εισαγωγέας αλληλογραφίας Netscape του Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Εισαγωγέας Outlook Express 4 του Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Εισαγωγέας Pine του Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Εισαγωγέας mbox του Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14230,91 +14918,83 @@ msgstr "%s λίστα ταχυδρομείου"
 msgid "Add Filter Rule"
 msgstr "Προσθήκη Κανόνα Φίλτρου"
 
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d διεγραμμένα"
 msgstr[1] "%d διεγραμμένα"
 
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d ανεπιθύμητα μηνύματα"
 msgstr[1] "%d ανεπιθύμητα μηνύματα"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
 #, fuzzy, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d πρόχειρα"
 msgstr[1] "%d πρόχειρα"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
 msgstr[0] "%d απεσταλμένα"
 msgstr[1] "%d απεσταλμένα"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d μή απεσταλμένα"
 msgstr[1] "%d μή απεσταλμένα"
 
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d σύνολο"
 msgstr[1] "%d σύνολο"
 
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d μη αναγνωσμένα"
 msgstr[1] ", %d μη αναγνωσμένα"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Νέος φάκελος αλληλογραφίας"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Φάκελος αλληλογ_ραφίας"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Δημιουργία νέου φακέλου αλληλογραφίας"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Αποτυχία αναβάθμισης ρυθμίσεων αλληλογραφίας ή φακέλων."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Γίνεται Έλεγχος Υπηρεσίας"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Σύνδεση στο διακομιστή..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Ταυτότητα"
@@ -14379,14 +15059,22 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Γίνεται Έλεγχος Υπηρεσίας"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Σύνδεση στο διακομιστή..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Προεπισκόπηση</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution</b>"
@@ -14644,9 +15332,10 @@ msgstr "Να μην γίνεται παράθεση αρχικού μηνύμα�
 
 #: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
+msgstr ""
+"Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
@@ -14735,7 +15424,8 @@ msgstr "Επεξεργαστής Μηνύματος"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
+msgstr ""
+"Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
 #: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
@@ -14985,6 +15675,117 @@ msgstr " χρώμα"
 msgid "description"
 msgstr "Περιγραφή"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Πηγές εΦακέλων/b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Ψηφιακή υπογραφή</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Κρυπτογράφηση</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Αποδοχή"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Ολ_οκληρώθηκε"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Διάκριση Πεζών από Κεφαλαία"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Εύρεση στο Μήνυμα"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Εύρεση:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Σημαία για Παρακολούθηση"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Συνδρομές Φακέλων"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "%s Άδεια χρήσης"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Κανένα Επιλεγμένο"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "Εξ_υπηρετητής:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Πληροφορίες ασφάλειας"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Τα μηνύματα που επιλέξατε για παρακολούθηση είναι τα παρακάτω.\n"
+"Παρακαλώ επιλέξτε μια ενέργεια παρακολούθησης από το μενού \"Σημαία\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Λίστα αποδεκτών αδειών"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Λήξη σε:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Σημαία:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Συνδρομή"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Κατάργηση Συνδρομής"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "για τον συγκεκριμένους φακέλους"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "με όλους τους ενεργούς απομακρυσμένους φακέλους"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "με όλους τους τοπικούς και ενεργούς απομακρυσμένους φακέλους"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "με όλους τους τοπικούς φακέλους"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -15031,8 +15832,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "Απο_στολή"
+msgstr "Αποστολή"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15049,7 +15851,6 @@ msgstr ""
 "την δυνατότητα να κατανοήσουν για το τι πρόκειται να διαβάσουν,"
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
@@ -15089,7 +15890,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 "Δεν είναι δυνατή η αποστολή αυτού του μηνύματος επειδή δεν έχετε καθορίσει "
 "κανένα παραλήπτη."
@@ -15132,7 +15934,6 @@ msgstr ""
 "διαγραφεί στον φάκελο \"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Αν συνεχίσετε δεν θα μπορέσετε να ανακτήσετε αυτά τα μηνύματα."
@@ -15163,6 +15964,7 @@ msgstr ""
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15205,21 +16007,6 @@ msgstr "Σφάλμα κατά την εκτέλεση της λειτουργί�
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15236,8 +16023,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Δεν ήταν δυνατή η αποθήκευση στον κατάλογο \"{0}\"."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15246,7 +16031,8 @@ msgstr "Αδυναμία αποθήκευσης σε φάκελο  \"{0}\"."
 #. mail:no-create-path secondary
 #: mail/mail-errors.xml.h:96
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου αποθήκευσης. λόγω του \"{1}\""
+msgstr ""
+"Δεν ήταν δυνατή η δημιουργία του καταλόγου αποθήκευσης. λόγω του \"{1}\""
 
 #. mail:no-create-tmp-path primary
 #: mail/mail-errors.xml.h:98
@@ -15274,7 +16060,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου συστήματος \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15284,7 +16069,8 @@ msgstr ""
 #. mail:no-rename-spethal-folder primary
 #: mail/mail-errors.xml.h:118
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Δεν ήταν δυνατή η μετονομασία ή η μετακίνηση του φακέλου συστήματος  \"{0}\"."
+msgstr ""
+"Δεν ήταν δυνατή η μετονομασία ή η μετακίνηση του φακέλου συστήματος  \"{0}\"."
 
 #. mail:ask-delete-folder title
 #: mail/mail-errors.xml.h:122
@@ -15294,7 +16080,8 @@ msgstr "Διαγραφή \"{0}\"?"
 #. mail:ask-delete-folder primary
 #: mail/mail-errors.xml.h:124
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Αλήθεια να γίνει διαγραφή του φακέλου \"{0}\"  και όλων των υποφακέλων του?"
+msgstr ""
+"Αλήθεια να γίνει διαγραφή του φακέλου \"{0}\"  και όλων των υποφακέλων του?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
@@ -15304,13 +16091,11 @@ msgid ""
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Αδυναμία μετονομασίας \"{0}\" σε \"{1}\""
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
@@ -15323,25 +16108,21 @@ msgid "Because \"{2}\"."
 msgstr "Λόγω του \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Αδυναμία μετακίνησης φακέλου \"{0}\" σε \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Δεν ήταν δυνατό το άνοιγμα στόχου  \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Αδυναμία αντιγραφής φακέλου \"{0}\" σε \"{1}\"."
@@ -15357,7 +16138,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής  \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Αδυναμία αποθήκευσης αλλαγών στον λογαριασμό."
@@ -15379,8 +16159,11 @@ msgstr "Διαγραφή λογαριασμού?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφεί η επαφή;"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15388,8 +16171,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Να μην διαγραφεί"
+msgstr "Α_ναίρεση Διαγραφής"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15418,6 +16202,7 @@ msgstr "Απόρριψη αλλαγών?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
@@ -15433,7 +16218,8 @@ msgstr "Α_πόρριψη αλλαγών"
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
 msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Δεν είναι δυνατή η επεξεργασία του Εφακέλου \"{0}\" επειδή δεν υπάρχει."
+msgstr ""
+"Δεν είναι δυνατή η επεξεργασία του Εφακέλου \"{0}\" επειδή δεν υπάρχει."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
@@ -15487,13 +16273,41 @@ msgstr ""
 "    \"{1}\"\n"
 "Και τώρα έγινε η ενημέρωση."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Λείπει ο φάκελος."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Δεν έχουν επιλεγεί πηγές"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Πρόβλημα εισαγωγής παλιού φακέλου αλληλογραφίας \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15501,15 +16315,15 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Αγνόηση"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "Αντι_κατάσταση"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Αποστολή"
@@ -15671,7 +16485,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15680,45 +16494,21 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Διάκριση Πεζών από Κεφαλαία"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Εύρεση στο Μήνυμα"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Εύρεση:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Ψηφιακή υπογραφή</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Κρυπτογράφηση</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Πληροφορίες ασφάλειας"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Γίνεται Ακύρωση..."
@@ -15773,7 +16563,8 @@ msgstr "_Απομνημόνευση αυτού του κωδικού"
 
 #: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
-msgstr "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
+msgstr ""
+"Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
 
 #: mail/mail-signature-editor.c:371
 msgid "Edit signature"
@@ -15826,15 +16617,15 @@ msgstr "Αναβάθμιση εφακέλων για  '%s:%s'"
 msgid "Updating vFolders for '%s'"
 msgstr "Αναβάθμιση εφακέλων για '%s'"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
@@ -15954,10 +16745,6 @@ msgstr "Προώθηση"
 msgid "No Response Necessary"
 msgstr "Δεν είναι απαραίτητη απάντηση"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Αναγνωσμένα"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Απάντηση"
@@ -15970,49 +16757,49 @@ msgstr "Απάντηση σε Όλους"
 msgid "Review"
 msgstr "Επισκόπηση"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Σημαία για Παρακολούθηση"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Το σώμα περιέχει"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Ολ_οκληρώθηκε"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Το σώμα δεν περιέχει"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Τα μηνύματα που επιλέξατε για παρακολούθηση είναι τα παρακάτω.\n"
-"Παρακαλώ επιλέξτε μια ενέργεια παρακολούθησης από το μενού \"Σημαία\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Το σώμα ή το θέμα περιέχουν"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Λήξη σε:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Μήνυμα περιέχει"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Σημαία:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Παραλήπτες περιέχουν"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Συνδρομές Φακέλων"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Αποστολέας περιέχει"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Κανένα Επιλεγμένο"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Θέμα περιέχει"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "Εξ_υπηρετητής:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Θέμα δεν περιέχει"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Συνδρομή"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Κέλυφος Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Κατάργηση Συνδρομής"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Δοκιμή Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Στοιχείο Δοκιμής του Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16036,7 +16823,8 @@ msgstr "'Εκδοση ρυθμίσεων του Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
+msgstr ""
+"ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
@@ -16055,7 +16843,8 @@ msgstr ""
 "ανάπτυξη εκδόσεις του Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "Λίστα από διαδρομέα για τους φακέλους που θα συγχρονίζονται στον δίσκο για "
 "εργασία χωρίς σύνδεση"
@@ -16080,30 +16869,19 @@ msgstr "Αν θα παρακάμπτεται ο διάλογος προειδο�
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Άγνωστο σφάλμα συστήματος."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Πιστοποίηση</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Εκτέλεση ενεργειών"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Γενικό σφάλμα"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16289,25 +17067,6 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Το  Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για να "
-"αποσυνδεθείτε."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Το Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Το Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Αλλαγή σε %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16344,10 +17103,91 @@ msgstr "Εργασία Εκ_τός Δικτύου"
 msgid "Work Offline"
 msgstr "Εργασία Εκτός Δικτύου"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Το  Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για να "
+"αποσυνδεθείτε."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Το Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Το Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να συνδεθείτε."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Αλλαγή σε %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Άγνωστο σφάλμα συστήματος."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Μη έγκυρη παράμετρος"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Γενικό σφάλμα"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Νέο"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Βοηθός Εισαγωγής του Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "Εισαγωγή Αρχείου"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "_Ζώνη αλλαγής ώρας:"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Νέα Δοκιμή"
@@ -16360,18 +17200,6 @@ msgstr "_Δοκιμή"
 msgid "Create a new test item"
 msgstr "Δημιουργία νέου αντικείμενου δοκιμής"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Κέλυφος Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Δοκιμή Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Στοιχείο Δοκιμής του Evolution."
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16430,10 +17258,11 @@ msgstr "Να μην ξαναγίνει η ερώτηση"
 
 #: shell/importer/intelligent.c:211
 msgid "Evolution can import data from the following files:"
-msgstr "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
+msgstr ""
+"Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16468,7 +17297,7 @@ msgstr ""
 "Ελπίζουμε τα απολαύσετε τα αποτελέσματα της σκληρής μας δουλειάς\n"
 "και περιμένουμε με ανυπομονησία την συμβολή σας!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16476,39 +17305,40 @@ msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Εκκίνηση του Evolution  με ενεργοποίηση του καθορισμένου συστατικού"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Βιαίο κλείσιμο όλων των συστατικών του evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Βιαία επαναεισαγωγή από το Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
-msgstr "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
+msgstr ""
+"Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16517,6 +17347,94 @@ msgstr ""
 "%s: --online and --offline δεν μπορούν να χρησιμοποιηθούν μαζί.\n"
 " Χρησιμοποιήστε %s --help για περισσότερες πληροφορίες.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Το σώμα περιέχει"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Δεν ήταν δυνατή η εκκίνηση του διακομιστή wombat"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Βοηθός Λογαριασμού Evolution"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16617,7 +17535,8 @@ msgstr "<b>Εκδόθηκε Σε</b>"
 
 #: smime/gui/smime-ui.glade.h:8
 msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
+msgstr ""
+"<b> Αυτό το πιστοποιητικό έχει επιβεβαιωθεί  για τις ακόλουθες χρήσεις</b>"
 
 #: smime/gui/smime-ui.glade.h:9
 msgid "<b>Validity</b>"
@@ -16745,14 +17664,16 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Έχετε πιστοποιητικά από οργανισμούς που πιστοποιούν εσάς:"
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τις παρακάτω αρχές "
 "πιστοποίησης:"
 
 #: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
-msgstr "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
+msgstr ""
+"Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
 #: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
@@ -16762,6 +17683,11 @@ msgstr "Τα Πιστοποιητικά σας:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Το πιστοποιητικό υπάρχει ήδη"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16963,11 +17889,6 @@ msgstr "Μοναδικό Αναγνωριστικό Θέματος"
 msgid "Certificate Signature Value"
 msgstr "Τιμή Υπογραφής Πιστοποιητικού"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Το πιστοποιητικό υπάρχει ήδη"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Κωδικός αρχείου PKCS12"
@@ -17107,8 +18028,8 @@ msgstr "Προβολή της τρέχουσας επαφής"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Ε_νέργειες"
@@ -17454,7 +18375,8 @@ msgstr "Άνοιγμα παραθύρου για την σύνθεση νέου
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
+msgstr ""
+"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17474,7 +18396,8 @@ msgstr "Εμφάνιση οθόνης προεπισκόπησης"
 
 #: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
+msgstr ""
+"Συνδρομή ή κατάργηση συνδρομής σε φακέλους σε απομακρυσμένους διακομιστές"
 
 #: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
@@ -17513,7 +18436,8 @@ msgid "Hide _Read Messages"
 msgstr "Απόκρυψη _Αναγνωσμένων Μηνυμάτων"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Απόκρυψη των μηνυμάτων που έχουν διαγραφεί και όχι την εμφάνιση τους με μια "
 "γραμμή στη μέση"
@@ -17532,7 +18456,8 @@ msgstr "Επικόλληση μηνύματος από το πρόχειρο"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
+msgstr ""
+"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
@@ -17582,16 +18507,6 @@ msgstr "Αντιστρο_φή Επιλογής"
 msgid "_Threaded Message List"
 msgstr "Λίστα μηνυμάτων κατά _θέμα"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Κλείσιμο του παραθύρου"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -17638,11 +18553,13 @@ msgstr "Δημιουργία κανόνα για το φιλτράρισμα μ�
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων με αυτούς του παραλήπτες"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
+msgstr ""
+"Δημιουργία κανόνα για το φιλτράρισμα μηνυμάτων για αυτή τη λίστα ταχυδρομείου"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
@@ -17993,6 +18910,16 @@ msgstr "Εργα_λεία"
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Κλείσιμο του παραθύρου"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -18015,7 +18942,8 @@ msgstr "Κρυπτογραφήστε αυτό το μήνυμα με PGP"
 
 #: ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
+msgstr ""
+"Κρυπτογραφήστε αυτό το μήνυμα με την πιστοποιημένη κρυπτογράφηση S/MIME"
 
 #: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
@@ -18075,10 +19003,6 @@ msgstr "Αποθήκευση του παρόντος αρχείου με δια�
 msgid "Save the message in a specified folder"
 msgstr "Αποθήκευση του μηνύματος στον καθορισμένο φάκελο"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Αποστολή"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18641,7 +19565,8 @@ msgstr "Ερώτημα Evolution"
 #. setup a dummy error
 #: widgets/misc/e-error.c:417
 #, fuzzy, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
 
 #: widgets/misc/e-expander.c:181
@@ -18789,3 +19714,175 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Διαπιστευτήρια πιστοποίησης για τον εξυπηρετητή  HTTP"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Επιλεγμένα ημερολόγια για δημοσίευση"
+
+#~ msgid "Login name:"
+#~ msgstr "¨Όνομα εισόδου:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Ο χρήστης δημοσιεύει"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "C_alendar"
+#~ msgstr "Η_μερολόγιο"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Επιλογές Ηχητικής Ειδοποίησης"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Επιλογές Ειδοποίησης Μηνύματος"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Επιλογές Ειδοποίησης Email"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Επιλογές Ειδοποίησης Προγράμματος"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Άγνωστες Επιλογές Ειδοποίησης"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Επανάληψη Ειδοποίησης"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Μήνυμα προς εμφάνιση:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Με αυτές τις παραμέτρους:"
+
+#~ msgid "Basics"
+#~ msgstr "Βασικά"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Ημερομηνία/Ώρα:"
+
+#~ msgid "Reminders"
+#~ msgstr "Υπενθυμίσεις"
+
+#~ msgid "_Options..."
+#~ msgstr "_Επιλογές..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Βιβλίο Διευθύνσεων..."
+
+#~ msgid "Reminder"
+#~ msgstr "Υπενθύμιση"
+
+#~ msgid "B_usy"
+#~ msgstr "Απασχολημένος"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Εμ_πιστευτικό"
+
+#~ msgid "Date & Time"
+#~ msgstr "Ημερομηνία & Ώρα"
+
+#~ msgid "F_ree"
+#~ msgstr "_Ελεύθερο"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Ιδιωτι_κό"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Δη_μόσιο"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Προσθήκη πα_ρευρισκόμενου"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
+#~ msgid "Preview"
+#~ msgstr "Προεπισκόπηση"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Κανόνας Επανεμφάνισης"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Παραμετροποιημένη επανεμφάνιση"
+
+#~ msgid "_Modify"
+#~ msgstr "_Τροποποίηση"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Χωρίς επανεμφάνιση"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Απλή επανεμφάνιση"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Ολοκληρωμένο"
+
+#~ msgid "Progress"
+#~ msgstr "Πρόοδος"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Εμπιστευτικό"
+
+#~ msgid "Folder:"
+#~ msgstr "Φάκελος:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr ""
+#~ "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
+#~ msgid "_Options"
+#~ msgstr "_Επιλογές"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Χρόνος έ_ναρξης συνάντησης:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Χρόνος _περάτωσης συνάντησης:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Η επιλεγμένη λίστα εργασιών είναι μόνο για ανάγνωση, και δεν μπορούν να "
+#~ "δημιουργηθούν γεγονότα. Παρακαλώ επιλέξτε ένα άλλο ημερολόγιο."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Δεν είναι δυνατή η εύρεση πιστοποιητικού για  `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Αποτυχία δημιουργίας μηνύματος CMS"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
+
+#~ msgid "_Score Rules"
+#~ msgstr "Κανόνες _Σκορ"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
+
+#~ msgid "Properties"
+#~ msgstr "Ιδιότητες"
+
+#~ msgid "Folder Name"
+#~ msgstr "Όνομα φακέλου"
diff --git a/po/en_AU.po b/po/en_AU.po
index 8cf16827e5..657a8bf422 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -20,15 +20,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -50,35 +41,248 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Cannot initialise Evolution's mail component."
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Could not close temporary folder: %s"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Could not close temporary folder: %s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Could not close temporary folder: %s"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr ""
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "_Other Organiser"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr ""
+"Can not get message: %s\n"
+"  %s"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+msgid "Error saving contacts to {0}: {1}"
+msgstr ""
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr "Could not close temporary folder: %s"
+msgid "C_ontacts"
+msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -118,7 +322,7 @@ msgstr "_Other Organiser"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Other Organiser"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -142,15 +346,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -159,19 +363,19 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -179,57 +383,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr ""
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Could not close temporary folder: %s"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -250,62 +464,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -313,7 +471,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -322,8 +480,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
@@ -349,6 +506,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Organisation"
@@ -396,13 +554,11 @@ msgid "Anonymously"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
@@ -613,33 +769,26 @@ msgid "cards"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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:208
+msgid "Remove All"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr ""
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -655,7 +804,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr ""
 
@@ -663,14 +812,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -695,6 +851,11 @@ msgstr ""
 msgid "_Find"
 msgstr ""
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Other Organiser"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -739,9 +900,8 @@ msgid "<b>Work</b>"
 msgstr "Organisation"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -764,7 +924,6 @@ msgid "Birthday:"
 msgstr "_Other Organiser"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Organisation"
@@ -778,8 +937,8 @@ msgid "Company:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 #, fuzzy
@@ -787,7 +946,7 @@ msgid "Contact"
 msgstr "_Other Organiser"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr ""
 
@@ -882,8 +1041,8 @@ msgstr ""
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -904,40 +1063,28 @@ msgid "_File under:"
 msgstr "Synchronising folder"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 #, fuzzy
 msgid "Address"
 msgstr "Chile"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr ""
 
@@ -1910,132 +2057,124 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
-msgid "Jabber"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Organisation"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #, fuzzy
 msgid "Changed"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Organisation"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2053,6 +2192,18 @@ msgstr ""
 msgid "E-_mail:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
@@ -2177,46 +2328,65 @@ msgid "\n"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Members"
+msgid "Add an email to the List"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "_Hide addresses when sending mail to this list"
+msgid "Insert email adresses from Adress Book"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "_List name:"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
+msgid "Members"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "_Type an email address or drag a contact into the list below:"
+msgid "Remove an email address from the List"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Organisation"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+msgid "_List name:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr ""
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
-msgid "Contact List Editor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
+msgid "Contact List Editor"
 msgstr ""
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
@@ -2253,407 +2423,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "Chile"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Cannot initialise Evolution's mail component."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "_Other Organiser"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Could not close temporary folder: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Synchronising folder failed: %s: %s"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "_Other Organiser"
-msgstr[1] "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2668,9 +2442,9 @@ msgstr[1] "_Other Organiser"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr ""
 
@@ -2686,133 +2460,133 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -2846,6 +2620,8 @@ msgid "Car Phone"
 msgstr ""
 
 #: 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:3
 msgid "Categories"
 msgstr ""
 
@@ -2853,6 +2629,21 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr ""
@@ -2891,14 +2682,29 @@ msgstr "Comoros"
 msgid "Manager"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisation"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2950,29 +2756,21 @@ msgstr ""
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -2989,7 +2787,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -2998,19 +2800,383 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "Chile"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Cannot initialise Evolution's mail component."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "_Other Organiser"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Could not close temporary folder: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Synchronising folder failed: %s: %s"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr ""
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3058,6 +3224,11 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3069,11 +3240,6 @@ msgstr "_Other Organiser"
 msgid "Print contact"
 msgstr "_Other Organiser"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3259,6 +3425,23 @@ msgstr "_Other Organiser"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Can not open message"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Could not close temporary folder: %s"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3313,23 +3496,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Can not open message"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Could not close temporary folder: %s"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3346,39 +3512,349 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+msgid "Don't Send"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+msgid "Send Notice"
+msgstr ""
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+msgid "Save Appointment"
+msgstr ""
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Can not open message"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr ""
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr ""
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Organisation"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr ""
@@ -3463,10 +3939,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
@@ -3609,9 +4081,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Organisation"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3629,8 +4122,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr ""
 
@@ -3641,7 +4134,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
@@ -3689,66 +4182,55 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 #, fuzzy
 msgid "New meeting"
 msgstr "Synchronising folders"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
+msgid "Cale_ndar"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3778,27 +4260,6 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Organisation"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3816,218 +4277,127 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Can not open message"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Can not open message"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid "_Arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid "_Sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
-msgid "hour(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-msgid "minute(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "start of appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "C_lose"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
 msgstr ""
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
@@ -4143,7 +4513,7 @@ msgid "Free/Busy Publishing"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
@@ -4157,7 +4527,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr ""
@@ -4167,7 +4537,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr ""
@@ -4181,7 +4551,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr ""
@@ -4196,7 +4566,7 @@ msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr ""
@@ -4210,7 +4580,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr ""
@@ -4220,7 +4590,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr ""
@@ -4253,7 +4623,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4303,6 +4674,76 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "C_lose"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr ""
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4347,78 +4788,72 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
-#, fuzzy
-msgid "Could not update object"
-msgstr "Could not initialise Bonobo"
-
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
-msgid "Edit Appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
-msgid "Appointment - %s"
+msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
-msgid "Changes made to this item may be discarded if an update arrives"
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
-msgid "Unable to use current version!"
+#: calendar/gui/dialogs/comp-editor.c:264
+#, fuzzy
+msgid "Could not update object"
+msgstr "Could not initialise Bonobo"
+
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
-msgid "Validation error: %s"
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
 msgstr ""
 
 #: calendar/gui/dialogs/copy-source-dialog.c:57
@@ -4484,8 +4919,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4495,160 +4931,215 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Could not close temporary folder: %s"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
+msgid "1 day before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
+msgid "1 hour before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
+msgid "15 minutes before appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "_Other Organiser"
+
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr ""
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
+msgid "A_ll day event"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
+msgid "C_ustomize..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
+msgid "Cale_ndar:"
 msgstr "Organisation"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr ""
+#, fuzzy
+msgid "L_ocation:"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+msgid "_Alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Synchronising folder"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4688,35 +5179,45 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Cannot initialise Evolution's mail component."
+msgid "<b>Organizer</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organiser:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Change Organiser"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organiser:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4785,149 +5286,140 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 #, fuzzy
 msgid "Other Date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Organisation"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "This appointment rec_urs"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Synchronising folder"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
+msgid "<span weight=\"bold\">Status</span>"
 msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
@@ -4939,8 +5431,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
@@ -4952,23 +5444,22 @@ msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "C_lose"
+msgid "P_ercent complete:"
+msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4991,37 +5482,40 @@ msgstr ""
 msgid "_Web Page:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Synchronising folder"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5032,53 +5526,52 @@ msgstr "_Other Organiser"
 msgid "_Due date:"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "_Group:"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
+msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Chile"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr ""
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr ""
+#, fuzzy
+msgid "_Daily"
+msgstr "Chile"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr ""
+#, fuzzy
+msgid "_Manual"
+msgstr "Chile"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
+msgid "_Password:"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+msgid "_Remember password"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr ""
+#, fuzzy
+msgid "_Username:"
+msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+msgid "_Weekly"
 msgstr ""
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5160,7 +5653,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5169,6 +5662,11 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5182,7 +5680,7 @@ msgstr "_Other Organiser"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr ""
 
@@ -5194,19 +5692,89 @@ msgstr ""
 msgid "Web Page:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr ""
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
@@ -5253,95 +5821,101 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5350,176 +5924,110 @@ msgstr ""
 msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "_Other Organiser"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Synchronising \"%s\""
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Can not open message"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5540,35 +6048,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:585
@@ -5636,343 +6144,319 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr ""
+#, fuzzy
+msgid "Starts"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 #, fuzzy
 msgid "Location:"
 msgstr "Organisation"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-#, 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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6001,6 +6485,10 @@ msgstr ""
 msgid "Loading calendar..."
 msgstr ""
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organiser:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -6017,11 +6505,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6089,6 +6572,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6097,209 +6602,106 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:417
-#, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+msgid "O_ptions"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:824
+#: calendar/gui/e-tasks.c:846
 #, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
+msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronising folders"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Organisation"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6639,10 +7041,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr ""
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6673,7 +7071,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr ""
 
@@ -6702,7 +7100,7 @@ msgid_plural "%d tasks"
 msgstr[0] "_Other Organiser"
 msgstr[1] "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6722,34 +7120,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
-msgstr ""
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
+msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "_Other Organiser"
@@ -8418,69 +8811,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Synchronising folders"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Can not open message"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Synchronising folder"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8502,43 +8895,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-#, fuzzy
-msgid "Copying messages"
-msgstr "Can not open message"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr ""
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Can not open message"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8580,7 +8936,44 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+#, fuzzy
+msgid "Copying messages"
+msgstr "Can not open message"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr ""
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Can not open message"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8588,44 +8981,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8633,85 +9026,65 @@ msgid ""
 "%s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr ""
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8732,6 +9105,26 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr ""
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8964,7 +9357,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9043,55 +9436,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9163,7 +9556,7 @@ msgstr "Can not get folder: %s: %s"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Can not create folder lock on %s: %s"
@@ -9252,8 +9645,11 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr ""
+"Can not get message: %s\n"
+"  %s"
 
 #: camel/camel-smime-context.c:651
 #, c-format
@@ -9266,48 +9662,45 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Can not get folder: %s: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
+msgid "Cannot create CMS Message"
 msgstr "Can not open message"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Can not open message"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+msgid "Cannot attach CMS data object"
 msgstr ""
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Can not open message"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Can not create folder lock on %s: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9353,7 +9746,8 @@ msgstr "Can not get folder: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
@@ -9362,8 +9756,8 @@ msgstr "Can not rename folder: %s: Invalid operation"
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9484,7 +9878,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9493,11 +9887,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9514,7 +9908,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9524,35 +9918,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9577,7 +9971,7 @@ msgstr "You can not copy messages from this rubbish bin."
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -9598,8 +9992,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9630,8 +10024,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9649,315 +10043,28 @@ msgstr ""
 msgid "Checklist"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Can not delete folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Can not append message to mh folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Can not append message to mh folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 ""
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Can not rename folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Can not delete folder: %s: No such folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Can not delete folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Can not delete folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "_Other Organiser"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Can not delete folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Can not rename folder: %s: Invalid operation"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Can not get folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10026,7 +10133,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10098,6 +10205,27 @@ msgstr "Could not close temporary folder: %s"
 msgid "Command:"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr ""
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10118,43 +10246,92 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 ""
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10162,30 +10339,274 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Can not delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Can not delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "_Other Organiser"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10346,18 +10767,26 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10373,48 +10802,48 @@ msgstr ""
 "Can not get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10984,55 +11413,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -11239,95 +11680,95 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr ""
@@ -11335,26 +11776,26 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr ""
 
@@ -11417,91 +11858,6 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11580,16 +11936,89 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Can not open message"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11607,107 +12036,131 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Could not close temporary folder: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Can not open message"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Synchronising folder"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Could not close temporary folder: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Can not open message"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Could not close temporary folder: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Could not close temporary folder: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Could not close temporary folder: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -11998,10 +12451,6 @@ msgstr "%m/%d/%Y"
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr ""
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12028,365 +12477,590 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Can not delete folder: %s: No such folder"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Synchronising folder"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr ""
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
+#: filter/filter-file.c:288
+msgid "Choose a file"
 msgstr ""
 
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
 msgstr ""
 
-#: filter/filter-file.c:288
-msgid "Choose a file"
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
 msgstr ""
 
-#. and now for the action area
-#: filter/filter-filter.c:491
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:790
 #, fuzzy
-msgid "<b>Then</b>"
-msgstr "Organisation"
+msgid "Rule name:"
+msgstr "_Other Organiser"
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
 msgstr ""
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
+#: filter/filter-rule.c:856
+msgid "Execute actions"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr ""
+
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
 msgstr ""
 
 #: filter/filter.glade.h:21
-msgid "the current time"
+msgid "years"
 msgstr ""
 
-#: filter/filter.glade.h:22
-msgid "the time you specify"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
 msgstr ""
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
+#: filter/rule-editor.c:685
+msgid "Rule name"
 msgstr ""
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: filter/filter.glade.h:27
-msgid "years"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
-msgid "Important"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: filter/filter-rule.c:790
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+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:99
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
-msgid "Rule name:"
-msgstr "_Other Organiser"
+msgid "_Mail"
+msgstr "Chile"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
 msgstr ""
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "All related"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "Replies"
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
 msgstr ""
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "incoming"
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
 msgstr ""
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
 msgstr ""
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
 msgstr ""
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
 msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
 msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Organisation"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Synchronising folder"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
 msgstr ""
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "_Other Organiser"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "_Other Organiser"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "_Other Organiser"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
 msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
 msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr ""
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
 msgstr ""
 
-#: filter/vfolder-editor.c:108
+#: mail/em-filter-i18n.h:24
 #, fuzzy
-msgid "Virtual _Folders"
+msgid "Expression"
+msgstr "Organisation"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr ""
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr ""
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr ""
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr ""
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "Chile"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Can not open message"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
 msgstr "Synchronising folder"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
 msgstr ""
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
 msgstr ""
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
 msgstr ""
 
-#: mail/em-account-prefs.c:472
-msgid "Account name"
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
 msgstr ""
 
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
 msgstr ""
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
 msgstr ""
 
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
 msgstr ""
 
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
 msgstr ""
 
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
+#: mail/em-filter-i18n.h:50
+msgid "returns"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
-msgid "an unknown sender"
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
 msgstr ""
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
 msgstr ""
 
-#: mail/em-folder-browser.c:129
-msgid "Create _Virtual Folder From Search..."
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
 msgstr ""
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
 msgstr ""
 
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr ""
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
 msgstr ""
 
-#: mail/em-folder-properties.c:146
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr ""
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr ""
+
+#: mail/em-filter-i18n.h:61
 #, fuzzy
-msgid "Total messages"
-msgstr "Can not open message"
+msgid "starts with"
+msgstr "_Other Organiser"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-filter-i18n.h:63
 #, fuzzy
-msgid "Unread messages"
-msgstr "Can not open message"
+msgid "Stop Processing"
+msgstr "Organisation"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr ""
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Organisation"
+
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
+
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "Organisation"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Can not open message"
+msgstr[1] "Can not open message"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12396,400 +13070,418 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr ""
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr ""
 
-#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
-#, fuzzy
-msgid "_New Folder..."
-msgstr "Synchronising folders"
-
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
 msgstr ""
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr ""
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
+#, fuzzy
+msgid "_New Folder..."
+msgstr "Synchronising folders"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr ""
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Other Organiser"
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr ""
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Organisation"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:651
+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.c:1306
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr ""
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Could not close temporary folder: %s"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
+#: mail/em-format-html-display.c:769
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12826,117 +13518,84 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Can not open message"
 
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
 #: mail/em-junk-filter.c:86
@@ -13043,7 +13702,7 @@ msgstr ""
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13056,7 +13715,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr ""
 
@@ -13092,11 +13751,24 @@ msgid "Add address"
 msgstr "Chile"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Synchronising folder"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr ""
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13548,69 +14220,36 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
+msgid "Evolution mbox importer"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "Chile"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
@@ -13667,36 +14306,6 @@ msgstr ""
 msgid "Importing mailbox"
 msgstr "Organisation"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13838,83 +14447,89 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
-msgstr ""
+msgid_plural "%d deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, c-format
-msgid "%d drafts"
-msgstr ""
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "_Other Organiser"
+msgid_plural "%d sent"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "_Other Organiser"
+msgid_plural "%d unsent"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "_Other Organiser"
+msgid_plural "%d total"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Synchronising folders"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -13964,12 +14579,20 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:2
-msgid " Ch_eck for Supported Types "
+#: mail/mail-config.c:895
+msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
+#: mail/mail-config.glade.h:2
+msgid " Ch_eck for Supported Types "
 msgstr ""
 
 #: mail/mail-config.glade.h:5
@@ -14223,7 +14846,7 @@ msgstr "Can not open message"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
@@ -14555,6 +15178,112 @@ msgstr "Colours"
 msgid "description"
 msgstr ""
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+msgid "Accept License"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -14739,14 +15468,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -14754,8 +15475,9 @@ msgstr ""
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
+#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
+msgstr "Cannot initialise Evolution's mail component."
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:90
@@ -14786,8 +15508,9 @@ msgstr "Can not create folder lock on %s: %s"
 
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
+#, fuzzy
 msgid "File exists but cannot overwrite it."
-msgstr ""
+msgstr "Can not delete folder: %s: No such folder"
 
 #. mail:no-write-path-notfile secondary
 #: mail/mail-errors.xml.h:108
@@ -14822,8 +15545,9 @@ msgstr "Can not rename folder: %s: No such folder"
 
 #. mail:ask-delete-folder title
 #: mail/mail-errors.xml.h:122
+#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr ""
+msgstr "_Other Organiser"
 
 #. mail:ask-delete-folder primary
 #: mail/mail-errors.xml.h:124
@@ -14840,8 +15564,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Can not get folder: %s: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -14891,8 +15616,9 @@ msgstr "Could not close temporary folder: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "_Other Organiser"
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -14901,8 +15627,9 @@ msgstr ""
 
 #. mail:account-notunique secondary
 #: mail/mail-errors.xml.h:162
+#, fuzzy
 msgid "You may not create two accounts with the same name."
-msgstr ""
+msgstr "Can not create folder lock on %s: %s"
 
 #. mail:ask-delete-account title
 #: mail/mail-errors.xml.h:164
@@ -14920,8 +15647,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "_Other Organiser"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -14936,8 +15664,9 @@ msgstr ""
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
+#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr ""
+msgstr "Could not close temporary folder: %s"
 
 #. mail:signature-notscript secondary
 #: mail/mail-errors.xml.h:177
@@ -14978,8 +15707,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "Can not delete folder: %s: No such folder"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15011,13 +15741,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Synchronising folder"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "_Other Organiser"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15025,15 +15785,15 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr ""
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr ""
 
@@ -15188,52 +15948,28 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr ""
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr ""
@@ -15269,24 +16005,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15341,15 +16077,15 @@ msgstr "Synchronising \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
@@ -15413,7 +16149,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15470,10 +16206,6 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15486,47 +16218,52 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr ""
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr ""
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Cannot initialise Evolution's mail component."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15591,29 +16328,17 @@ msgstr ""
 msgid "mail"
 msgstr "Chile"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr ""
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr ""
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr ""
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "Organisation"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15781,23 +16506,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -15815,118 +16523,85 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chile"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "_Other Organiser"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "_Other Organiser"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Organisation"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
-msgid "C_alendar:"
-msgstr "Organisation"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "_Other Organiser"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "Chile"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-#, fuzzy
-msgid "_Tasks:"
-msgstr "_Other Organiser"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "Synchronising folder"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "Synchronising folder"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "Synchronising folder"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -15935,7 +16610,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -15943,20 +16618,19 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "New Test"
+msgstr "_Other Organiser"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Cannot initialise Evolution's mail component."
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Create a new test item"
+msgstr "_Other Organiser"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16015,7 +16689,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16035,46 +16709,46 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16113,8 +16787,9 @@ msgid ""
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
+#, fuzzy
 msgid "Continue"
-msgstr ""
+msgstr "Organisation"
 
 #. shell:noshell title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
@@ -16146,6 +16821,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16391,6 +17088,12 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Could not close temporary folder: %s"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
@@ -16596,12 +17299,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr "Could not close temporary folder: %s"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Could not close temporary folder: %s"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16742,8 +17439,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
@@ -17222,16 +17919,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17635,6 +18322,16 @@ msgstr ""
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr ""
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17717,10 +18414,6 @@ msgstr ""
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18282,7 +18975,7 @@ msgid "Evolution Query"
 msgstr "Cannot initialise Evolution's mail component."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18437,14 +19130,74 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Email address:"
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "C_lose"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Can not get folder: %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Can not open message"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Can not create folder lock on %s: %s"
+
+#, fuzzy
+#~ msgid "Checkbox"
 #~ msgstr "Chile"
 
 #, fuzzy
-#~ msgid "Calendar Properties"
+#~ msgid "C_alendar:"
 #~ msgstr "Organisation"
 
 #, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Chile"
+
+#, fuzzy
 #~ msgid "Remote"
 #~ msgstr "Synchronising folder"
 
@@ -18453,10 +19206,6 @@ msgstr ""
 #~ msgstr "_Other Organiser"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Could not close temporary folder: %s"
-
-#, fuzzy
 #~ msgid "Could not get group: %s"
 #~ msgstr "Could not close temporary folder: %s"
 
@@ -18467,10 +19216,6 @@ msgstr ""
 #~ "  %s"
 
 #, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "Chile"
 
@@ -18494,10 +19239,6 @@ msgstr ""
 #~ msgstr "Organisation"
 
 #, fuzzy
-#~ msgid "task list"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
 #~ msgid "Failed to migrate pop3 uid caches: %s"
 #~ msgstr "Could not close temporary folder: %s"
 
@@ -18607,10 +19348,6 @@ msgstr ""
 #~ msgstr "Synchronising folders"
 
 #, fuzzy
-#~ msgid "Copy Folder"
-#~ msgstr "Synchronising folder"
-
-#, fuzzy
 #~ msgid ""
 #~ "Cannot remove folder:\n"
 #~ "%s"
@@ -18683,10 +19420,6 @@ msgstr ""
 #~ msgstr "Synchronising folder"
 
 #, fuzzy
-#~ msgid "Cannot create a folder with that name"
-#~ msgstr "Can not create folder lock on %s: %s"
-
-#, fuzzy
 #~ msgid "Organizational Unit"
 #~ msgstr "Organisation"
 
@@ -18695,10 +19428,6 @@ msgstr ""
 #~ msgstr "Could not close temporary folder: %s"
 
 #, fuzzy
-#~ msgid "Evolution Addressbook local backend"
-#~ msgstr "Cannot initialise Evolution's mail component."
-
-#, fuzzy
 #~ msgid "Could not update invalid object"
 #~ msgstr "Could not initialise Bonobo"
 
@@ -18873,10 +19602,6 @@ msgstr ""
 #~ "(%s)"
 #~ msgstr "Cannot initialise Evolution's Mail Wizard interface"
 
-#, fuzzy
-#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
-#~ msgstr "Cannot initialise Evolution's Mail Wizard interface"
-
 #~ msgid "Cannot initialize the Bonobo component system."
 #~ msgstr "Can not initialise the Bonobo component system."
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 8cd9debdf2..adcdc21b9a 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-10 19:12-0700\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-10 19:18-0700\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Report-Msgid-Bugs-To: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -22,14 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "current addressbook folder "
@@ -50,34 +42,260 @@ msgstr " cards"
 msgid " card"
 msgstr " card"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "The item could not be sent!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "This store does not support subscriptions, or they are not enabled."
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Could not get group list from server."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP server response did not contain %s information"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Could not load addressbook"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "No description available."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Save in addressbook"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Error loading default addressbook."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Unable to process spool folder"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Do you wish to save your changes?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Discard"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "and one other contact."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Unable to parse message content"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Error adding contact"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Addressbook address viewer"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Could not load addressbook"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletion"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -108,7 +326,8 @@ msgid "New Contacts Group"
 msgstr "New Contacts Group"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Contacts Group"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -131,18 +350,14 @@ msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -206,36 +421,45 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Properties..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -257,58 +481,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -316,7 +488,7 @@ msgstr "Manage your S/MIME certificates here"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -325,7 +497,7 @@ msgstr "Manage your S/MIME certificates here"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -351,6 +523,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentication</b>"
 
@@ -392,13 +565,11 @@ msgid "Anonymously"
 msgstr "Anonymously"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Basic"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -630,33 +801,26 @@ msgid "cards"
 msgstr "cards"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Select Contacts from Address Book"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Addressbook name selection interface"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Remove All"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remove"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "View Contact List"
@@ -671,7 +835,7 @@ msgid "Send HTML Mail?"
 msgstr "Send HTML Mail?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Add to Contacts"
 
@@ -679,15 +843,22 @@ msgstr "Add to Contacts"
 msgid "Unnamed Contact"
 msgstr "Unnamed 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 "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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -709,6 +880,11 @@ msgstr "C_ategory:"
 msgid "_Find"
 msgstr "_Find"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Search"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -746,9 +922,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -769,7 +944,6 @@ msgid "Birthday:"
 msgstr "Birthday:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendar:"
 
@@ -782,7 +956,7 @@ msgid "Company:"
 msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -790,7 +964,7 @@ msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -882,8 +1056,8 @@ msgstr "Web Log:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -906,39 +1080,23 @@ msgstr "_File under:"
 msgid "_Where:"
 msgstr "_Where:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -1910,80 +2068,99 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2434
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2637
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1991,11 +2168,11 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2665
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2003,12 +2180,7 @@ msgstr ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/contact-editor/e-contact-editor.c:2752
-msgid "_Discard"
-msgstr "_Discard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2747
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2016,28 +2188,6 @@ msgstr ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2055,6 +2205,22 @@ msgstr "_Full Name:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
@@ -2210,16 +2376,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Book"
 
@@ -2280,411 +2446,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "map"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "List Members"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organization"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "work"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Job Title"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Home page"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Other error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(none)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primary Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Contact Info"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and one other contact."
-msgstr[1] "and one other contact."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "No contacts"
@@ -2698,9 +2459,9 @@ msgstr[1] "%d contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Query"
 
@@ -2716,129 +2477,129 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Go to Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Search for Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Address Book Sources..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot Settings..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Print Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Current View"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Any Category"
@@ -2872,6 +2633,8 @@ msgid "Car Phone"
 msgstr "Car Phone"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categories"
 
@@ -2879,6 +2642,21 @@ msgstr "Categories"
 msgid "Company Phone"
 msgstr "Company Phone"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Family Name"
@@ -2915,14 +2693,29 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Manager"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Note"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Office"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organization"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Other Fax"
@@ -2974,29 +2767,21 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Width"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Height"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Has Focus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
@@ -3013,7 +2798,11 @@ msgstr "Text Model"
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3027,7 +2816,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3037,13 +2826,386 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "map"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "List Members"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "work"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Job Title"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Home page"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Other error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Select target addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(none)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primary Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Select an Action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Create a new contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Add address to existing contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Edit Contact Info"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Merge E-Mail Address"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and one other contact."
+msgstr[1] "and one other contact."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3053,17 +3215,17 @@ msgstr "Card View"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow Test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
@@ -3087,6 +3249,11 @@ msgstr "Evolution VCard importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Print contacts"
@@ -3096,11 +3263,6 @@ msgstr "Print contacts"
 msgid "Print contact"
 msgstr "Print contact"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3285,6 +3447,20 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -3341,20 +3517,6 @@ msgstr "In normal mode, there should not need size option."
 msgid "Impossible internal error."
 msgstr "Impossible internal error."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "failed to open book"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
@@ -3371,6 +3533,278 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Don't delete"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Send To:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Are you sure you want to delete this account?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Appointment"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Do you wish to save your changes?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  You have made changes. Forget those changes and update the editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Discard Changes"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Save Message"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importer"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3381,29 +3815,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Could not start wombat server"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Could not start wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Could not start wombat server"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starting:"
@@ -3501,10 +3999,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
@@ -3645,8 +4139,28 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Unmatched"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3668,8 +4182,8 @@ msgid "Purge events older than"
 msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "days"
 
@@ -3679,12 +4193,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3732,64 +4242,52 @@ msgstr "Unable to open the calendar '%s' for creating events and meetings"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Events cannot be created in a read-only calendar. Please select a read-write "
-"calendar."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "C_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3819,26 +4317,6 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Unmatched"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
@@ -3856,213 +4334,133 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Audio Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Message Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Email Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Program Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Unknown Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarm Repeat"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Message to Display:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Message to Send"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Play sound:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repeat the alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Run program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Send To:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "With these arguments:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alerts</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "extra times every"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Task List Options</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "hours"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Add Calendar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_dd"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Compose a message"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Basics"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Date/Time:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Messages"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Reminders"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Run a program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send To:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send an email"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Address:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Run program:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repeat the alarm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Send"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "after"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "before"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "day(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "end of appointment"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "extra times every"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hour(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "hours"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "You must specify a location to get the calendar from."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "The source location '%s' is not well-formed."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "The source location '%s' is not a webcal source."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Source with name '%s' already exists in the selected group"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Add Tasks Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Add Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Action/Trigger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_dd"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weeks"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm on %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4171,7 +4569,7 @@ msgid "Free/Busy Publishing"
 msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Friday"
@@ -4185,7 +4583,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Monday"
@@ -4195,7 +4593,7 @@ msgid "S_un"
 msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Saturday"
@@ -4209,7 +4607,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunday"
@@ -4223,7 +4621,7 @@ msgid "T_hu"
 msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thursday"
@@ -4237,7 +4635,7 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tuesday"
@@ -4247,7 +4645,7 @@ msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Wednesday"
@@ -4280,7 +4678,8 @@ msgstr "_Compress weekends in month view"
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4330,6 +4729,74 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "You must specify a location to get the calendar from."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "The source location '%s' is not well-formed."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "The source location '%s' is not a webcal source."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Source with name '%s' already exists in the selected group"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Add Tasks Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Add Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "weeks"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
@@ -4374,79 +4841,73 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " to "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Save as..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Could not open source"
@@ -4508,8 +4969,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Addressbook..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contacts"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4519,132 +4981,193 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Reminder"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientation"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Meeting"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "end of appointment"
+msgstr[1] "end of appointment"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "A_ll day event"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "before every appointment"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "B_usy"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "before every appointment"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "before every appointment"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Task List</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classification"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Time</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidential"
+msgid "A_ll day event"
+msgstr "A_ll day event"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Date & Time"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Save Custom View..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_ocation:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vate"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classification"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidential"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Show Time As"
+msgid "L_ocation:"
+msgstr "L_ocation:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Private"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Public"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Show Time As"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Clear"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Description:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_End time:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4653,32 +5176,26 @@ msgstr "_Start time:"
 msgid "None"
 msgstr "None"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "The organizer selected no longer has an account."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "An organizer is required."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegate To..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2585 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Remove"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4723,28 +5240,39 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Add A_ttendee"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alerts</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Add attendees from addressbook."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Other</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Change Organizer"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizer:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contacts"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizer:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4812,146 +5340,137 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "second"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Date/Time"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Every"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Exceptions"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Preview"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Recurrence Rule"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Custom recurrence"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modify"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Preview</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_No recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Recurrence"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Every"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Edit appointment"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "forever"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "month(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "until"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "week(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Select destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Task List"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Message Fonts</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Complete"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alerts</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4965,8 +5484,8 @@ msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In Progress"
@@ -4978,22 +5497,22 @@ msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progress"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percent Complete: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5016,36 +5535,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Task"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Assignment"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Options</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Delete Mail</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Folder:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
@@ -5054,52 +5579,58 @@ msgstr "Sta_rt date:"
 msgid "_Due date:"
 msgstr "_Due date:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Authentication Credentials for HTTP Server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Group"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendars selected for publishing"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Calendar options</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Daily"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publishing Frequency"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Free/Busy Editor"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Free/Busy Publishing Location"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
+msgstr "Free/Busy Editor"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Login name:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Daily"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Password:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Mail"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publishing Frequency"
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Remember password"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "User_name:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "User Publishes"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Weekly"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5181,7 +5712,7 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -5190,6 +5721,11 @@ msgstr "Click to open %s"
 msgid "Untitled"
 msgstr "Untitled"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Summary:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5213,20 +5749,93 @@ msgstr "Priority:"
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Start Date"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Summary"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Free"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Busy"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Yes"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Assigned"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5272,15 +5881,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
@@ -5291,7 +5891,7 @@ msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -5301,7 +5901,7 @@ msgstr "Open _Web Page"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
@@ -5324,7 +5924,7 @@ msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5355,12 +5955,27 @@ msgstr "_Mark as Complete"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Delete"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Save as..."
+
 #: calendar/gui/e-calendar-table.c:1350
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
 
@@ -5369,33 +5984,28 @@ msgstr "Click to add a task"
 msgid "% Complete"
 msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
 #: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Completion date"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Due date"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Priority"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Start date"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Task sort"
 
@@ -5471,95 +6081,13 @@ msgstr "_Go to Date..."
 msgid "_Settings..."
 msgstr "_Settings..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "End Date"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Start Date"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1704 camel/camel-gpg-context.c:1755
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Recurring"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Assigned"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Yes"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5576,43 +6104,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5704,6 +6225,7 @@ msgstr "iCalendar Error"
 msgid "An unknown person"
 msgstr "An unknown person"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -5745,7 +6267,7 @@ msgstr "Update"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5962,51 +6484,35 @@ msgstr "The attachment has no viewable calendar items"
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "There was an error on the CORBA system\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Object could not be found\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "You don't have the right permissions to update the calendar\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6035,6 +6541,10 @@ msgstr "Loading Calendar"
 msgid "Loading calendar..."
 msgstr "Loading calendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizer:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Message:"
@@ -6118,6 +6628,28 @@ msgstr "Delegated"
 msgid "In Process"
 msgstr "In Process"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
@@ -6126,92 +6658,51 @@ msgstr "Out of Office"
 msgid "No Information"
 msgstr "No Information"
 
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "Add attendees from addressbook"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Options"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "_Required people"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Meeting _start time:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Meeting _end time:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6230,9 +6721,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -6249,15 +6738,6 @@ msgstr "Deleting selected objects..."
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tasks"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Updating query"
@@ -6281,55 +6761,6 @@ msgstr "Opening %s"
 msgid "Purging"
 msgstr "Purging"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6675,10 +7106,6 @@ msgstr "Selected month (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Selected year (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Task"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6709,7 +7136,7 @@ msgid "Contacts: "
 msgstr "Contacts: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -6737,7 +7164,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6757,35 +7184,28 @@ msgstr "Unable to open the task list '%s' for creating events and meetings"
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Events cannot be created in a read-only calendar. Please select a read-write "
-"calendar."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
@@ -8546,41 +8966,6 @@ msgstr "Invalid arguments to (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Unsupported operation: append message: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Unsupported operation: search by expression: for %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Unsupported operation: search by uids: for %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Moving messages"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copying messages"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Learning junk"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtering new message(s)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8624,6 +9009,41 @@ msgstr "(match-threads) requires the folder set"
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Unsupported operation: append message: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Unsupported operation: search by expression: for %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Unsupported operation: search by uids: for %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Moving messages"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copying messages"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Learning junk"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Learning non-junk"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtering new message(s)"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8653,8 +9073,8 @@ msgstr ""
 "user: \"%s\""
 
 #: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
@@ -8694,16 +9114,16 @@ msgstr "Failed to GPG %s: %s\n"
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
-#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
-#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
-#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
@@ -8711,54 +9131,34 @@ msgstr "Failed to execute gpg."
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1416
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1507
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Could not create lock file for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timed out trying to get lock file on %s. Try again later."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Failed to get lock using fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Failed to get lock using flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8779,6 +9179,26 @@ msgstr "Could not lock '%s': protocol error with lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Could not create lock file for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Timed out trying to get lock file on %s. Try again later."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Failed to get lock using fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Failed to get lock using flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9032,7 +9452,7 @@ msgstr "The referenced credentials have expired."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9116,55 +9536,55 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Failure in name lookup: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Host lookup failed: cannot create thread: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Host lookup failed: %s: host not found"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Host lookup failed: %s: unknown reason"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Resolving address"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Host lookup failed: host not found"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Host lookup failed: unknown reason"
 
@@ -9236,7 +9656,7 @@ msgstr "Cannot add encryption certificate"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Cannot add CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
@@ -9317,7 +9737,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Certificate only message, certificates imported and verified"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Can't find signature digests"
 
 #: camel/camel-smime-context.c:651
@@ -9330,47 +9751,51 @@ msgid "Decoder failed"
 msgstr "Decoder failed"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Cannot find certificate for '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Can't find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Can't allocate slot for encryption bulk key"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "Cannot create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Cannot create CMS message"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Can't create CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Can't attach CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Can't attach CMS data object"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Can't create CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Can't add CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Can't create encoder context"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
@@ -9415,7 +9840,8 @@ msgstr "Cannot create folder: %s: folder exists"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
@@ -9424,8 +9850,8 @@ msgstr "Cannot rename folder: %s: Invalid operation"
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9637,7 +10063,7 @@ msgstr ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Could not parse URL `%s'"
@@ -9661,7 +10087,7 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
@@ -9680,8 +10106,8 @@ msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Check for new messages in all folders"
 
@@ -9711,8 +10137,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9731,333 +10157,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Failed sending command to IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP4 server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unexpected greeting from IMAP server %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Cannot select folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Cannot select folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Got BYE response"
-
-#: camel/providers/imap4/camel-imap4-folder.c:422
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot sync flags to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:428
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot sync flags to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:563
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot expunge folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:568
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot expunge folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:703
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Cannot get message %s from folder `%s': No such message"
-
-#: camel/providers/imap4/camel-imap4-folder.c:708
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Cannot get message %s from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:833
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to folder `%s': Unknown error"
-
-#: camel/providers/imap4/camel-imap4-folder.c:862
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:941
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:945
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:953
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:957
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Could not connect to %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPlease enter the IMAP password for %s on host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot create folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Cannot rename folder `%s' to `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot subscribe to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected token in response from IMAP server %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "No data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s unexpectedly disconnected: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Unknown error"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10126,7 +10247,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10198,6 +10319,27 @@ msgstr "Use custom command to connect to server"
 msgid "Command:"
 msgstr "Command:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Folders"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Show only subscribed folders"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Override server-supplied folder namespace"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Namespace"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Apply filters to new messages in INBOX on this server"
@@ -10218,43 +10360,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Could not connect to %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL unavailable"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10265,30 +10456,266 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Failed sending command to IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP4 server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Unexpected greeting from IMAP server %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot select folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot select folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 server %s unexpectedly disconnected: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Got BYE response"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Cannot sync flags to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot sync flags to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot expunge folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot expunge folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Cannot get message %s from folder `%s': No such message"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Cannot get message %s from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to folder `%s': Unknown error"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL!!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the IMAP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot create folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Cannot rename folder `%s' to `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Cannot rename folder `%s' to `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot subscribe to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot unsubscribe from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected token in response from IMAP server %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "No data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s unexpectedly disconnected: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10457,18 +10884,26 @@ msgstr "Could not save summary: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Unable to add message to summary: unknown reason"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Inbox"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir append message cancelled"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Cannot append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10484,48 +10919,48 @@ msgstr ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Invalid message contents"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Cannot get folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Cannot get folder `%s': folder does not exist."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Cannot create folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Cannot get folder `%s': not a maildir directory."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Could not delete folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11112,20 +11547,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Could not connect to POP server %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not connect to POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11134,28 +11574,28 @@ msgstr ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login failed for POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Failed to authenticate on POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPlease enter the POP password for %s on host %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11164,7 +11604,16 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
@@ -11376,93 +11825,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail delivery via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Cannot send message: service not connected."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Cannot send message: sender address not valid."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Sending message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Cannot send message: no recipients defined."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Cannot send message: one or more invalid recipients"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Greeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "HELO command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Authentication"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Error creating SASL authentication object."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "AUTH command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Bad authentication response from server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO command failed: %s: mail not sent"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA command failed: %s: mail not sent"
@@ -11470,26 +11919,26 @@ msgstr "DATA command failed: %s: mail not sent"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "DATA command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "RSET command failed"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT command failed: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "QUIT command failed"
 
@@ -11552,72 +12001,6 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Open file"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Compose a message"
-
-#: composer/e-msg-composer.c:4270
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
@@ -11698,17 +12081,90 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Forwarded message - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Attach original message"
+msgstr[1] "Attach original message"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `{0}' to this message."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11728,18 +12184,32 @@ msgstr ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Could not create message."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Unfinished messages found"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11747,31 +12217,31 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Don't Recover"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recover"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Could not save to autosave file \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error saving to autosave because \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Warning: Modified Message"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11780,7 +12250,7 @@ msgstr ""
 "composing?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11790,63 +12260,48 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Discard Changes"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Save Message"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Could not create message."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Because \"{0}\", you may need to select different mail options."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Could not read signature file \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Could not create composer window."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
-#: composer/mail-composer-errors.xml.h:50
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12009,16 +12464,12 @@ msgstr "Sync Categories:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12070,31 +12521,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12171,10 +12614,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12191,7 +12630,6 @@ msgid "Missing file name."
 msgstr "Missing file name."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
@@ -12201,172 +12639,42 @@ msgstr "You must specify a file name."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "File \"{0}\" does not exist or is not a regular file."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Missing folder."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Bad regular expression \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Missing name."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "You must name this vFolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Name \"{0}\" already used."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Please choose another name."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "No sources selected."
-
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"You must specify at least one folder as a source.\n"
-"Select folders individually, select all local folders,\n"
-"select all remote folders, or select all remote and\n"
-"local folders."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Then</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Select Folder"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filter Rules</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder Sources</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Compare against"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Incoming"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "a time relative to the current time"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "ago"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "months"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "seconds"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "specific folders only"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "the current time"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "the time you specify"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "with all active remote folders"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "with all local and active remote folders"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "with all local folders"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "years"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -12430,6 +12738,70 @@ msgstr "incoming"
 msgid "outgoing"
 msgstr "outgoing"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filter Rules</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Compare against"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Incoming"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "a time relative to the current time"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "ago"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "months"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "seconds"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "the current time"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "the time you specify"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "years"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
@@ -12442,58 +12814,70 @@ msgstr "Edit Rule"
 msgid "Rule name"
 msgstr "Rule name"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Score Rules"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Body contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Body does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Body or subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Message contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Recipients contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Sender contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Subject does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtual _Folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Add"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Mail"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder source"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Mail"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12525,45 +12909,352 @@ msgstr "Add signature script"
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Select Folder"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Assign Task"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Assigned"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Attachment"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Body contains"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Copy to Folder"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Received"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Item sent!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Delete"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "File %s does not exist"
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "File %s does not exist"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Body does not contain"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "Could not start wombat"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Date"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Name begins with"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "E_xit"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Text"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Expires"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Follow-Up"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "List"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "after"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "before"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Flagged"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "List"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Flagged"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "June"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s mailing list"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Message to Send"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Message to Send"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Messages"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Mark as _Not Junk"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Move to Folder"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Exit the program"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Play sound:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Recipients contain"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Replies"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "Purge events older than"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Run program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Send"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Status"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Size"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Source Book"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "specific folders only"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Stop Loading"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subject"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "United States"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Then</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Folder properties"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Properties"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Folder Name"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Total messages"
-
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Unread messages"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Total messages"
+msgstr[1] "Total messages"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages"
+msgstr[1] "Unread messages"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12573,8 +13264,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2311
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
@@ -12586,444 +13277,276 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Loading..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2098
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2085 mail/em-folder-tree.c:2098
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2085 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2125
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2311 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2500
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2502
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2573 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2574
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2579
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2583
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2586
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-tree.c:2589 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Mail"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "From"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subject"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13031,7 +13554,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13039,7 +13566,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13047,11 +13578,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13059,7 +13590,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13067,7 +13602,11 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13077,7 +13616,11 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13085,7 +13628,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13095,39 +13642,161 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "From"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
@@ -13237,7 +13906,7 @@ msgstr "Se_nd message to..."
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
@@ -13284,11 +13953,23 @@ msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtual _Folders"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Add"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder source"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
@@ -13759,63 +14440,33 @@ msgstr "port for starting user runned spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13873,34 +14524,6 @@ msgstr "Importing `%s'"
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14070,91 +14693,83 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d unread"
 msgstr[1] ", %d unread"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identity"
@@ -14216,14 +14831,22 @@ msgstr ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connecting to server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Preview</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL is not supported in this build of evolution</b>"
@@ -14476,7 +15099,7 @@ msgstr "Do not quote original message"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
@@ -14814,6 +15437,122 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Please read carefully the licence agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder Sources</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digital Signature</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encryption</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepted"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "C_ompleted"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Case Sensitive"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Find in Message"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Find:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "%s Licence Agreement"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "None Selected"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Security Information"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "List of accepted licences"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Due By:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Flag:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "specific folders only"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "with all active remote folders"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "with all local and active remote folders"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "with all local folders"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14835,6 +15574,7 @@ msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14847,6 +15587,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
+#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
@@ -14861,8 +15602,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Send"
+msgstr "Send"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14879,11 +15621,11 @@ msgstr ""
 "an idea of the topic of your letter."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
+#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -14957,7 +15699,6 @@ msgstr ""
 "folder \"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
@@ -14986,6 +15727,7 @@ msgstr "You have unsent messages, do you wish to quit anyway?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14998,6 +15740,7 @@ msgstr ""
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Your message with the subject \"{0}\" was not delivered."
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
@@ -15030,21 +15773,6 @@ msgstr "Error while performing operation."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15061,8 +15789,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15099,7 +15825,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15133,13 +15858,11 @@ msgstr ""
 "will be deleted permanently."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15150,25 +15873,21 @@ msgid "Because \"{2}\"."
 msgstr "Because \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15184,7 +15903,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Cannot open source \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
@@ -15206,8 +15924,11 @@ msgstr "Delete account?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15215,8 +15936,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Don't delete"
+msgstr "_Undelete"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15245,6 +15967,7 @@ msgstr "Discard changes?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
@@ -15281,6 +16004,7 @@ msgstr "Cannot add vFolder \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 msgid ""
 "The following vFolder(s):\n"
@@ -15300,6 +16024,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 msgid ""
 "The following filter rule(s):\n"
@@ -15314,12 +16039,45 @@ msgstr ""
 "    \"{1}\"\n"
 "And have been updated."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Missing folder."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "You must name this vFolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "No sources selected."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"You must specify at least one folder as a source.\n"
+"Select folders individually, select all local folders,\n"
+"select all remote folders, or select all remote and\n"
+"local folders."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
-#: mail/mail-errors.xml.h:212
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15331,15 +16089,15 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Append"
 
@@ -15500,7 +16258,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15509,45 +16267,21 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Case Sensitive"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Find in Message"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital Signature</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encryption</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Security Information"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelling..."
@@ -15655,15 +16389,15 @@ msgstr "Updating vFolders for '%s:%s'"
 msgid "Updating vFolders for '%s'"
 msgstr "Updating vFolders for '%s'"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -15783,10 +16517,6 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
@@ -15799,49 +16529,49 @@ msgstr "Reply to All"
 msgid "Review"
 msgstr "Review"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Body contains"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Body does not contain"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Body or subject contains"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Message contains"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Recipients contain"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Sender contains"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Subject contains"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Subject does not contain"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15909,30 +16639,19 @@ msgstr "Whether to skip the development warning dialog"
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Authentication</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Execute actions"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16117,23 +16836,6 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution is currently online.  Click on this button to work offline."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution is currently offline.  Click on this button to work online."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16167,10 +16869,88 @@ msgstr "_Work Offline"
 msgid "Work Offline"
 msgstr "Work Offline"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is currently online.  Click on this button to work offline."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is currently offline.  Click on this button to work online."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Uknown system error."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generic error"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "New"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Import Assistant"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "Import File"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "Time _zone:"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "New Test"
@@ -16183,18 +16963,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16253,8 +17021,9 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
-#: shell/main.c:231
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:225
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -16288,7 +17057,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16296,39 +17065,39 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16337,6 +17106,94 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Body contains"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Could not start wombat server"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistant"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16580,6 +17437,11 @@ msgstr "Your Certificates"
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16779,11 +17641,6 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
@@ -16923,8 +17780,8 @@ msgstr "View the current contact"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
@@ -17398,16 +18255,6 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Close"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
@@ -17808,6 +18655,16 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Close"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -17890,10 +18747,6 @@ msgstr "Save the current file with a different name"
 msgid "Save the message in a specified folder"
 msgstr "Save the message in a specified folder"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Send"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18596,3 +19449,178 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Authentication Credentials for HTTP Server"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendars selected for publishing"
+
+#~ msgid "Login name:"
+#~ msgstr "Login name:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "User Publishes"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Events cannot be created in a read-only calendar. Please select a read-"
+#~ "write calendar."
+
+#~ msgid "C_alendar"
+#~ msgstr "C_alendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Audio Alarm Options"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Message Alarm Options"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Email Alarm Options"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Program Alarm Options"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Unknown Alarm Options"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarm Repeat"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Message to Display:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "With these arguments:"
+
+#~ msgid "Basics"
+#~ msgstr "Basics"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Date/Time:"
+
+#~ msgid "Reminders"
+#~ msgstr "Reminders"
+
+#~ msgid "_Options..."
+#~ msgstr "_Options..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Addressbook..."
+
+#~ msgid "Reminder"
+#~ msgstr "Reminder"
+
+#~ msgid "B_usy"
+#~ msgstr "B_usy"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidential"
+
+#~ msgid "Date & Time"
+#~ msgstr "Date & Time"
+
+#~ msgid "F_ree"
+#~ msgstr "F_ree"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vate"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Add A_ttendee"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Add attendees from addressbook."
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Recurrence Rule"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Custom recurrence"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modify"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_No recurrence"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Simple recurrence"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Complete"
+
+#~ msgid "Progress"
+#~ msgstr "Progress"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidential"
+
+#~ msgid "Folder:"
+#~ msgstr "Folder:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "There was an error on the CORBA system\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Object could not be found\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "You don't have the right permissions to update the calendar\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Attendee status could not be updated!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Add attendees from addressbook"
+
+#~ msgid "_Options"
+#~ msgstr "_Options"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Meeting _start time:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Meeting _end time:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Events cannot be created in a read-only calendar. Please select a read-"
+#~ "write calendar."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Can't find certificate for `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Cannot create CMS Message"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Can't create encoder context"
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Score Rules"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+
+#~ msgid "Properties"
+#~ msgstr "Properties"
+
+#~ msgid "Folder Name"
+#~ msgstr "Folder Name"
diff --git a/po/en_GB.po b/po/en_GB.po
index 7baef3a42f..73537c3f0a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-14 18:45-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-14 18:47-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "current addressbook folder "
@@ -49,34 +41,257 @@ msgstr " cards"
 msgid " card"
 msgstr " card"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "The item could not be sent!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Failed to authenticate with LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "The server responded with no supported search bases"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "This server does not support LDAPv3 schema information"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Could not get article %s from NNTP server"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Server did not respond with valid schema information"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Could not load addressbook"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Category editor not available."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Save in addressbook"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Error loading default addressbook."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Unable to process spool folder"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Do you wish to save your changes?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Discard"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "and %d other contact."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Unable to parse message content"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Error adding contact"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Addressbook address viewer"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Could not load addressbook"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletion"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Manage your S/MIME certificates here"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -107,7 +322,8 @@ msgid "New Contacts Group"
 msgstr "New Contacts Group"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Contacts Group"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -132,8 +348,8 @@ msgstr "Migrating `%s':"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -201,36 +417,45 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Properties..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -252,58 +477,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Manage your S/MIME certificates here"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -311,7 +484,7 @@ msgstr "Manage your S/MIME certificates here"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -320,7 +493,7 @@ msgstr "Manage your S/MIME certificates here"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -346,6 +519,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentication</b>"
 
@@ -387,13 +561,11 @@ msgid "Anonymously"
 msgstr "Anonymously"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Basic"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -625,33 +797,26 @@ msgid "cards"
 msgstr "cards"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Select Contacts from Address Book"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Addressbook name selection interface"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Remove All"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remove"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "View Contact List"
@@ -666,7 +831,7 @@ msgid "Send HTML Mail?"
 msgstr "Send HTML Mail?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Add to Contacts"
 
@@ -674,15 +839,22 @@ msgstr "Add to Contacts"
 msgid "Unnamed Contact"
 msgstr "Unnamed 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 "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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Select Contacts from Address Book"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -704,6 +876,11 @@ msgstr "C_ategory:"
 msgid "_Find"
 msgstr "_Find"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Search"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -741,7 +918,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -763,7 +940,6 @@ msgid "Birthday:"
 msgstr "Birthday:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendar:"
 
@@ -776,7 +952,7 @@ msgid "Company:"
 msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -784,7 +960,7 @@ msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -876,8 +1052,8 @@ msgstr "Web Log:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -900,22 +1076,6 @@ msgstr "_File under:"
 msgid "_Where:"
 msgstr "_Where:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -923,16 +1083,16 @@ msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -1904,77 +2064,99 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Other"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2434
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2637
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1982,11 +2164,11 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2665
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -1994,12 +2176,7 @@ msgstr ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/contact-editor/e-contact-editor.c:2752
-msgid "_Discard"
-msgstr "_Discard"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2747
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2007,28 +2184,6 @@ msgstr ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2046,6 +2201,22 @@ msgstr "_Full Name:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
@@ -2201,16 +2372,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialogue1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Book"
 
@@ -2271,406 +2442,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "map"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:526
-msgid "List Members"
-msgstr "List Members"
-
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: addressbook/gui/widgets/eab-contact-display.c:348
-#: addressbook/gui/widgets/eab-contact-display.c:363
-msgid "Phone"
-msgstr "Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:349
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:353
-msgid "work"
-msgstr "work"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:361
-#: addressbook/gui/widgets/eab-contact-display.c:580
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:368
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/eab-contact-display.c:541
-msgid "Job Title"
-msgstr "Job Title"
-
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Home page"
-msgstr "Home page"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Address Book does not exist"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "No Self Contact defined"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS not Available"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Other error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "The backend for this addressbook was unable to parse this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "The backend for this addressbook refused to perform this query."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(none)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primary Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Contact Info"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and %d other contact."
-msgstr[1] "and %d other contacts."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "No contacts"
@@ -2684,9 +2455,9 @@ msgstr[1] "%d contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Query"
 
@@ -2702,129 +2473,129 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Go to Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Search for Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Address Book Sources..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot Settings..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Print Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Current View"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Any Category"
@@ -2858,6 +2629,8 @@ msgid "Car Phone"
 msgstr "Car Phone"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categories"
 
@@ -2865,6 +2638,21 @@ msgstr "Categories"
 msgid "Company Phone"
 msgstr "Company Phone"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Surname"
@@ -2901,14 +2689,29 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Manager"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Note"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Office"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisation"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Other Fax"
@@ -2960,29 +2763,21 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Width"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Height"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Has Focus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
@@ -2999,7 +2794,11 @@ msgstr "Text Model"
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3013,7 +2812,7 @@ msgstr ""
 "\n"
 "Double-click here to create a new Contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3023,13 +2822,386 @@ msgstr ""
 "\n"
 "There are no items to show in this view."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "map"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "List Members"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "work"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Job Title"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Home page"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Address Book does not exist"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "No Self Contact defined"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS not Available"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Other error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "The backend for this addressbook was unable to parse this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "The backend for this addressbook refused to perform this query."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "This query did not complete successfully."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Select target addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(none)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primary Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Select an Action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Create a new contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Add address to existing contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Edit Contact Info"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Merge E-Mail Address"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and %d other contact."
+msgstr[1] "and %d other contacts."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3073,6 +3245,11 @@ msgstr "Evolution VCard importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Print contacts"
@@ -3082,11 +3259,6 @@ msgstr "Print contacts"
 msgid "Print contact"
 msgstr "Print contact"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3271,6 +3443,20 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Couldn't get list of addressbooks"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "failed to open book"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -3327,20 +3513,6 @@ msgstr "In normal mode, there should not need size option."
 msgid "Impossible internal error."
 msgstr "Impossible internal error."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Couldn't get list of addressbooks"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "failed to open book"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
@@ -3357,6 +3529,269 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Don't delete"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Send To:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Are you sure you want to cancel and delete this meeting?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Are you sure you want to delete %d task?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Are you sure you want to cancel and delete this journal entry?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Are you sure you want to delete %d journal entry?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Are you sure you want to delete the appointment `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Are you sure you want to delete %d appointment?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Are you sure you want to delete the task `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Are you sure you want to delete the journal entry `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Are you sure you want to delete the appointment `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Are you sure you want to delete the task `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Are you sure you want to delete the journal entry `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Appointment"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Do you wish to save your changes?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  You have made changes. Forget those changes and update the editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Discard Changes"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Save Message"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3367,29 +3802,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Split Multi-Day Events:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Could not start wombat server"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Could not start wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Could not start wombat server"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Could not read pilot's Calendar application block"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Default Priority:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starting:"
@@ -3487,10 +3986,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
@@ -3631,8 +4126,28 @@ msgstr "Whether to show times in 24h format instead of using am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Unmatched"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3654,8 +4169,8 @@ msgid "Purge events older than"
 msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "days"
 
@@ -3666,7 +4181,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3714,64 +4229,52 @@ msgstr "Unable to open the calendar '%s' for creating events and meetings"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "C_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3801,26 +4304,6 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Unmatched"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
@@ -3838,213 +4321,133 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Audio Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Message Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Email Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Program Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Unknown Alarm Options"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarm Repeat"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Message to Display:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Message to Send"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Play sound:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repeat the alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Run program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Send To:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "With these arguments:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alerts</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "extra times every"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Task List Options</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "hours"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Add Calendar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_dd"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Compose a message"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Basics"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Date/Time:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Messages"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Pop up an alert"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Reminders"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Run a program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send To:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send an email"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Account:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Run Program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repeat the alarm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Send"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "after"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "before"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "day(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "end of appointment"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "extra times every"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hour(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "hours"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "You must specify a location to get the calendar from."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "The source location '%s' is not well-formed."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "The source location '%s' is not a webcal source."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Source with name '%s' already exists in the selected group"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "_Tasks Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Add Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refresh:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Action/Trigger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_dd"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weeks"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm on %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4153,7 +4556,7 @@ msgid "Free/Busy Publishing"
 msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Friday"
@@ -4167,7 +4570,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Monday"
@@ -4177,7 +4580,7 @@ msgid "S_un"
 msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Saturday"
@@ -4191,7 +4594,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunday"
@@ -4205,7 +4608,7 @@ msgid "T_hu"
 msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thursday"
@@ -4219,7 +4622,7 @@ msgid "Time format:"
 msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tuesday"
@@ -4229,7 +4632,7 @@ msgid "W_eek starts:"
 msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Wednesday"
@@ -4262,7 +4665,8 @@ msgstr "_Compress weekends in month view"
 msgid "_Day begins:"
 msgstr "_Day begins:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4312,6 +4716,74 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "You must specify a location to get the calendar from."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "The source location '%s' is not well-formed."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "The source location '%s' is not a webcal source."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Source with name '%s' already exists in the selected group"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "_Tasks Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olour:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pick a colour"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Add Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Refresh:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "weeks"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
@@ -4356,79 +4828,73 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " to "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Could not update object"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Edit Appointment"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Appointment - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Task - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journal entry - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "No summary"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Save as..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Changes made to this item may be discarded if an update arrives"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Could not open source"
@@ -4490,8 +4956,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Addressbook..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contacts"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4501,127 +4968,193 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Reminder"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientation"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Meeting"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Event with no start date"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Event with no end date"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Start date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "End date is wrong"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Start time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "End time is wrong"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Unable to open the calendar '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "end of appointment"
+msgstr[1] "end of appointment"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "before every appointment"
+msgstr[1] "before every appointment"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "A_ll day event"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "before every appointment"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "B_usy"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "before every appointment"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegories..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "before every appointment"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Task List</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classification"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Time</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidential"
+msgid "A_ll day event"
+msgstr "A_ll day event"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Date & Time"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Save Custom View..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegories..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_ocation:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vate"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classification"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidential"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Show Time As"
+msgid "L_ocation:"
+msgstr "L_ocation:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Private"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Public"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Show Time As"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Su_mmary:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Clear"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Description:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_End time:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4630,32 +5163,26 @@ msgstr "_Start time:"
 msgid "None"
 msgstr "None"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "The organiser selected no longer has an account."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "An organiser is required."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "At least one attendee is required."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegate To..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Remove"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4700,28 +5227,39 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Add A_ttendee"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alerts</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Add attendees from addressbook."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Other</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Change Organiser"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organiser:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contacts"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Change Organiser"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organiser:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4789,146 +5327,137 @@ msgstr "This and Future Instances"
 msgid "All Instances"
 msgstr "All Instances"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "This appointment contains recurrences that Evolution cannot edit."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Recurrence date is invalid"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "on"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "first"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "second"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "third"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "fourth"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "last"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Other Date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "day"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "on the"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Date/Time"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Every"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Exceptions"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Preview"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Recurrence Rule"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Custom recurrence"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modify"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Preview</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_No recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Recurrence"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Every"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Edit appointment"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "forever"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "month(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "until"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "week(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Select destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Task List"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Message Fonts</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Complete"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alerts</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4942,8 +5471,8 @@ msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In Progress"
@@ -4955,22 +5484,22 @@ msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progress"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percent Complete: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4993,36 +5522,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Web Page:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Task"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Assignment"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Due date is wrong"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Unable to open tasks in '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Options</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Delete Mail</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Folder:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Sta_rt date:"
@@ -5031,52 +5566,58 @@ msgstr "Sta_rt date:"
 msgid "_Due date:"
 msgstr "_Due date:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Authentication Credentials for HTTP Server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Group:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendars selected for publishing"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Calendar options</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Daily"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publishing Frequency"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Free/Busy Editor"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Free/Busy Publishing Location"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
+msgstr "Free/Busy Editor"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Login name:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Daily"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Password:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Mail"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publishing Frequency"
+#, fuzzy
+msgid "_Password:"
+msgstr "Password:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Remember password"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "User_name:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "User Publishes"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Weekly"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5158,7 +5699,7 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
@@ -5167,6 +5708,11 @@ msgstr "Click to open %s"
 msgid "Untitled"
 msgstr "Untitled"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Summary:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5190,20 +5736,93 @@ msgstr "Priority:"
 msgid "Web Page:"
 msgstr "Web Page:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "End Date"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Start Date"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Summary"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Free"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Busy"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Yes"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Unknown"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Assigned"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5249,15 +5868,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
@@ -5268,7 +5878,7 @@ msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
 
@@ -5278,7 +5888,7 @@ msgstr "Open _Web Page"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
@@ -5301,7 +5911,7 @@ msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5332,12 +5942,27 @@ msgstr "_Mark as Complete"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Mark Selected Tasks as Complete"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Delete"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Delete Selected Tasks"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Save as..."
+
 #: calendar/gui/e-calendar-table.c:1350
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Click to add a task"
 
@@ -5346,33 +5971,28 @@ msgstr "Click to add a task"
 msgid "% Complete"
 msgstr "% Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
 #: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Complete"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Completion date"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Due date"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Priority"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Start date"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Task sort"
 
@@ -5448,80 +6068,6 @@ msgstr "_Go to Date..."
 msgid "_Settings..."
 msgstr "_Settings..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "End Date"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Start Date"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1704 camel/camel-gpg-context.c:1755
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Recurring"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Assigned"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Yes"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5545,36 +6091,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5708,7 +6254,7 @@ msgstr "Update"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5925,51 +6471,35 @@ msgstr "The attachment has no viewable calendar items"
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Attendee status can not be updated because the item no longer exists"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "There was an error on the CORBA system\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Object could not be found\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "You don't have the right permissions to update the calendar\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -5998,6 +6528,10 @@ msgstr "Loading Calendar"
 msgid "Loading calendar..."
 msgstr "Loading calendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organiser:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Message:"
@@ -6081,6 +6615,28 @@ msgstr "Delegated"
 msgid "In Process"
 msgstr "In Process"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
@@ -6089,84 +6645,51 @@ msgstr "Out of Office"
 msgid "No Information"
 msgstr "No Information"
 
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "Add attendees from addressbook"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Options"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Show _only working hours"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Show _zoomed out"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Update free/busy"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_All people and resources"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "All _people and one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "_Required people"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Required people and _one resource"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Meeting _start time:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Meeting _end time:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6185,9 +6708,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
@@ -6204,15 +6725,6 @@ msgstr "Deleting selected objects..."
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tasks"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Updating query"
@@ -6236,55 +6748,6 @@ msgstr "Opening %s"
 msgid "Purging"
 msgstr "Purging"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6630,10 +7093,6 @@ msgstr "Selected month (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Selected year (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Task"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6664,7 +7123,7 @@ msgid "Contacts: "
 msgstr "Contacts: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -6692,7 +7151,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6712,35 +7171,28 @@ msgstr "Unable to open the task list '%s' for creating events and meetings"
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
@@ -8501,41 +8953,6 @@ msgstr "Invalid arguments to (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Unsupported operation: append message: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Unsupported operation: search by expression: for %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Unsupported operation: search by uids: for %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Moving messages"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copying messages"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Learning junk"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Learning non-junk"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtering new message(s)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8579,6 +8996,41 @@ msgstr "(match-threads) requires the folder set"
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Unsupported operation: append message: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Unsupported operation: search by expression: for %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Unsupported operation: search by uids: for %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Moving messages"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copying messages"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Learning junk"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Learning non-junk"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtering new message(s)"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8608,8 +9060,8 @@ msgstr ""
 "user: \"%s\""
 
 #: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
@@ -8649,16 +9101,16 @@ msgstr "Failed to GPG %s: %s\n"
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
-#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
-#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
-#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Failed to execute gpg."
 
@@ -8666,54 +9118,34 @@ msgstr "Failed to execute gpg."
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1416
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1507
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Could not create lock file for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Timed out trying to get lock file on %s. Try again later."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Failed to get lock using fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Failed to get lock using flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8734,6 +9166,26 @@ msgstr "Could not lock '%s': protocol error with lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Could not lock '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Could not create lock file for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Timed out trying to get lock file on %s. Try again later."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Failed to get lock using fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Failed to get lock using flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8987,7 +9439,7 @@ msgstr "The referenced credentials have expired."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9071,55 +9523,55 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regular expression compilation failed: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' needs a username component"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' needs a host component"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' needs a path component"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Failure in name lookup: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Host lookup failed: cannot create thread: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Host lookup failed: %s: host not found"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Host lookup failed: %s: unknown reason"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Resolving address"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Host lookup failed: host not found"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Host lookup failed: unknown reason"
 
@@ -9191,7 +9643,7 @@ msgstr "Cannot add encryption certificate"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Cannot add CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Cannot create encoder context"
 
@@ -9272,7 +9724,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Certificate only message, certificates imported and verified"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Can't find signature digests"
 
 #: camel/camel-smime-context.c:651
@@ -9285,47 +9738,51 @@ msgid "Decoder failed"
 msgstr "Decoder failed"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Cannot find certificate for '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Can't find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Can't allocate slot for encryption bulk key"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Cannot create CMS message"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Can't create CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Can't attach CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Can't attach CMS data object"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Can't create CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Can't add CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Can't create encoder context"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
@@ -9370,7 +9827,8 @@ msgstr "Cannot create folder: %s: folder exists"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
@@ -9379,8 +9837,8 @@ msgstr "Cannot rename folder: %s: Invalid operation"
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9616,7 +10074,7 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
@@ -9635,8 +10093,8 @@ msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Check for new messages in all folders"
 
@@ -9666,8 +10124,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9686,333 +10144,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Failed sending command to IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Unexpected response from IMAP4 server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Unexpected greeting from IMAP server %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Cannot select folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Cannot select folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 server %s unexpectedly disconnected: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Got BYE response"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Cannot sync flags to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Cannot sync flags to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Cannot expunge folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Cannot expunge folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:748
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Cannot get message %s from folder `%s': No such message"
-
-#: camel/providers/imap4/camel-imap4-folder.c:753
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Cannot get message %s from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:878
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Cannot append message to folder `%s': Unknown error"
-
-#: camel/providers/imap4/camel-imap4-folder.c:907
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Cannot append message to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:986
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:990
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-
-#: camel/providers/imap4/camel-imap4-folder.c:998
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1002
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Could not connect to %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Failed to connect to IMAP server %s in secure mode: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPlease enter the IMAP password for %s on host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Cannot authenticate to IMAP server %s using %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Cannot create folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Cannot create folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Cannot delete folder `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Cannot delete folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Cannot delete folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Cannot rename folder `%s' to `%s': Special folder"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Cannot rename folder `%s' to `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Cannot subscribe to folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Cannot unsubscribe from folder `%s': Bad command"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Unexpected token in response from IMAP server %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "No data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP server %s unexpectedly disconnected: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Unknown error"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10081,7 +10234,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10153,6 +10306,27 @@ msgstr "Use custom command to connect to server"
 msgid "Command:"
 msgstr "Command:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Folders"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Show only subscribed folders"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Override server-supplied folder namespace"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Namespace"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Apply filters to new messages in INBOX on this server"
@@ -10173,43 +10347,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP service for %s on %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Could not connect to %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL unavailable"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Failed to connect to IMAP server %s in secure mode: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10220,30 +10443,266 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Failed sending command to IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP4 server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Unexpected greeting from IMAP server %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot select folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot select folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 server %s unexpectedly disconnected: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Got BYE response"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Cannot sync flags to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot sync flags to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot expunge folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot expunge folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Cannot get message %s from folder `%s': No such message"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Cannot get message %s from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to folder `%s': Unknown error"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot move messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the IMAP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot create folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Cannot rename folder `%s' to `%s': Special folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Cannot rename folder `%s' to `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot subscribe to folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot unsubscribe from folder `%s': Bad command"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected token in response from IMAP server %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "No data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP server %s unexpectedly disconnected: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10412,18 +10871,26 @@ msgstr "Could not save summary: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Unable to add message to summary: unknown reason"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Inbox"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir append message cancelled"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Cannot append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10439,48 +10906,48 @@ msgstr ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Invalid message contents"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Cannot get folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Cannot get folder `%s': folder does not exist."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Cannot create folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Cannot get folder `%s': not a maildir directory."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Could not delete folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11067,20 +11534,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Could not connect to POP server %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Failed to connect to POP server %s in secure mode: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Could not connect to POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11089,28 +11561,28 @@ msgstr ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Login failed for POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Cannot login to POP server %s: SASL Protocol error"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Failed to authenticate on POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPlease enter the POP password for %s on host %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11119,7 +11591,16 @@ msgstr ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No such folder `%s'."
@@ -11507,72 +11988,6 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Open file"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signature:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3208
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3100
-#: composer/e-msg-composer.c:3101
-msgid "Compose a message"
-msgstr "Compose a message"
-
-#: composer/e-msg-composer.c:4254
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
@@ -11653,16 +12068,90 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Forwarded message - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Attach original message"
+msgstr[1] "Attach original message"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `{0}' to this message."
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11682,18 +12171,32 @@ msgstr ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Could not create message."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Unfinished messages found"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Do you want to recover unfinished messages?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11701,31 +12204,31 @@ msgstr ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Don't Recover"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recover"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Could not save to autosave file \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error saving to autosave because \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Warning: Modified Message"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11734,7 +12237,7 @@ msgstr ""
 "composing?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11744,59 +12247,48 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Discard Changes"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Save Message"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Could not create message."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Because \"{0}\", you may need to select different mail options."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Could not read signature file \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "All accounts have been removed."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "You need to configure an account before you can compose mail."
 
 #. mail-composer:no-address-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Could not create composer window."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Unable to activate the address selector control."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12109,10 +12601,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Select a time to compare against"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Filter Rules"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12138,171 +12626,42 @@ msgstr "You must specify a file name."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "File \"{0}\" does not exist or is not a regular file."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Missing folder."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Bad regular expression \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Missing name."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "You must name this vFolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Name \"{0}\" already used."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Please choose another name."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "No sources selected."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Choose a file"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Then</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Select Folder"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filter Rules</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder Sources</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Compare against"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Incoming"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "a time relative to the current time"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "ago"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "months"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "seconds"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "specific folders only"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "the current time"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "the time you specify"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "with all active remote folders"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "with all local and active remote folders"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "with all local folders"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "years"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -12366,6 +12725,70 @@ msgstr "incoming"
 msgid "outgoing"
 msgstr "outgoing"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filter Rules</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Compare against"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Incoming"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "a time relative to the current time"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "ago"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "months"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "seconds"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "the current time"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "the time you specify"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "years"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
@@ -12378,58 +12801,70 @@ msgstr "Edit Rule"
 msgid "Rule name"
 msgstr "Rule name"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Score Rules"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Body contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Body does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Body or subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Message contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Recipients contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Sender contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Subject does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtual _Folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Add"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Mail"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder source"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Mail"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12465,41 +12900,301 @@ msgstr "Signature(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1501
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1511
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filter Rules"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Select Folder"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Adjust Score"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Assign Colour"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Assign Score"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Attachments"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Beep"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contains"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copy to Folder"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Date received"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Date sent"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Deleted"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "does not contain"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "does not end with"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "does not exist"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "does not return"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "does not sound like"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "does not start with"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Do Not Exist"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Draft"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "ends with"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Exist"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "exists"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expression"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Follow Up"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "is"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "is after"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "is before"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "is Flagged"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "is greater than"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "is less than"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "is not"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "is not Flagged"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Junk Test"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Mailing list"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Message Body"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Message Header"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Message is Junk"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Message is not Junk"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Move to Folder"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Pipe to Program"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Play Sound"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Recipients"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regex Match"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Replied to"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "returns"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "returns greater than"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "returns less than"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Run Program"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Sender"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Set Status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Size (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "sounds like"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Source Account"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Specific header"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "starts with"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Stop Processing"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subject"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Unset Status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Then</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Folder properties"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Properties"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Folder Name"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Total messages"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Total messages"
+msgstr[1] "Total messages"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Unread messages"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Unread messages"
+msgstr[1] "Unread messages"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12509,8 +13204,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
@@ -12522,444 +13217,276 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Loading..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Move..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Properties"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Mail"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_k as Read"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Mark as _Junk"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "From"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subject"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Valid signature but cannot verify sender"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12967,7 +13494,11 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12975,7 +13506,11 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12983,11 +13518,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12995,7 +13530,11 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13003,7 +13542,11 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13013,7 +13556,11 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13021,7 +13568,11 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13031,39 +13582,161 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature but cannot verify sender"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "From"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Mailer"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
@@ -13173,7 +13846,7 @@ msgstr "Se_nd message to..."
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
@@ -13220,11 +13893,23 @@ msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtual _Folders"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Add"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder source"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatic link recognition"
@@ -13695,63 +14380,33 @@ msgstr "port for starting user runned spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13809,34 +14464,6 @@ msgstr "Importing `%s'"
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14006,91 +14633,83 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d deleted"
 msgstr[1] "%d deleted"
 
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d junk"
 msgstr[1] "%d junk"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d draft"
 msgstr[1] "%d drafts"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
 msgstr[0] "%d sent"
 msgstr[1] "%d sent"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d unsent"
 msgstr[1] "%d unsent"
 
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d total"
 msgstr[1] "%d total"
 
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d unread"
 msgstr[1] ", %d unread"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identity"
@@ -14152,14 +14771,22 @@ msgstr ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connecting to server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Preview</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL is not supported in this build of evolution</b>"
@@ -14412,7 +15039,7 @@ msgstr "Do not quote original message"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Don't sign _meeting requests (for Outlook compatibility)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Done"
 
@@ -14750,6 +15377,122 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Please read carefully the licence agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder Sources</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digital Signature</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encryption</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepted"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "C_ompleted"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Case Sensitive"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Find in Message"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Find:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Flag to Follow Up"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Folder Subscriptions"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "%s Licence Agreement"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "None Selected"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Security Information"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "List of accepted licences"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Due By:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Flag:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "specific folders only"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "with all active remote folders"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "with all local and active remote folders"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "with all local folders"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14771,6 +15514,7 @@ msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14798,8 +15542,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Send"
+msgstr "Send"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14922,6 +15667,7 @@ msgstr "You have unsent messages, do you wish to quit anyway?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -14967,14 +15713,6 @@ msgstr "Error while performing operation."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15135,8 +15873,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "If you proceed, the account information will be deleted permanently."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Don't delete"
+msgstr "_Undelete"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15165,6 +15904,7 @@ msgstr "Discard changed?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Do you wish to save your changes?"
 
@@ -15236,13 +15976,44 @@ msgstr ""
 "    \"{1}\"\n"
 "And have been updated."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Missing folder."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "You must name this vFolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "No sources selected."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15254,15 +16025,15 @@ msgstr ""
 "You can choose to ignore this folder, overwrite or append its contents, or "
 "quit.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignore"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Overwrite"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Append"
 
@@ -15423,7 +16194,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15432,45 +16203,21 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Case Sensitive"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Find in Message"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Find:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digital Signature</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encryption</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Security Information"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelling..."
@@ -15578,15 +16325,15 @@ msgstr "Updating vFolders for '%s:%s'"
 msgid "Updating vFolders for '%s'"
 msgstr "Updating vFolders for '%s'"
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -15706,10 +16453,6 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
@@ -15722,49 +16465,49 @@ msgstr "Reply to All"
 msgid "Review"
 msgstr "Review"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Body contains"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Body does not contain"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Body or subject contains"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Message contains"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Recipients contain"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Sender contains"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Subject contains"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Subject does not contain"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15832,30 +16575,17 @@ msgstr "Whether to skip the development warning dialogue"
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Active Connections</b>"
 
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Uknown system error."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Active Connections"
 
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Click OK to close these connections and go offline"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16040,23 +16770,6 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution is currently online.  Click on this button to work offline."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution is currently offline.  Click on this button to work online."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Switch to %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
@@ -16090,10 +16803,94 @@ msgstr "_Work Offline"
 msgid "Work Offline"
 msgstr "Work Offline"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution is currently online.  Click on this button to work offline."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution is currently offline.  Click on this button to work online."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Switch to %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Uknown system error."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generic error"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "New"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Evolution Setup Assistant"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importing Files"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Timezone "
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Welcome"
+
+#: shell/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 ""
+"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. "
+
+#: shell/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 ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "New Test"
@@ -16106,18 +16903,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Create a new test item"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16177,7 +16962,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16212,7 +16997,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16220,39 +17005,39 @@ msgstr ""
 "Thanks\n"
 "The Evolution Team\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16261,6 +17046,110 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr "Insufficient disk space for upgrade."
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+"Upgrade from previous version failed:\n"
+"{0}"
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr "Continue"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr "Cannot start Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+msgstr "Evolution can not start."
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16504,6 +17393,11 @@ msgstr "Your Certificates"
 msgid "_Edit CA Trust"
 msgstr "_Edit CA Trust"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16703,11 +17597,6 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
@@ -16847,8 +17736,8 @@ msgstr "View the current contact"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
@@ -17322,16 +18211,6 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Close this window"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Close"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
@@ -17732,6 +18611,16 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Close this window"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Close"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -17814,10 +18703,6 @@ msgstr "Save the current file with a different name"
 msgid "Save the message in a specified folder"
 msgstr "Save the message in a specified folder"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Send"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18520,6 +19405,191 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Authentication Credentials for HTTP Server"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendars selected for publishing"
+
+#~ msgid "Login name:"
+#~ msgstr "Login name:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "User Publishes"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Could not start wombat"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+
+#~ msgid "C_alendar"
+#~ msgstr "C_alendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Audio Alarm Options"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Message Alarm Options"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Email Alarm Options"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Program Alarm Options"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Unknown Alarm Options"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarm Repeat"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Message to Display:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Message to Send"
+
+#~ msgid "Play sound:"
+#~ msgstr "Play sound:"
+
+#~ msgid "Run program:"
+#~ msgstr "Run program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "With these arguments:"
+
+#~ msgid "Basics"
+#~ msgstr "Basics"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Date/Time:"
+
+#~ msgid "Reminders"
+#~ msgstr "Reminders"
+
+#~ msgid "_Options..."
+#~ msgstr "_Options..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Addressbook..."
+
+#~ msgid "Reminder"
+#~ msgstr "Reminder"
+
+#~ msgid "B_usy"
+#~ msgstr "B_usy"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidential"
+
+#~ msgid "Date & Time"
+#~ msgstr "Date & Time"
+
+#~ msgid "F_ree"
+#~ msgstr "F_ree"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vate"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Add A_ttendee"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Add attendees from addressbook."
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Recurrence Rule"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Custom recurrence"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modify"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_No recurrence"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Simple recurrence"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Complete"
+
+#~ msgid "Progress"
+#~ msgstr "Progress"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidential"
+
+#~ msgid "Folder:"
+#~ msgstr "Folder:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "There was an error on the CORBA system\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Object could not be found\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "You don't have the right permissions to update the calendar\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Attendee status could not be updated!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Add attendees from addressbook"
+
+#~ msgid "_Options"
+#~ msgstr "_Options"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Meeting _start time:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Meeting _end time:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Can't find certificate for `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Can't create CMS Message"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Can't create encoder context"
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Score Rules"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+
+#~ msgid "Properties"
+#~ msgstr "Properties"
+
+#~ msgid "Folder Name"
+#~ msgstr "Folder Name"
+
 #~ msgid "contact-list-editor"
 #~ msgstr "contact-list-editor"
 
@@ -18564,15 +19634,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Checkbox"
 #~ msgstr "Checkbox"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Active Connections</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Active Connections"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr "Click OK to close these connections and go offline"
-
 #~ msgid "C_alendar:"
 #~ msgstr "C_alendar:"
 
@@ -18591,116 +19652,12 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Open Other User's Folder"
 
-#~ msgid "_Account:"
-#~ msgstr "_Account:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Folder Name:"
 
 #~ msgid "_User:"
 #~ msgstr "_User:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Evolution Setup Assistant"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importing Files"
-
-#~ msgid "Timezone "
-#~ msgstr "Timezone "
-
-#~ msgid "Welcome"
-#~ msgstr "Welcome"
-
-#~ 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 ""
-#~ "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. "
-
-#~ 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 ""
-#~ "You have successfully entered all of the information\n"
-#~ "needed to set up Evolution. \n"
-#~ "\n"
-#~ "Click the \"Apply\" button to save your settings. "
-
-#~ msgid "Insufficient disk space for upgrade."
-#~ msgstr "Insufficient disk space for upgrade."
-
-#~ msgid ""
-#~ "Upgrading your data and settings will require upto {0} of disk space, but "
-#~ "you only have {1} available.\n"
-#~ "\n"
-#~ "You will need to make more space available in your home directory before "
-#~ "you can continue."
-#~ msgstr ""
-#~ "Upgrading your data and settings will require upto {0} of disk space, but "
-#~ "you only have {1} available.\n"
-#~ "\n"
-#~ "You will need to make more space available in your home directory before "
-#~ "you can continue."
-
-#~ msgid ""
-#~ "Upgrade from previous version failed:\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Upgrade from previous version failed:\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "{1}\n"
-#~ "\n"
-#~ "If you choose to continue, you may not have access to some of your old "
-#~ "data.\n"
-#~ msgstr ""
-#~ "{1}\n"
-#~ "\n"
-#~ "If you choose to continue, you may not have access to some of your old "
-#~ "data.\n"
-
-#~ msgid "Continue"
-#~ msgstr "Continue"
-
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Cannot start Evolution"
-
-#~ msgid "Evolution can not start."
-#~ msgstr "Evolution can not start."
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-#~ msgstr ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-
 #~ msgid ""
 #~ "Some fields are no longer representable in the contact editor. Please "
 #~ "wait while Evolution copies those fields to the 'Notes' field..."
@@ -18798,9 +19755,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "_Invite Others..."
 #~ msgstr "_Invite Others..."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Could not get article %s from NNTP server"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Posting not allowed by news server"
 
@@ -18837,174 +19791,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Because \"${1}\"."
 #~ msgstr "Because \"${1}\"."
 
-#~ msgid "Adjust Score"
-#~ msgstr "Adjust Score"
-
-#~ msgid "Assign Color"
-#~ msgstr "Assign Colour"
-
-#~ msgid "Assign Score"
-#~ msgstr "Assign Score"
-
-#~ msgid "Attachments"
-#~ msgstr "Attachments"
-
-#~ msgid "Beep"
-#~ msgstr "Beep"
-
-#~ msgid "contains"
-#~ msgstr "contains"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copy to Folder"
-
-#~ msgid "Date received"
-#~ msgstr "Date received"
-
-#~ msgid "Date sent"
-#~ msgstr "Date sent"
-
-#~ msgid "Deleted"
-#~ msgstr "Deleted"
-
-#~ msgid "does not contain"
-#~ msgstr "does not contain"
-
-#~ msgid "does not end with"
-#~ msgstr "does not end with"
-
-#~ msgid "does not exist"
-#~ msgstr "does not exist"
-
-#~ msgid "does not return"
-#~ msgstr "does not return"
-
-#~ msgid "does not sound like"
-#~ msgstr "does not sound like"
-
-#~ msgid "does not start with"
-#~ msgstr "does not start with"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Do Not Exist"
-
-#~ msgid "Draft"
-#~ msgstr "Draft"
-
-#~ msgid "ends with"
-#~ msgstr "ends with"
-
-#~ msgid "Exist"
-#~ msgstr "Exist"
-
-#~ msgid "exists"
-#~ msgstr "exists"
-
-#~ msgid "Expression"
-#~ msgstr "Expression"
-
-#~ msgid "Follow Up"
-#~ msgstr "Follow Up"
-
-#~ msgid "is"
-#~ msgstr "is"
-
-#~ msgid "is after"
-#~ msgstr "is after"
-
-#~ msgid "is before"
-#~ msgstr "is before"
-
-#~ msgid "is Flagged"
-#~ msgstr "is Flagged"
-
-#~ msgid "is greater than"
-#~ msgstr "is greater than"
-
-#~ msgid "is less than"
-#~ msgstr "is less than"
-
-#~ msgid "is not"
-#~ msgstr "is not"
-
-#~ msgid "is not Flagged"
-#~ msgstr "is not Flagged"
-
-#~ msgid "Junk Test"
-#~ msgstr "Junk Test"
-
-#~ msgid "Mailing list"
-#~ msgstr "Mailing list"
-
-#~ msgid "Message Body"
-#~ msgstr "Message Body"
-
-#~ msgid "Message Header"
-#~ msgstr "Message Header"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Message is Junk"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Message is not Junk"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Move to Folder"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Pipe to Program"
-
-#~ msgid "Play Sound"
-#~ msgstr "Play Sound"
-
-#~ msgid "Recipients"
-#~ msgstr "Recipients"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regex Match"
-
-#~ msgid "Replied to"
-#~ msgstr "Replied to"
-
-#~ msgid "returns"
-#~ msgstr "returns"
-
-#~ msgid "returns greater than"
-#~ msgstr "returns greater than"
-
-#~ msgid "returns less than"
-#~ msgstr "returns less than"
-
-#~ msgid "Run Program"
-#~ msgstr "Run Program"
-
-#~ msgid "Sender"
-#~ msgstr "Sender"
-
-#~ msgid "Set Status"
-#~ msgstr "Set Status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Size (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "sounds like"
-
-#~ msgid "Source Account"
-#~ msgstr "Source Account"
-
-#~ msgid "Specific header"
-#~ msgstr "Specific header"
-
-#~ msgid "starts with"
-#~ msgstr "starts with"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Stop Processing"
-
-#~ msgid "Unset Status"
-#~ msgstr "Unset Status"
-
 #~ msgid "Brought to you by"
 #~ msgstr "Brought to you by"
 
@@ -19029,30 +19815,15 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Failed to connect to LDAP server"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Failed to authenticate with LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Could not perform query on Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "The server responded with no supported search bases"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "This server does not support LDAPv3 schema information"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Error retrieving schema information"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Server did not respond with valid schema information"
-
 #~ msgid "Job title:"
 #~ msgstr "Job title:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Category editor not available."
-
 #~ msgid "Do you want to save changes?"
 #~ msgstr "Do you want to save changes?"
 
@@ -19078,9 +19849,6 @@ msgstr "%s (%d%% complete)"
 #~ "The event being deleted is a meeting, would you like to send a "
 #~ "cancellation notice?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Are you sure you want to cancel and delete this meeting?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19098,42 +19866,15 @@ msgstr "%s (%d%% complete)"
 #~ "The journal entry being deleted is published, would you like to send a "
 #~ "cancellation notice?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Are you sure you want to cancel and delete this journal entry?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Are you sure you want to delete the appointment `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Are you sure you want to delete this untitled appointment?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Are you sure you want to delete the task `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Are you sure you want to delete this untitled task?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Are you sure you want to delete the journal entry `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Are you sure want to delete this untitled journal entry?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Are you sure you want to delete %d appointment?"
-#~ msgstr[1] "Are you sure you want to delete %d appointments?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Are you sure you want to delete %d task?"
-#~ msgstr[1] "Are you sure you want to delete %d tasks?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Are you sure you want to delete %d journal entry?"
-#~ msgstr[1] "Are you sure you want to delete %d journal entries?"
-
 #~ msgid ""
 #~ "This event has been changed, but has not been saved.\n"
 #~ "\n"
@@ -19557,9 +20298,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Finished"
 #~ msgstr "Finished"
 
-#~ msgid "Group:"
-#~ msgstr "Group:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20161,10 +20899,6 @@ msgstr "%s (%d%% complete)"
 #~ msgstr "Synchronising \"%s\""
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
diff --git a/po/es.po b/po/es.po
index b755be2c10..b9467b3bed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-12 13:49+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-12 14:11+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "serrador@hispalinux.es>\n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -32,14 +32,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "libreta de direcciones de Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "cabecera del contacto: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minitarjeta de Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "carpeta de libretas de direcciones actual"
@@ -60,34 +52,258 @@ msgstr "tarjetas"
 msgid " card"
 msgstr "tarjeta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "cabecera del contacto: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minitarjeta de Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "No se pudo cargar el cursor\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Falló al autenticarse con el servidor LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Verifique que su contraseña está escrita correctamente. Recuerde que muchas "
+"contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
+"puede estar activada."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "El servidor respondió con bases de búsqueda no soportadas"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Este servidor no soporta el esquema de información LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "No se pudo obtener el artículo %s del servidor NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "El servidor no respondió con una información del esquema válida"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "No se pudo cargar la libreta de direcciones"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "No hay un editor de categorías disponible."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Guardar en la libreta de direcciones"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Error cargando la libreta de direcciones predeterminada."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Error efectuando búsqueda"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "¿Desea guardar los cambios?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Descartar"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "y otro contacto."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Está moviendo un contacto desde una libreta a otra, pero no puede ser "
+"eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "No se pudo interpretar el contenido del mensaje"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Error añadiendo contacto"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de "
+"nuevo."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Dirección de sincr. predeterminada:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "No se pudo cargar la libreta de direcciones"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "No se pudo leer el bloque de la aplicación de Direcciones del Pilot"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accediendo al servidor LDAP anónimamente"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Falló al autenticarme.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletado"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s Introduzca la contraseña para %s (usuario %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "C_ontactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificados"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure el autocompletado aquí"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+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:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Componente de libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Control de gestión de certificados S/Mime de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+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:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Gestione sus certificados S/MIME aquí"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -118,7 +334,8 @@ msgid "New Contacts Group"
 msgstr "Grupo de contactos nuevo"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Grupo de _contactos"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -141,18 +358,14 @@ msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "En este equipo"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -217,36 +430,45 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "La libreta «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contactos"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accediendo al servidor LDAP anónimamente"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Falló al autenticarme.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s Introduzca la contraseña para %s (usuario %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -270,58 +492,6 @@ msgstr ""
 "URI para la carpeta usada por última vez en el diálogo de selección de "
 "nombres"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autocompletado"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "C_ontactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificados"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configure el autocompletado aquí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-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:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Componente de libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Control de gestión de certificados S/Mime de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-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:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Gestione sus certificados S/MIME aquí"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -329,7 +499,7 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -338,7 +508,7 @@ msgstr "Gestione sus certificados S/MIME aquí"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -364,6 +534,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticación</b>"
 
@@ -405,13 +576,11 @@ msgid "Anonymously"
 msgstr "Anónimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
@@ -428,8 +597,10 @@ msgid "Email address"
 msgstr "Dirección de correo-e"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor."
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
@@ -471,8 +642,8 @@ msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
 msgstr ""
-"Seleccionar esta opción significa que Evolution sólo conectará con su servidor LDAP si"
-"su servidor LDAP soporta SSL o TLS."
+"Seleccionar esta opción significa que Evolution sólo conectará con su "
+"servidor LDAP sisu servidor LDAP soporta SSL o TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
@@ -482,9 +653,9 @@ msgid ""
 "because your connection is already secure."
 msgstr ""
 "Seleccionar esta opción significa que Evolution sólo intentará usar SSL/TLS "
-"si está en un entorno inseguro. Por ejemplo, si usted y su servidor LDAP están tras un "
-"cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS "
-"porque su conexión ya es segura."
+"si está en un entorno inseguro. Por ejemplo, si usted y su servidor LDAP "
+"están tras un cortafuegos en el trabajo, entonces Evolution no necesita usar "
+"SSL/TLS porque su conexión ya es segura."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
@@ -493,8 +664,8 @@ msgid ""
 "vulnerable to security exploits. "
 msgstr ""
 "El seleccionar esta opción significa que su servidor no soporta ni SSL ni "
-"TLS. Esto significa que su conexión será insegura y que usted será vulnerable a fallos "
-"de seguridad. "
+"TLS. Esto significa que su conexión será insegura y que usted será "
+"vulnerable a fallos de seguridad. "
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
@@ -511,8 +682,8 @@ msgid ""
 "root of the directory tree."
 msgstr ""
 "La base de Búsqueda es el nombre distintivo (ND) de la entrada donde las "
-"búsquedas empezarán. Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
-"directorios."
+"búsquedas empezarán. Si deja esto en blanco, la búsqueda empezará en la raíz "
+"del árbol de directorios."
 
 #: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
@@ -522,9 +693,9 @@ msgid ""
 "one level beneath your base."
 msgstr ""
 "El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda se "
-"extienda a lo largo de un árbol de directorios. Un ámbito de búsqueda de «sub» "
-"incluirá todas las entradas por debajo su base de búsqueda. Un ámbito de «uno» sólo incluirá "
-"las entradas un nivel bajo su base."
+"extienda a lo largo de un árbol de directorios. Un ámbito de búsqueda de "
+"«sub» incluirá todas las entradas por debajo su base de búsqueda. Un ámbito "
+"de «uno» sólo incluirá las entradas un nivel bajo su base."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -539,8 +710,8 @@ msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
-"Este es el máximo número de entradas para descargar.  Si pone este número"
-"demasiado alto ralentizará su libreta de direcciones."
+"Este es el máximo número de entradas para descargar.  Si pone este "
+"númerodemasiado alto ralentizará su libreta de direcciones."
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -566,9 +737,9 @@ msgid ""
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
 msgstr ""
-"Este es el puerto del servidor LDAP al que Evolution intentará conectarse."
-"Se ha proporcionado una lista de puertos estándar. Pregunte a su "
-"administrador del sistema qué puerto debería especificar."
+"Este es el puerto del servidor LDAP al que Evolution intentará conectarse.Se "
+"ha proporcionado una lista de puertos estándar. Pregunte a su administrador "
+"del sistema qué puerto debería especificar."
 
 #: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
@@ -641,33 +812,27 @@ msgid "cards"
 msgstr "tarjetas"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Selecciona contactos de la libreta de direcciones"
+#: 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 libreta de direcciones de Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Eliminar todo"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eliminar todo"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ver lista de contactos"
@@ -682,7 +847,7 @@ msgid "Send HTML Mail?"
 msgstr "¿Enviar correo en HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Añadir a contactos"
 
@@ -690,15 +855,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Fuente"
 
-#: 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 libreta de direcciones de Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Selecciona contactos de la libreta de direcciones"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -720,6 +892,11 @@ msgstr "_Categoría:"
 msgid "_Find"
 msgstr "_Buscar"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Buscar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>correo-e</b>"
@@ -757,9 +934,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -780,7 +956,6 @@ msgid "Birthday:"
 msgstr "Cumpleaños:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Agenda:"
 
@@ -793,7 +968,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -801,7 +976,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -893,8 +1068,8 @@ msgstr "Web Log:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -917,39 +1092,23 @@ msgstr "_Archivar en:"
 msgid "_Where:"
 msgstr "_Donde:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"¿Está seguro de que quiere\n"
-"borrar estos contactos?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Seguro que quiere\n"
-"borrar este contacto?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editable"
 
@@ -1921,80 +2080,99 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Mensajería instantánea de AOL"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Servicio"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Ubicación"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Usuario"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Domicilio"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2430
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Por favor seleccione una imagen para este contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2434
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Sin imagen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2637
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2002,11 +2180,11 @@ msgstr ""
 "La fecha del contacto es inválida:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2665
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Contacto inválido."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2724
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2014,12 +2192,7 @@ msgstr ""
 "El contacto no puede ser guardado en la libreta de direcciones seleccionada. "
 "¿Quiere descartar estos cambios?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/contact-editor/e-contact-editor.c:2752
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2747
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2027,28 +2200,6 @@ msgstr ""
 "Está moviendo un contacto desde una libreta a otra, pero no puede ser "
 "eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Mensajería instantánea de AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Servicio"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Ubicación"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Usuario"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Añadir contacto rápido"
@@ -2066,6 +2217,22 @@ msgstr "Nombre _completo:"
 msgid "E-_mail:"
 msgstr "_Correo-e:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Está seguro de que quiere\n"
+"borrar estos contactos?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Seguro que quiere\n"
+"borrar este contacto?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Dirección _2:"
@@ -2218,19 +2385,20 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "diálogo1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Libro"
 
@@ -2291,412 +2459,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Listar miembros"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Correo-e"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Posición"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Videoconferencia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Teléfono"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "trabajo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Teléfono móvil"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Puesto"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Correo-e"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Página personal"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Éxito"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Backend ocupado"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "La libreta de direcciones no existe"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "No hay definido un autocontacto"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contacto no encontrado"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Ya existe el ID del contacto"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocolo no implementado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "No se pudo cancelar"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Falló en la autenticación"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Autenticación Requerida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS no Disponible"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "No existe ese origen"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Otro error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
-"que tenga permisos para acceder a ella."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
-"introducido una URI errónea, o que el servidor LDAP es inaccesible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Esta versión de Evolution no se le ha compilado el soporte LDAP. Si quiere "
-"usar LDAP en Evolution debe instalar un paquete de Evolution con LDAP activado."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"No se pudo abrir esta libreta de direcciones. Esto significa que ha "
-"introducido una URI errónea, o que el servidor LDAP es inaccesible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Se encontraron más tarjetas que las que el servidor está \n"
-"configurado para devolver o Evolution está configurado\n"
-"para mostrar. Por favor, haga su búsqueda más específica o \n"
-"aumente el límite de resultados en las preferencias del servidor\n"
-"de directorios para esta libreta de direcciones."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"El tiempo especificado para efectuar esta consulta excedió el límite del\n"
-"servidor o el límite que ha configurado en la libreta de direcciones.\n"
-"Por favor, haga su búsqueda más específica o aumente el límite de\n"
-"tiempo en las opciones del servidor de directorios para esta libreta\n"
-" de direcciones."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Esta consulta no se completó con éxito."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Error añadiendo lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Error añadiendo contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Error modificando lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Error modificando contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Error eliminando lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Error eliminando contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Abrir %d contactos abrirá %d ventanas nuevas también.\n"
-"¿Quiere realmente mostrar todas estos contactos?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ya existe\n"
-"¿Quiere sobreescribirlo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Sobreescribir"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "tarjeta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Mover contacto a"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copiar contacto a"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Mover contactos a"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copiar contactos a"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Seleccione la libreta de direcciones destino."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "VCards múltiples"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(ninguno)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Correo-e principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Correo-e 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Correo-e 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Seleccione una acción"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear un contacto nuevo «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Añadir dirección al contacto existente «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Consultando la libreta de direcciones..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar información del contacto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Combinar direcciones de correo-e"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "y otro contacto."
-msgstr[1] "y otros %d contactos."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Mostrar VCard completa"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Mostrar VCard compacta"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Guardar en la libreta de direcciones"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Sin contactos"
@@ -2710,9 +2472,9 @@ msgstr[1] "%d contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Consulta"
 
@@ -2728,129 +2490,129 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoría es"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Guardar como VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Contacto nuevo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Lista de contactos nueva..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Buscar contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Fuentes de la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Configuración del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Envía un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copiar a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Mover a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Vista actual"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Cualquier categoría"
@@ -2884,6 +2646,8 @@ msgid "Car Phone"
 msgstr "Teléfono del coche"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorías"
 
@@ -2891,6 +2655,21 @@ msgstr "Categorías"
 msgid "Company Phone"
 msgstr "Teléfono de la compañía"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Correo-e"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Correo-e 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Correo-e 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Apellidos"
@@ -2927,14 +2706,29 @@ msgstr "Diario"
 msgid "Manager"
 msgstr "Jefe"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Teléfono móvil"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Apodo"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organización"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Otro fax"
@@ -2986,29 +2780,21 @@ msgstr "Unidad"
 msgid "Web Site"
 msgstr "Sitio web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Ancho"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Alto"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Tiene el foco"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Tiene el cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
@@ -3025,7 +2811,11 @@ msgstr "Modelo del texto"
 msgid "Max field name length"
 msgstr "Longitud máx. del campo"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ancho de columna"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3039,7 +2829,7 @@ msgstr ""
 "\n"
 "Pulse dos veces aquí para crear un contacto nuevo."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3049,13 +2839,390 @@ msgstr ""
 "\n"
 "No hay elementos para mostrar en esta vista."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ancho de columna"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seleccionado"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Tiene el cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Listar miembros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Correo-e"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Posición"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Videoconferencia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Teléfono"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "trabajo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Puesto"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Página personal"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Éxito"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Backend ocupado"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "La libreta de direcciones no existe"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "No hay definido un autocontacto"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contacto no encontrado"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Ya existe el ID del contacto"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocolo no implementado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "No se pudo cancelar"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Falló en la autenticación"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Autenticación Requerida"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS no Disponible"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "No existe ese origen"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Otro error"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
+"que tenga permisos para acceder a ella."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
+"introducido una URI errónea, o que el servidor LDAP es inaccesible."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Esta versión de Evolution no se le ha compilado el soporte LDAP. Si quiere "
+"usar LDAP en Evolution debe instalar un paquete de Evolution con LDAP "
+"activado."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"No se pudo abrir esta libreta de direcciones. Esto significa que ha "
+"introducido una URI errónea, o que el servidor LDAP es inaccesible."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Se encontraron más tarjetas que las que el servidor está \n"
+"configurado para devolver o Evolution está configurado\n"
+"para mostrar. Por favor, haga su búsqueda más específica o \n"
+"aumente el límite de resultados en las preferencias del servidor\n"
+"de directorios para esta libreta de direcciones."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"El tiempo especificado para efectuar esta consulta excedió el límite del\n"
+"servidor o el límite que ha configurado en la libreta de direcciones.\n"
+"Por favor, haga su búsqueda más específica o aumente el límite de\n"
+"tiempo en las opciones del servidor de directorios para esta libreta\n"
+" de direcciones."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Esta consulta no se completó con éxito."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Error añadiendo lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Error añadiendo contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Error modificando lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Error modificando contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Error eliminando lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Error eliminando contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Abrir %d contactos abrirá %d ventanas nuevas también.\n"
+"¿Quiere realmente mostrar todas estos contactos?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s ya existe\n"
+"¿Quiere sobreescribirlo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "tarjeta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Mover contacto a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copiar contacto a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Mover contactos a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copiar contactos a"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Seleccione la libreta de direcciones destino."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "VCards múltiples"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(ninguno)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Correo-e principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Seleccione una acción"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un contacto nuevo «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Añadir dirección al contacto existente «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Consultando la libreta de direcciones..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Editar información del contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Combinar direcciones de correo-e"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "y otro contacto."
+msgstr[1] "y otros %d contactos."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Mostrar VCard completa"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Mostrar VCard compacta"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Guardar en la libreta de direcciones"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3065,17 +3232,17 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reflujo"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Copyright © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Esto debería probar el reflujo del elemento lienzo"
 
@@ -3099,6 +3266,11 @@ msgstr "Importador de VCard de Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contactos"
@@ -3108,11 +3280,6 @@ msgstr "Imprimir contactos"
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma de 10 pt."
@@ -3297,6 +3464,20 @@ msgstr "Prueba de impresión de contactos"
 msgid "This should test the contact print code"
 msgstr "Esto debería probar el código de impresión de los contactos"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "No se pudo abrir el archivo"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "No se pudo obtener una lista de libretas de direcciones"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "fallo al abrir libreta de direcciones"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique el archivo de salida en lugar del la salida estándar"
@@ -3322,7 +3503,8 @@ msgid "Export in asynchronous mode "
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3332,7 +3514,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3353,20 +3536,6 @@ msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 msgid "Impossible internal error."
 msgstr "Error interno imposible."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "No se pudo obtener una lista de libretas de direcciones"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "fallo al abrir libreta de direcciones"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error cargando la libreta de direcciones predeterminada."
@@ -3383,6 +3552,269 @@ msgstr "No ha especificado un nombre de archivo."
 msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "No borrar"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Enviar a:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "¿Seguro que quiere cancelar y borrar esta reunión?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "¿Seguro que quiere borrar %d tarea?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "¿Seguro que quiere cancelar y borrar esta entrada del diario?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "¿Seguro que quiere borrar %d entrada del diario?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "¿Seguro que quiere borrar la cita «%s»?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "¿Seguro que quiere borrar %d cita?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "¿Seguro que quiere borrar la tarea «%s»?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "¿Seguro que quiere borrar la cita «%s»?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "¿Seguro que quiere borrar la tarea «%s»?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Cita"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "¿Desea guardar los cambios?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Descartar cambios"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lago Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de "
+"nuevo."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Motor de agenda en archivo local de Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de "
+"nuevo."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3393,29 +3825,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de días múltiples:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "No se ha podido iniciar el servidor wombat"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "No se pudo inicializar wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "No se ha podido iniciar el servidor wombat"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "No se pudo leer información de la aplicación de agenda del Pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "No se pudo leer los datos de la aplicación ToDo del Pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Agenda y tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure su zona horaria, Agenda y Lista de Tareas aquí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Agenda y Tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Control de configuración de la agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor de mensajes de planificación de la agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de agenda/tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Componente de Agenda de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Componente de Tareas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tareas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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 de la Agenda de Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Inicio:"
@@ -3513,10 +4009,6 @@ 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 de la Agenda de Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
@@ -3631,7 +4123,8 @@ msgstr "La semana empieza el día"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -3647,18 +4140,41 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para los eventos"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr ""
+"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "El resumen contiene"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "La descripción contiene"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "El comentario contiene"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "La ubicación contiene"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "No coincidente"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3680,8 +4196,8 @@ msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "días"
 
@@ -3691,12 +4207,8 @@ msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
@@ -3744,64 +4256,52 @@ msgstr "no se pudo abrir la agenda «%s» para crear eventos y reuniones"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"La agenda selaccionada es de sólo lectura, no pueden crearse eventos. Por "
-"favor, seleccione una agenda de lectura-escritura."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Agendas"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Agenda"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Agenda"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
@@ -3831,26 +4331,6 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "El resumen contiene"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "La descripción contiene"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "El comentario contiene"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "La ubicación contiene"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "No coincidente"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error al abrir la agenda"
@@ -3868,213 +4348,132 @@ msgstr "Permiso denegado para abrir la agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opciones de los avisos audibles"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opciones de los avisos de mensajes"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opciones de los avisos por correo-e"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opciones de los avisos de programas"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opciones de avisos desconocidos"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Repetición de alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Mensaje a mostrar:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Mensaje a enviar"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Reproducir un sonido:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repetir la alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Ejecutar programa:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Enviar a:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Con estos argumentos:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Sonido de la alarma</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "veces adicionales cada"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Descripción</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "horas"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>General</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Acción/Disparador"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Aña_dir"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Redactar un mensaje"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Básicos"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Fecha/Hora:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Mensajes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproducir un sonido"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Mostrar una alerta emergente"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Recordatorios"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Ejecutar un programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Enviar a:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar un correo-e"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resumen:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Cuent_a:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opciones..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Ejecutar programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repetir la alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "después del"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "antes del"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "día(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "fin de la cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "veces adicionales cada"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Debe especificar una ubicación de la que obtener la agenda."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "La ubicación fuente «%s» no está bien formada."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "La ubicación fuente «%s» no es una fuente webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "El origen con nombre «%s» ya existe en el grupo seleccionado"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"El grupo «%s» es remoto. Debe especificar una ubicación de la que obtener la "
-"agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Añadir Calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Añadir grupo de tareas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olor:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Elija un color"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Añadir Calendario"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Añadir grupo"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Refrescar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tipo:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Acción/Disparador"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Aña_dir"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmas"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4183,7 +4582,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publicación de disponibilidad"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Viernes"
@@ -4197,7 +4596,7 @@ msgid "Minutes"
 msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Lunes"
@@ -4207,7 +4606,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
@@ -4221,7 +4620,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
@@ -4235,7 +4634,7 @@ msgid "T_hu"
 msgstr "_Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Jueves"
@@ -4249,7 +4648,7 @@ msgid "Time format:"
 msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Martes"
@@ -4259,7 +4658,7 @@ msgid "W_eek starts:"
 msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miércoles"
@@ -4292,7 +4691,8 @@ msgstr "_Comprimir fines de semana en la vista mensual"
 msgid "_Day begins:"
 msgstr "La jornada laboral _comienza a las:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4324,7 +4724,8 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
@@ -4342,6 +4743,74 @@ msgstr "M_ié"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Debe especificar una ubicación de la que obtener la agenda."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "La ubicación fuente «%s» no está bien formada."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "La ubicación fuente «%s» no es una fuente webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "El origen con nombre «%s» ya existe en el grupo seleccionado"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"El grupo «%s» es remoto. Debe especificar una ubicación de la que obtener la "
+"agenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Añadir Calendario"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Añadir grupo de tareas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_olor:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Elija un color"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Añadir Calendario"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Añadir grupo"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Refrescar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "semanas"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este acontecimiento ha sido borrado."
@@ -4386,81 +4855,75 @@ msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Error de validación: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completado "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Vence "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Vence "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "No se pudo actualizar el objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Guardar como..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Imposible obtener versión actual."
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Error de validación: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completado "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Vence "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Vence "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "No se pudo abrir el origen"
@@ -4499,7 +4962,8 @@ msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:76
 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"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
 #: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -4522,8 +4986,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "El elemento no pudo ser borrado debido a un error"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Libreta de direcciones..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Contactos..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4533,132 +4998,192 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Información"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunión"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Evento sin fecha de inicio"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Evento sin fecha de finalización"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "La fecha de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "La fecha de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "La hora de inicio está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "La  hora de finalización  está equivocada"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "No se pudo abrir la agenda «%s»."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "antes de cada cita"
+msgstr[1] "antes de cada cita"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "fin de la cita"
+msgstr[1] "fin de la cita"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "antes de cada cita"
+msgstr[1] "antes de cada cita"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Acontecimiento para _todo el día"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "antes de cada cita"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Oc_upada"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "antes de cada cita"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "antes de cada cita"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+msgid "<b>Basics</b>"
+msgstr "<b>Básico</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Clasificación"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Fecha y hora</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidencial"
+msgid "A_ll day event"
+msgstr "Acontecimiento para _todo el día"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Fecha y hora"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Guardar vista personalizada..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Lib_re"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Ubicación:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Agenda:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vado"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Clasificación"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pú_blico"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Mostrar hora como"
+msgid "L_ocation:"
+msgstr "_Ubicación:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privado"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Público"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Mostrar hora como"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmas"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descripción:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4667,32 +5192,26 @@ msgstr "Hora de _inicio:"
 msgid "None"
 msgstr "Ninguno"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 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:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Se requiere un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Es necesario por lo menos un asistente."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegado a..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2583 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Borrar"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Quitar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4737,28 +5256,39 @@ msgid "RSVP"
 msgstr "Confirmar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Añadir _participante"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alertas</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Añadir asistentes desde la libreta de direcciones."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Otro</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Cambiar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Contactos..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Cambiar organizador"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizador:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4798,15 +5328,18 @@ msgstr "Nombre de la 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 acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: 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: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?"
+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:72
 msgid "This Instance Only"
@@ -4824,146 +5357,137 @@ msgstr "Esta instancia y las futuras"
 msgid "All Instances"
 msgstr "Todas las instancias"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene repeticiones que no pueden ser editadas por Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "La fecha de repetición está equivocada"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "primero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "tercero"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "cuarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Otra fecha"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "en el"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "repeticiones"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Fecha/Hora"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Descripción</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Vista previa</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Repetición"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Cada"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Excepciones"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Vista previa"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Regla de repetición"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Repeti_ción personalizada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modificar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Si_n repetición"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Repetición _simple"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Editar cita"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "para"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "siempre"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "hasta"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Seleccione destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista de tareas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Tipografías del mensaje</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Terminado"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4977,8 +5501,8 @@ msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En proceso"
@@ -4990,22 +5514,22 @@ msgid "Low"
 msgstr "Baja"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Sin comenzar"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progreso"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Porcentaje completado: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5028,36 +5552,42 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tarea"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "La fecha de vencimiento es errónea"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "No es posible abrir las tareas en «%s»."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opciones</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Borrar correo</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descripción:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Carpeta:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Fecha de ini_cio:"
@@ -5066,52 +5596,58 @@ msgstr "Fecha de ini_cio:"
 msgid "_Due date:"
 msgstr "Fecha de _vencimiento:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Credenciales de autenticación para el servidor HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupo:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Agendas seleccionadas para publicación"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opciones de agenda</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Diariamente"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Frecuencia de publicación"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Editor de información de disponibilidad"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Dirección de publicación de información de disponibilidad"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Dirección de publicación de información de disponibilidad"
+msgid "Free/Busy Editor"
+msgstr "Editor de información de disponibilidad"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nombre de inicio de sesión:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Diariamente"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Contraseña:"
+#, fuzzy
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Frecuencia de publicación"
+#, fuzzy
+msgid "_Password:"
+msgstr "Contraseña:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Recordar contraseña"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Usuario:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "El usuario publica"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Semanalmente"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5193,7 +5729,7 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -5202,6 +5738,11 @@ msgstr "Pulse para abrir %s"
 msgid "Untitled"
 msgstr "Sin título"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resumen:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5225,20 +5766,93 @@ msgstr "Prioridad:"
 msgid "Web Page:"
 msgstr "Página web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Público"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Fecha final"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privado"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Fecha de inicio"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Resumen"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupada"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La posición geográfica debe ser introducida con el formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Sí"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Repetición"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Asignado"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5284,15 +5898,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupada"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
@@ -5303,7 +5908,7 @@ msgstr "Actualizando objetos"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5313,7 +5918,7 @@ msgstr "Abrir página _web"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Guardar _como..."
@@ -5336,7 +5941,7 @@ msgstr "C_ortar"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5367,12 +5972,27 @@ msgstr "_Marcar como terminado"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tareas seleccionadas como terminadas"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Borrar"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Borrar las tareas seleccionadas"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Guardar como..."
+
 #: calendar/gui/e-calendar-table.c:1350
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pulse aquí para añadir una tarea"
 
@@ -5381,33 +6001,28 @@ msgstr "Pulse aquí para añadir una tarea"
 msgid "% Complete"
 msgstr "% Terminado"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1178
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
 #: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Fecha de terminación"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Fecha de vencimiento"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioridad"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Fecha de inicio"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumen"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
@@ -5483,95 +6098,13 @@ msgstr "_Ir a una fecha..."
 msgid "_Settings..."
 msgstr "_Configuración..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Fecha final"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1704 camel/camel-gpg-context.c:1755
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Repetición"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Asignado"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Sí"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La posición geográfica debe ser introducida con el formato: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5588,43 +6121,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+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.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisiones por minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5758,7 +6284,7 @@ msgstr "Actualizar"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
@@ -5975,53 +6501,38 @@ msgstr "El adjunto no tiene elementos de agenda visibles"
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-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:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 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:1831
+#: calendar/gui/e-itip-control.c:1813
 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:1843
+#: calendar/gui/e-itip-control.c:1825
 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:1862
-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:1865
-msgid "Object could not be found\n"
-msgstr "El objeto no pudo encontrarse\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "No tiene los permisos necesarios para actualizar la agenda\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "El estado de asistencia no pudo ser actualizado.\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -6050,6 +6561,10 @@ msgstr "Cargando agenda"
 msgid "Loading calendar..."
 msgstr "Cargando agenda..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaje del servidor:"
@@ -6133,6 +6648,28 @@ msgstr "Delegado"
 msgid "In Process"
 msgstr "En proceso"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fuera de la oficina"
@@ -6141,92 +6678,51 @@ msgstr "Fuera de la oficina"
 msgid "No Information"
 msgstr "Sin información"
 
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "Añadir asistente desde libreta de direcciones"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opciones"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Opciones"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Actualizar disponibilidad"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoseleccionar"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "Personas _requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Hora de _inicio de la reunión:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Hora de _fin de la reunión:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6245,9 +6741,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
@@ -6264,15 +6758,6 @@ msgstr "Borrando los objetos seleccionados..."
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tareas"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Actualizando consulta"
@@ -6296,55 +6781,6 @@ msgstr "Abriendo %s"
 msgid "Purging"
 msgstr "Compactando"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Agenda y tareas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure su zona horaria, Agenda y Lista de Tareas aquí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Agenda y Tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Control de configuración de la agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor de mensajes de planificación de la agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de agenda/tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Componente de Agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Componente de Tareas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Agendas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tareas"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6491,7 +6927,8 @@ msgstr "En la web"
 #. FIXME: set proper domain/code
 #: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:737
@@ -6690,10 +7127,6 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Año seleccionado (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tarea"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6724,7 +7157,7 @@ msgid "Contacts: "
 msgstr "Contactos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -6752,7 +7185,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6766,41 +7199,35 @@ msgstr "Fallo al actualizar las tareas."
 #: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr ""
+"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
 #: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay una agenda disponible para crear tareas"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"La lista de tareas seleccionada es de sólo lectura, los eventos no pueden "
-"crearse. Seleccione una agenda con lectura-escritura."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Nuevo grupo de tareas"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "Grupo de _tareas"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Crea una grupo de tareas nuevo"
 
@@ -8462,7 +8889,8 @@ msgstr "Resincronizando con el servidor"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr "Copiar el contenido de la carpeta localmente para operación desconectada"
+msgstr ""
+"Copiar el contenido de la carpeta localmente para operación desconectada"
 
 #: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
@@ -8561,41 +8989,6 @@ msgstr "Argumentos inválidos a (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error ejecutando la búsqueda del filtro: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operación no implementada: añadir mensaje: para %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operación no implementada: búsqueda según la expresión: para %s"
-
-#: camel/camel-folder.c:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "Moviendo mensajes"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copiando mensajes"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Aprendiendo spam"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Aprendiendo no-spam"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrando mensajes(s) nuevo(s)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8639,6 +9032,41 @@ msgstr "(coincidir-conversaciones) requiere que se establezca una carpeta"
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Operación no implementada: añadir mensaje: para %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Operación no implementada: búsqueda según la expresión: para %s"
+
+#: camel/camel-folder.c:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Moviendo mensajes"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copiando mensajes"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Aprendiendo spam"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Aprendiendo no-spam"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrando mensajes(s) nuevo(s)"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8668,8 +9096,8 @@ msgstr ""
 "el usuario: «%s»"
 
 #: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1440 camel/camel-gpg-context.c:1531
-#: camel/camel-gpg-context.c:1638 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
@@ -8709,16 +9137,16 @@ msgstr "Error con GPG %s: %s\n"
 msgid "Could not generate signing data: %s"
 msgstr "No se pudo generar los datos de la firma: %s"
 
-#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Error al ejecutar gpg: %s"
 
-#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1433
-#: camel/camel-gpg-context.c:1524 camel/camel-gpg-context.c:1547
-#: camel/camel-gpg-context.c:1631 camel/camel-gpg-context.c:1655
-#: camel/camel-gpg-context.c:1725 camel/camel-gpg-context.c:1776
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Falló al ejecutar gpg."
 
@@ -8726,56 +9154,37 @@ msgstr "Falló al ejecutar gpg."
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje está firmada digitalmente"
 
-#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1409
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr ""
+"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
-#: camel/camel-gpg-context.c:1416
+#: camel/camel-gpg-context.c:1420
 #, 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:1507
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No se pudo generar los datos de cifrado: %s"
 
-#: camel/camel-gpg-context.c:1565
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Esta parte del mensaje está cifrada digitalmente"
 
-#: camel/camel-gpg-context.c:1662 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
-#: camel/camel-gpg-context.c:1681
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "No se pudo interpretar el contenido del mensaje"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No se pudo bloquear el archivo para %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8796,6 +9205,27 @@ msgstr "No se pudo bloquear «%s»: error del protocolo con lock-helper"
 msgid "Could not lock '%s'"
 msgstr "No se pudo bloquear «%s»"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "No se pudo bloquear el archivo para %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Fallo al hacer un bloqueo usando fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Fallo al hacer un bloqueo usando flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8965,7 +9395,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -8973,7 +9404,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9034,7 +9466,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9051,7 +9484,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9134,55 +9567,55 @@ msgstr "Autenticación POP antes de SMTP usando una fuente no POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falló la compilación de la expresión regular: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "La URL «%s» necesita un componente de nombre de usuario"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "La URL «%s» necesita un componente host"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "La URL «%s» necesita un componente de ruta"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolviendo: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Error al resolver: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "La resolución del host ha fallado: no se puede crear el hilo: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Error al resolver el host: %s: host no encontrado"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Error al resolver el host: %s: razón desconocida"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Resolviendo dirección"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Error al resolver el host: host no encontrado"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Error al resolver el host: razón desconocida"
 
@@ -9254,7 +9687,7 @@ msgstr "No se puede añadir el certificado de cifrado"
 msgid "Cannot add CMS SignerInfo"
 msgstr "No se puede añadir la información del firmante CMS"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "No se pudo crear un contexto de codificación"
 
@@ -9335,7 +9768,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensaje sólo de certificado, certificados importados y verificados"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "No se pueden encontrar los digests de la firma"
 
 #: camel/camel-smime-context.c:651
@@ -9348,47 +9782,51 @@ msgid "Decoder failed"
 msgstr "La decodificación ha fallado"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "No se pudo encontrar un certificado para «%s»"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "No se puede encontrar el certificado para «%s»."
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "No se puede encontrar un algoritmo de encriptación común."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "No se puede reservar un slot para la clave de encriptación"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "No se puede crear un mensaje CMS"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "No se pudo crear el mensaje CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "No se puede crear CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "No se puede adjuntar CMS EvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "No se puede adjuntar el objeto de datos CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "No se puede crear CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "No se puede añadir CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "No se pudo crear un contexto codificación"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falló al añadir datos al codificador"
@@ -9433,7 +9871,8 @@ msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
@@ -9442,8 +9881,8 @@ msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -9461,7 +9900,8 @@ msgstr "No se pudo descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -9679,7 +10119,7 @@ msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No se pudo borrar la carpeta: %s: No existe tal carpeta"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
@@ -9698,8 +10138,8 @@ msgid "Checking for new mail"
 msgstr "Comprobación de correo nuevo"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas"
 
@@ -9731,8 +10171,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para acceder a servidores Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9752,341 +10192,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Falló al enviar el comando al servidor IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Respuesta inesperada del servidor IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Anuncio de bienvenida inesperado del servidor IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "El servidor IMAP4 %s se desconectó inesperadamente: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Se obtuvo una respuesta BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "No se pudo sincronizar los flags de la carpeta: «%s»: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "No se pudo sincronizar los flags de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "No se pudo compactar la carpeta: «%s»: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:748
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
-
-#: camel/providers/imap4/camel-imap4-folder.c:753
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:878
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Error desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:907
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:986
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"No se pudo mover los mensajes de la carpeta «%s» a la carpeta «%s»: "
-"Desconocido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:990
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Desconcido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:998
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"No se pudo mover los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1002
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
-"Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Carpetas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Mostrar sólo las carpetas suscritas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Para leer y almacenar correo en los servidores IMAPv4rev. EXPERIMENTAL"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
-"texto plano."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Servidor IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Servicio IMAP para %s en %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "No se pudo conectar con %s (puerto %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL no disponible"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Falló al conectar al servidor IMAP %s en modo seguro: El servidor no soporta "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
-"autenticación %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Carpeta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"No se pudo obtener la información %s para el patrón «%s» en el servidor IMAP "
-"%s:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s:"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Sin datos"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Error desconocido"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10155,7 +10282,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10188,7 +10315,8 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 "Respuesta inesperada del servidor: Se proporcioneron UIDs idénticos para los "
 "mensajes %d y %d"
@@ -10231,6 +10359,27 @@ msgstr "Usar un comando personalizado para conectarse al servidor"
 msgid "Command:"
 msgstr "Comando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Carpetas"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Mostrar sólo las carpetas suscritas"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Ignorar el espacio de nombres suministrado por el servidor"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Espacio de nombres"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10253,43 +10402,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y almacenar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Servidor IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio IMAP para %s en %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "No se pudo conectar con %s (puerto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL no disponible"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No se pudo conectar con el comando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10300,30 +10498,279 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Falló al enviar el comando al servidor IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Respuesta inesperada del servidor IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Anuncio de bienvenida inesperado del servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "No se pudo seleccionar la carpeta «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "No se pudo seleccionar la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "El servidor IMAP4 %s se desconectó inesperadamente: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Se obtuvo una respuesta BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "No se pudo sincronizar los flags de la carpeta: «%s»: Desconocido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "No se pudo sincronizar los flags de la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "No se pudo compactar la carpeta: «%s»: Desconocido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Error desconocido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "No se pudo agregar el mensaje a la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"No se pudo mover los mensajes de la carpeta «%s» a la carpeta «%s»: "
+"Desconocido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+"Desconcido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"No se pudo mover los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+"Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"No se pudo copiar los mensajes desde la carpeta «%s» a la carpeta «%s»: "
+"Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Para leer y almacenar correo en los servidores IMAPv4rev. EXPERIMENTAL"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
+"texto plano."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Falló al conectar al servidor IMAP %s en modo seguro: El servidor no soporta "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
+"autenticación %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s Escriba la contraseña IMAP para %s en el host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "No se pudo crear la carpeta «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "No se pudo crear la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "No se pudo borrar la carpeta «%s»: Carpeta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Carpeta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "No se pudo renombrar la carpeta «%s» a «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"No se pudo obtener la información %s para el patrón «%s» en el servidor IMAP "
+"%s:%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Etiqueta inesperada en la respuesta del servidor IMAP %s:"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Sin datos"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10494,18 +10941,26 @@ msgstr "No se pudo guardar el resumen: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "No se pudo añadir mensajes al resumen: razón desconocida"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Mensaje añadido al Maildir cancelado"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No se pudo añadir el mensaje a la carpeta tipo maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10522,48 +10977,48 @@ msgstr ""
 "  %s"
 
 #
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Contenido inválido en el mensaje"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "No se pudo acceder a la carpeta: «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "No se puede obtener la carpeta «%s»: la carpeta no existe."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "No se pudo crear la carpeta: «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "No se puede obtener la carpeta «%s»: no es un directorio tipo maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "No se pudo borrar la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10944,8 +11399,10 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -11023,7 +11480,8 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
+msgstr ""
+"No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
 
 #: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
@@ -11152,20 +11610,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "No se pudo conectar al servidor POP %s (puerto %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "No se pudo autenticarme en el servidor POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "No se pudo conectar al servidor POP %s en modo seguro: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "No se pudo conectar con el servidor POP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11174,28 +11637,29 @@ msgstr ""
 "No se pudo conectar con el servidor POP %s: \n"
 "No hay soporte para el sistema de autenticación pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "No se pudo autenticarme en el servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s Escriba la contraseña POP para %s en el servidor %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11204,7 +11668,16 @@ msgstr ""
 "No se pudo conectar con el servidor POP %s.\n"
 "Error al enviar la contraseña: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"No se pudo conectar con el servidor POP %s.\n"
+"Error al enviar la contraseña: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "No existe la carpeta «%s»."
@@ -11218,7 +11691,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11316,7 +11790,8 @@ msgstr "El usuario no es local; se reenviará a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr ""
+"Acción solicitada del correo no realizada: el mailbox no está disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -11332,7 +11807,8 @@ msgstr "El usuario no es local; pruebe con <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr ""
+"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11396,7 +11872,8 @@ msgstr "El comando STARTTLS ha fallado"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11414,93 +11891,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Envío de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "No se pudo enviar el mensaje: servicio no conectado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "No se pudo enviar el mensaje: no hay destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "No se pudo enviar el mensaje: uno o más destinatarios inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Saludo del SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "El comando HELO ha fallado: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "El comando HELO ha fallado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Error al crear el objeto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "El comando AUTH ha fallado: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "El comando AUTH ha fallado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Respuesta de autenticación errónea desde el servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "El comando MAIL FROM ha fallado: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "El comando MAIL FROM ha fallado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "El comando RCPT TO ha fallado: %s: correo no enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falló RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "El comando DATA ha fallado: %s: correo no enviado"
@@ -11508,26 +11985,26 @@ msgstr "El comando DATA ha fallado: %s: correo no enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "El comando DATA ha fallado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "El comando RSET ha fallado: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "El comando RSET ha fallado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "El comando QUIT ha fallado: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "El comando QUIT ha fallado"
 
@@ -11590,70 +12067,6 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer.c:704
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
-"firma para esta cuenta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
-"cifrado para esta cuenta"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "No se pudo abrir el archivo"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "No se pudo obtener el mensaje del editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Mensaje sin título"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Abrir archivo"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Auto-generado"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Firma:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> archivo adjunto"
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Redactar un mensaje"
-
-#: composer/e-msg-composer.c:4270
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicar destino"
@@ -11734,21 +12147,95 @@ msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
+"firma para esta cuenta"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
+"cifrado para esta cuenta"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "No se pudo abrir el archivo"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "No se pudo obtener el mensaje del editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mensaje sin título"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir archivo"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Auto-generado"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Firma:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> archivo adjunto"
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Redactar un mensaje"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mensaje reenviado - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Adjuntar mensaje original"
+msgstr[1] "Adjuntar mensaje original"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
+msgstr ""
+"El archivo «{0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #. mail-composer:attach-directory primary
 #: composer/mail-composer-errors.xml.h:8
@@ -11764,18 +12251,32 @@ msgstr ""
 "Para adjuntar el contenido de este directorio, o adjunte individualmente "
 "cada archivo, o cree un archivo comprimido del directorio y adjúntelo."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "No se pudo crear un mensaje."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Porque «{1}»"
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Se encontraron mensajes no terminados"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "¿Quiere recuperar los mensajes no terminados?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11783,38 +12284,39 @@ msgstr ""
 "Evolution terminó inesperadamente mientras estaba redactando un mensaje "
 "nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "No recuperar"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recuperar"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "No se pudo autoguardar el archivo «{0}»"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error al autoguardar debido a «{1}»."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensaje modificado"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11824,64 +12326,49 @@ msgstr ""
 "permanentemente, a no ser que elija guardar el mensaje en la carpeta "
 "«Borradores». Esto le permitirá continuar el mensaje más tarde."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Descartar cambios"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Guardar mensaje"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "No se pudo crear un mensaje."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
-msgstr "Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
+msgstr ""
+"Debido a «{0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "No se pudo leer el archivo de firma «{0}»."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Porque «{1}»"
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Todas las cuentas han sido eliminadas."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Necesita configurar una cuenta antes de poder escribir correo."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "No se pudo crear la ventana de redacción."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "No se pudo activar el control de selección de direcciones."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12044,16 +12531,12 @@ msgstr "Sincr. de categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12105,31 +12588,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12206,10 +12681,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Selecciones una hora con la que comparar"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "Reglas para los _filtros"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12226,7 +12697,6 @@ msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Debe especificar un nombre de archivo."
@@ -12236,173 +12706,42 @@ msgstr "Debe especificar un nombre de archivo."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "El archivo «{0}» no existe o no es un archivo regular."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Falta la carpeta."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Debe especificar una carpeta."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Error en la expresión regular «{0}»."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "No se puede compilar la expresión regular «{1}»."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Falta el nombre."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Debes dar un nombre a este filtro."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Debe dar un nombre a esta carpeta virtual."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "El nombre «{0}» ya se está usando."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Elija otro nombre."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "No se ha seleccionado ningún origen."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"Debe especificar al menos una carpeta como origen.\n"
-"Hágalo seleccionando las carpetas individualmente, y/o \n"
-"seleccionando todas las carpetas locales, todas las carpetas\n"
-"remotas, o ambas."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Elija un archivo"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Entonces</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Seleccionar carpeta"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Reglas para los _filtros</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Fuentes de la carpeta virtual</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Entrando"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"La fecha del mensaje será comparada contra las\n"
-"12:00am de la fecha especificada aquí."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"La fecha del mensaje será comparada con una\n"
-"fecha relativa al momento de ejecutar el filtro."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"La fecha del mensaje será comparada con la\n"
-"fecha actual cuando el filtrado se realice."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "una fecha relativa al momento actual"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "hace"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meses"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "sólo carpetas especificadas"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "la fecha actual"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "Una fecha a especificar"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "con todas las carpetas remotas activas"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "con todas las carpetas locales y remotas activas"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "con todas las carpetas locales"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "años"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
@@ -12466,6 +12805,70 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Reglas para los _filtros</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Entrando"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La fecha del mensaje será comparada contra las\n"
+"12:00am de la fecha especificada aquí."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La fecha del mensaje será comparada con una\n"
+"fecha relativa al momento de ejecutar el filtro."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La fecha del mensaje será comparada con la\n"
+"fecha actual cuando el filtrado se realice."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "una fecha relativa al momento actual"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "hace"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundos"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "la fecha actual"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "Una fecha a especificar"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "años"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Añadir regla"
@@ -12478,58 +12881,71 @@ msgstr "Editar regla"
 msgid "Rule name"
 msgstr "Nombre de la regla"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Reglas de _puntuación"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferencias del editor"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "El cuerpo contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure las preferencias de correo incluyendo seguridad y visualización de "
+"mensajes, aquí"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "El cuerpo no contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure la ortografía, firmas y el editor de mensajes aquí"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "El cuerpo o el asunto contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure sus cuentas de correo aquí"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "El mensaje contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Correo de Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "El destinatario contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Control de configuración de cuentas de correo de Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "El remitente contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Componente de correo de Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "El asunto contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Redactor de correo de Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "El asunto no contiene"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Control de configuración del redactor de correo de Evolution"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Carpetas _virtuales"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Control de preferencias de Evolution"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Añadir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Correo"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Origen de la carpeta virtual"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Opciones de correo"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "Co_rreo"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12561,45 +12977,305 @@ msgstr "Añadir firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "Reglas para los _filtros"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Seleccionar carpeta"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajustar puntuación"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Asignar color"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Asignar puntuación"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Pitar"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contiene"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copiar a la carpeta"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Fecha de recepción"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Fecha de envío"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Borrado"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "no contiene"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "no acaba en"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "no existe"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "no devuelve"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "no suena como"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "no comienza por"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "No existen"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Borrador"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "acaba en"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existen"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expresión"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Seguimiento"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "es"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "está después de"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "está antes de"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "está marcado"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "es mayor que"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "es menor que"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "no es"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "no está marcado"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Test de correo Spam"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiquetar"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Lista de correo"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Cuerpo del mensaje"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Cabecera del mensaje"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "El mensaje es Spam"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "El mensaje no es Spam"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Mover a la carpeta"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Encauzar al programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Reproducir un sonido"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Leído"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinatarios"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Expresión regular"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Respondió a"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "devuelve"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "devuelve mayor que"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "devuelve menor que"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Ejecutar programa"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuación"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Remitente"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Poner estado"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamaño (Kib)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "suena como"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Cuenta origen"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Cabecera específica"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "comienza por"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Parar el proceso"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Asunto"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Quitar estado"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Entonces</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear una carpeta _virtual de la búsqueda..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Propiedades de la carpeta"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propiedades"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nombre de la carpeta"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Mensajes en total"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Mensajes en total"
+msgstr[1] "Mensajes en total"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Mensajes no leídos"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mensajes no leídos"
+msgstr[1] "Mensajes no leídos"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12609,8 +13285,8 @@ msgstr "<pulse aquí para seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2309
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
@@ -12622,444 +13298,276 @@ msgstr "Crear"
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Carpetas virtuales"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NO COINCIDENTE"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo carpeta %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2309 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2498
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2500
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2571 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2572
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2576
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Mover..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2581
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2584
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: mail/em-folder-tree.c:2587 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Carpetas virtuales"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NO COINCIDENTE"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Cargando..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Correo"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Se_guimiento..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_car como leído"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marcar como _Spam"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _no spam"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver a la carpeta..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiquetar"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltrar spam"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Responder a"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Cco"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Asunto"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Fecha"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupos de noticias"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s adjunto"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Formato de firma no soportado"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Error al verificar la firma"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Error desconocido al verificar la firma"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Obteniendo «%s»"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "No firmado"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Firma válida"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Firma no válida"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Firma válida, pero no se puede verificar el remitente"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Descifrado"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Cifrado, débil"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Cifrado"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Cifrado, fuerte"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Parte externa al cuerpo del mensaje mal escrita."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Puntero a archivo local (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Puntero a sitio FTP (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formateando el mensaje"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Transporte"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "No firmado"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13067,7 +13575,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Firma válida"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13075,7 +13587,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Firma no válida"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13083,11 +13599,11 @@ msgstr ""
 "La firma de este mensaje no puede ser verificada, pudo haber sido alterada "
 "en tránsito."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13095,7 +13611,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no pudo ser verificado."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Descifrado"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13103,7 +13623,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede ser visto en tránsito a "
 "través de Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Cifrado, débil"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13113,7 +13637,11 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13121,7 +13649,11 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Cifrado, fuerte"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13131,39 +13663,161 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Obteniendo «%s»"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Firma válida, pero no se puede verificar el remitente"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Parte externa al cuerpo del mensaje mal escrita."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Puntero a archivo local (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Puntero a sitio FTP (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formateando el mensaje"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Responder a"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Cco"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Transporte"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Fecha"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Grupos de noticias"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s adjunto"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrado)"
@@ -13273,7 +13927,7 @@ msgstr "E_nviar un mensaje a..."
 msgid "_Add to Addressbook"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -13320,11 +13974,23 @@ msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Carpetas _virtuales"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Añadir"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Origen de la carpeta virtual"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Reconocimiento automático de enlaces"
@@ -13571,7 +14237,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -13648,7 +14315,8 @@ msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
 #: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
 #: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
@@ -13798,63 +14466,33 @@ msgstr "puerto para iniciar el spamd ejecutado por el usuario"
 msgid "spamd port"
 msgstr "puerto spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Preferencias del editor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure la ortografía, firmas y el editor de mensajes aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure sus cuentas de correo aquí"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Correo de Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-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:8
-msgid "Evolution Mail component"
-msgstr "Componente de correo de Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador de Elm de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Redactor de correo de Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador de correo de Netscape de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Control de configuración del redactor de correo de Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador de Evolution para Outlook Express 4"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Control de preferencias de Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuentas de correo"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador de mbox de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Opciones de correo"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "Co_rreo"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13912,34 +14550,6 @@ msgstr "Importando «%s»"
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador de Elm de Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador de correo de Netscape de Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador de Evolution para Outlook Express 4"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Importador de Pine de Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importador de mbox de Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14109,91 +14719,83 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d spam"
 msgstr[1] "%d spams"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] ", %d no leído"
 msgstr[1] ", %d no leídos"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallo al actualizar la configuración de correo o carpetas."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Comprobando el servicio"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Conectando al servidor..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidad"
@@ -14257,14 +14859,22 @@ 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:895
+msgid "Checking Service"
+msgstr "Comprobando el servicio"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectando al servidor..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Comprobar tipos soportados "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Vista previa</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL no está soportado en esta compilación de Evolution</b>"
@@ -14279,7 +14889,8 @@ msgstr "<b>_Idiomas</b>"
 
 #: mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+msgstr ""
+"<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
 
 #: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -14515,9 +15126,10 @@ msgstr "No citar el mensaje original"
 
 #: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hecho"
 
@@ -14855,6 +15467,122 @@ msgstr " "
 msgid "description"
 msgstr "descripción"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Por favor, lea cuidadosamente el acuerdo de licencia\n"
+"para %s mostrado abajo\n"
+"y marque la casilla para aceptarlo.\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Fuentes de la carpeta virtual</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Firma digital</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Cifrado</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Aceptado"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Terminad_o"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Sensible a mayúsculas"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Buscar en mensaje"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Buscar:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Marcar para seguimiento"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Suscripciones de carpetas"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Acuerdo de Licencia %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ninguno seleccionado"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_ervidor:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Información de seguridad"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
+"Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lista de licencias aceptadas"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Vence el:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Marcar:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Suscribir"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Des_uscribir"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "sólo carpetas especificadas"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "con todas las carpetas remotas activas"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "con todas las carpetas locales y remotas activas"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "con todas las carpetas locales"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14876,6 +15604,7 @@ msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14922,7 +15651,6 @@ msgstr ""
 "destinatarios una idea de qué trata su correo."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
@@ -14959,8 +15687,10 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+"El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
@@ -15000,7 +15730,6 @@ msgstr ""
 "la carpeta «{0}»?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
@@ -15029,6 +15758,7 @@ msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15051,8 +15781,8 @@ msgid ""
 msgstr ""
 "El mensaje fue enviado por medio de la aplicación externa «sendmail». "
 "Sendmail informa el siguiente error: status 67: mail not sent.\n"
-"El mensaje está almacenado en la carpeta de Salida. Compruebe si el mensaje tiene "
-"errores y reenvíe."
+"El mensaje está almacenado en la carpeta de Salida. Compruebe si el mensaje "
+"tiene errores y reenvíe."
 
 #. mail:async-error primary
 #: mail/mail-errors.xml.h:62
@@ -15074,21 +15804,6 @@ msgstr "Error al efectuar operación."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15105,8 +15820,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "No se pudo guardar al directorio «{0}»."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15143,7 +15856,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15177,16 +15889,15 @@ msgstr ""
 "permanentemente."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
@@ -15194,25 +15905,21 @@ msgid "Because \"{2}\"."
 msgstr "Porque «{2}»"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "No se pudo abrir el origen «{2}»"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "No se pudo abrir el destino «{2}»."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
@@ -15228,7 +15935,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "No se pudo abrir el origen «{1}»"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "No se puede guardar los cambios en la cuenta."
@@ -15259,8 +15965,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "No borrar"
+msgstr "_Recuperar"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15289,6 +15996,7 @@ msgstr "¿Descartar los cambios?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "¿Desea guardar los cambios?"
 
@@ -15360,13 +16068,45 @@ msgstr ""
 "«{1}»\n"
 "Y han sido actualizadas."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Falta la carpeta."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Debe especificar una carpeta."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Debe dar un nombre a esta carpeta virtual."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "No se ha seleccionado ningún origen."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"Debe especificar al menos una carpeta como origen.\n"
+"Hágalo seleccionando las carpetas individualmente, y/o \n"
+"seleccionando todas las carpetas locales, todas las carpetas\n"
+"remotas, o ambas."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problema al migrar la carpeta antigua de correo «{0}»."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15378,15 +16118,15 @@ msgstr ""
 "Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o "
 "salir.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Sobreescribir"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Agregar"
 
@@ -15547,7 +16287,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Guardando adjunto"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15556,45 +16296,21 @@ msgstr ""
 "No se pudo crear el archivo de salida: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No se pudo escribir datos: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectar a %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Sensible a mayúsculas"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Buscar en mensaje"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Buscar:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Firma digital</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Cifrado</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Información de seguridad"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelando..."
@@ -15702,15 +16418,15 @@ msgstr "Actualizando carpetas virtuales para %s: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Actualizando carpetas virtuales para «%s»"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
@@ -15830,10 +16546,6 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Leído"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -15846,49 +16558,49 @@ msgstr "Responder a todos"
 msgid "Review"
 msgstr "Revisar"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Marcar para seguimiento"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "El cuerpo contiene"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Terminad_o"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "El cuerpo no contiene"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Los mensajes que ha seleccionado para seguir se listan abajo.\n"
-"Por favor, seleccione una acción de seguimiento desde el menú «Marcar»."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "El cuerpo o el asunto contiene"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Vence el:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "El mensaje contiene"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Marcar:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "El destinatario contiene"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Suscripciones de carpetas"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "El remitente contiene"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ninguno seleccionado"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "El asunto contiene"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_ervidor:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "El asunto no contiene"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Suscribir"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Intérprete de Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Des_uscribir"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Prueba de Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Componente de Prueba de Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15931,8 +16643,10 @@ msgstr ""
 "desarrollo de Evolution no se mostrará."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Toolbar is visible"
@@ -15954,30 +16668,17 @@ msgstr "Indica si debe saltar el diálogo de advertencia de desarrollo"
 msgid "mail"
 msgstr "correo"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KiB"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Conexiones activas</b>"
 
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Error de sistema desconocido."
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Conexiones activas"
 
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "No se pudo registrar en OAF"
-
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "No se encontró la base de datos de configuración"
-
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Error genérico"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16147,7 +16848,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -16161,26 +16863,10 @@ msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution está conectado.  Pulse este botón para trabajar desconectado."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution está en proceso de desconectarse."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado.  Pulse este botón para trabajar conectado."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Cambiar a %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
 #: shell/e-shell-window-commands.c:74
 #, c-format
@@ -16211,10 +16897,96 @@ msgstr "_Trabajar desconectado"
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution está conectado.  Pulse este botón para trabajar desconectado."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está en proceso de desconectarse."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution está desconectado.  Pulse este botón para trabajar conectado."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Cambiar a %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KiB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Error de sistema desconocido."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "No se pudo registrar en OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "No se encontró la base de datos de configuración"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Error genérico"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Nuevo"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Asistente de configuración de Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importando archivos"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Zona horaria "
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Bienvenido"
+
+#: shell/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 ""
+"Bienvenido a Evolution. Las siguientes pantallas permitirán \n"
+"a Evolution conectarse a sus cuentas de correo, e importar \n"
+"archivos desde otras aplicaciones. \n"
+"\n"
+"Por favor pulse el botón «Siguiente» para continuar. "
+
+#: shell/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 ""
+"Ha introducido toda la información necesaria para\n"
+"configurar Evolution. \n"
+"\n"
+"Pulse el botón «Aplicar» para guardar su configuración. "
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Prueba nueva"
@@ -16227,18 +16999,6 @@ msgstr "_Prueba"
 msgid "Create a new test item"
 msgstr "Crea una elemento de prueba nuevo"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Intérprete de Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Prueba de Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Componente de Prueba de Evolution"
-
 #: 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. "
@@ -16298,7 +17058,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16333,7 +17093,7 @@ msgstr ""
 "\n"
 "Esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16341,39 +17101,39 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la re-emigración desde Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16382,6 +17142,110 @@ msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
 "  use %s --help para más información\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr "Espacio de disco insuficiente para la actualización."
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"La actualización de sus datos y configuración requerirá hasta  {0} de "
+"espacio de disco, pero sñolo tiene {1} disponibles.\n"
+"\n"
+"Necesitará hacer más espacio libre en su directorio personal antes de que "
+"pueda continuar."
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+"La actualización desde la versión anterior ha fallado:\n"
+"{0}"
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Si elige continuar, quizá no tenga acceso a algunos de sus datos antiguos.\n"
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr "Continuar"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr "No se pudo iniciar Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+msgstr "Evolution no pudo iniciar."
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+"Su configuración del sistema no coincide con su configuración de Evolution.\n"
+"\n"
+"Pulse en ayuda para más detalles"
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"La configuración de su sistema no coincide con su configuración de "
+"Evolution:\n"
+"\n"
+"{0}\n"
+"\n"
+"Pulse en la ayuda para los detalles."
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16608,7 +17472,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
@@ -16625,6 +17490,11 @@ msgstr "Sus certificados"
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "El certificado ya existe"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16824,11 +17694,6 @@ msgstr "ID único del propósito"
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "El certificado ya existe"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Contraseña para el archivo PKCS12"
@@ -16968,8 +17833,8 @@ msgstr "Ver el contacto actual"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "A_cciones"
@@ -17315,7 +18180,8 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -17374,8 +18240,10 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -17443,16 +18311,6 @@ msgstr "_Invertir selección"
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes por conversaciones"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Cerrar esta ventana"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Cerrar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta de direcciones"
@@ -17853,6 +18711,16 @@ msgstr "_Herramientas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Cerrar esta ventana"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Cerrar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Adjuntar"
@@ -17935,10 +18803,6 @@ msgstr "Guardar el archivo actual con un nombre diferente"
 msgid "Save the message in a specified folder"
 msgstr "Guardar el mensaje en una carpeta específica"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Enviar"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18493,7 +19357,8 @@ msgstr "Consulta de Evolution"
 #. setup a dummy error
 #: widgets/misc/e-error.c:417
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Error interno, solicitado un error desconocido «%s»</"
 "span>"
@@ -18641,6 +19506,197 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Credenciales de autenticación para el servidor HTTP"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Agendas seleccionadas para publicación"
+
+#~ msgid "Login name:"
+#~ msgstr "Nombre de inicio de sesión:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "El usuario publica"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "No se pudo inicializar wombat"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "La agenda selaccionada es de sólo lectura, no pueden crearse eventos. Por "
+#~ "favor, seleccione una agenda de lectura-escritura."
+
+#~ msgid "C_alendar"
+#~ msgstr "_Agenda"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opciones de los avisos audibles"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opciones de los avisos de mensajes"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opciones de los avisos por correo-e"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opciones de los avisos de programas"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opciones de avisos desconocidos"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetición de alarma"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Mensaje a mostrar:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Mensaje a enviar"
+
+#~ msgid "Play sound:"
+#~ msgstr "Reproducir un sonido:"
+
+#~ msgid "Run program:"
+#~ msgstr "Ejecutar programa:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Con estos argumentos:"
+
+#~ msgid "Basics"
+#~ msgstr "Básicos"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Fecha/Hora:"
+
+#~ msgid "Reminders"
+#~ msgstr "Recordatorios"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opciones..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Libreta de direcciones..."
+
+#~ msgid "Reminder"
+#~ msgstr "Recordatorio"
+
+#~ msgid "B_usy"
+#~ msgstr "Oc_upada"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidencial"
+
+#~ msgid "Date & Time"
+#~ msgstr "Fecha y hora"
+
+#~ msgid "F_ree"
+#~ msgstr "Lib_re"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vado"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pú_blico"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Añadir _participante"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Añadir asistentes desde la libreta de direcciones."
+
+#~ msgid "Exceptions"
+#~ msgstr "Excepciones"
+
+#~ msgid "Preview"
+#~ msgstr "Vista previa"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regla de repetición"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Repeti_ción personalizada"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modificar"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Si_n repetición"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Repetición _simple"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Terminado"
+
+#~ msgid "Progress"
+#~ msgstr "Progreso"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidencial"
+
+#~ msgid "Folder:"
+#~ msgstr "Carpeta:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Hubo un error en el sistema CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "El objeto no pudo encontrarse\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "No tiene los permisos necesarios para actualizar la agenda\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "El estado de asistencia no pudo ser actualizado.\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Añadir asistente desde libreta de direcciones"
+
+#~ msgid "_Options"
+#~ msgstr "_Opciones"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Hora de _inicio de la reunión:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Hora de _fin de la reunión:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "La lista de tareas seleccionada es de sólo lectura, los eventos no pueden "
+#~ "crearse. Seleccione una agenda con lectura-escritura."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "No se pudo encontrar un certificado para «%s»"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "No se puede crear un mensaje CMS"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "No se pudo crear un contexto codificación"
+
+#~ msgid "_Score Rules"
+#~ msgstr "Reglas de _puntuación"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nombre de la carpeta"
+
 #~ msgid "contact-list-editor"
 #~ msgstr "Editor de lista de contactos"
 
@@ -18685,15 +19741,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Checkbox"
 #~ msgstr "Casilla de verificación"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Conexiones activas</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Conexiones activas"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr "Pulse Aceptar para cerrar estas conexiones y quedar desconectado"
-
 #~ msgid "C_alendar:"
 #~ msgstr "_Agenda:"
 
@@ -18712,139 +19759,21 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Abrir carpeta de otro usuario"
 
-#~ msgid "_Account:"
-#~ msgstr "Cuent_a:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "Nombre de la _carpeta:"
 
 #~ msgid "_User:"
 #~ msgstr "_Usuario:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Asistente de configuración de Evolution"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importando archivos"
-
-#~ msgid "Timezone "
-#~ msgstr "Zona horaria "
-
-#~ msgid "Welcome"
-#~ msgstr "Bienvenido"
-
-#~ 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 ""
-#~ "Bienvenido a Evolution. Las siguientes pantallas permitirán \n"
-#~ "a Evolution conectarse a sus cuentas de correo, e importar \n"
-#~ "archivos desde otras aplicaciones. \n"
-#~ "\n"
-#~ "Por favor pulse el botón «Siguiente» para continuar. "
-
-#~ 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 ""
-#~ "Ha introducido toda la información necesaria para\n"
-#~ "configurar Evolution. \n"
-#~ "\n"
-#~ "Pulse el botón «Aplicar» para guardar su configuración. "
-
-#~ msgid "Insufficient disk space for upgrade."
-#~ msgstr "Espacio de disco insuficiente para la actualización."
-
-#~ msgid ""
-#~ "Upgrading your data and settings will require upto {0} of disk space, but "
-#~ "you only have {1} available.\n"
-#~ "\n"
-#~ "You will need to make more space available in your home directory before "
-#~ "you can continue."
-#~ msgstr ""
-#~ "La actualización de sus datos y configuración requerirá hasta  {0} de "
-#~ "espacio de disco, pero sñolo tiene {1} disponibles.\n"
-#~ "\n"
-#~ "Necesitará hacer más espacio libre en su directorio personal antes de que "
-#~ "pueda continuar."
-
-#~ msgid ""
-#~ "Upgrade from previous version failed:\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "La actualización desde la versión anterior ha fallado:\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "{1}\n"
-#~ "\n"
-#~ "If you choose to continue, you may not have access to some of your old "
-#~ "data.\n"
-#~ msgstr ""
-#~ "{1}\n"
-#~ "\n"
-#~ "Si elige continuar, quizá no tenga acceso a algunos de sus datos "
-#~ "antiguos.\n"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Cannot start Evolution"
-#~ msgstr "No se pudo iniciar Evolution."
-
-#~ msgid "Evolution can not start."
-#~ msgstr "Evolution no pudo iniciar."
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr ""
-#~ "Su configuración del sistema no coincide con su configuración de "
-#~ "Evolution.\n"
-#~ "\n"
-#~ "Pulse en ayuda para más detalles"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-#~ msgstr ""
-#~ "La configuración de su sistema no coincide con su configuración de "
-#~ "Evolution:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Pulse en la ayuda para los detalles."
-
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Falló al conectarse al servidor LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Falló al autenticarse con el servidor LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "No se pudo efectuar la consulta en la raíz DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "El servidor respondió con bases de búsqueda no soportadas"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Este servidor no soporta el esquema de información LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Error al obtener información del esquema"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "El servidor no respondió con una información del esquema válida"
-
 #~ msgid ""
 #~ "Some fields are no longer representable in the contact editor. Please "
 #~ "wait while Evolution copies those fields to the 'Notes' field..."
@@ -18926,9 +19855,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "item8"
 #~ msgstr "item8"
 
-#~ msgid "Category editor not available."
-#~ msgstr "No hay un editor de categorías disponible."
-
 #~ msgid "Do you want to save changes?"
 #~ msgstr "¿Desea guardar los cambios?"
 
@@ -18969,9 +19895,6 @@ msgstr "%s (%d%% completado)"
 #~ "El acontecimiento que está borrando es una reunión, ¿quiere que envíe un "
 #~ "aviso de cancelación?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "¿Seguro que quiere cancelar y borrar esta reunión?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -18989,42 +19912,15 @@ msgstr "%s (%d%% completado)"
 #~ "La entrada del diario que está borrando está publicada, ¿Quiere que envíe "
 #~ "un aviso de cancelación?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "¿Seguro que quiere cancelar y borrar esta entrada del diario?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "¿Seguro que quiere borrar la cita «%s»?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "¿Seguro que quiere borrar esta cita sin título?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "¿Seguro que quiere borrar la tarea «%s»?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "¿Seguro que quiere borrar esta tarea sin título?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "¿Seguro que quiere borrar %d cita?"
-#~ msgstr[1] "¿Seguro que quiere borrar %d citas?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "¿Seguro que quiere borrar %d tarea?"
-#~ msgstr[1] "¿Seguro que quiere borrar %d tareas?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "¿Seguro que quiere borrar %d entrada del diario?"
-#~ msgstr[1] "¿Seguro que quiere borrar %d entradas del diario?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Invitar a otros..."
 
@@ -19065,9 +19961,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "The calendar backend for '%s' has crashed."
 #~ msgstr "El backend de la agenda para %s se ha colgado."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "No se pudo obtener el artículo %s del servidor NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Publicación no permitida por el servidor de noticias"
 
@@ -19107,174 +20000,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Because \"${1}\"."
 #~ msgstr "Debido a «${1}»"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Ajustar puntuación"
-
-#~ msgid "Assign Color"
-#~ msgstr "Asignar color"
-
-#~ msgid "Assign Score"
-#~ msgstr "Asignar puntuación"
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
-
-#~ msgid "Beep"
-#~ msgstr "Pitar"
-
-#~ msgid "contains"
-#~ msgstr "contiene"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copiar a la carpeta"
-
-#~ msgid "Date received"
-#~ msgstr "Fecha de recepción"
-
-#~ msgid "Date sent"
-#~ msgstr "Fecha de envío"
-
-#~ msgid "Deleted"
-#~ msgstr "Borrado"
-
-#~ msgid "does not contain"
-#~ msgstr "no contiene"
-
-#~ msgid "does not end with"
-#~ msgstr "no acaba en"
-
-#~ msgid "does not exist"
-#~ msgstr "no existe"
-
-#~ msgid "does not return"
-#~ msgstr "no devuelve"
-
-#~ msgid "does not sound like"
-#~ msgstr "no suena como"
-
-#~ msgid "does not start with"
-#~ msgstr "no comienza por"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "No existen"
-
-#~ msgid "Draft"
-#~ msgstr "Borrador"
-
-#~ msgid "ends with"
-#~ msgstr "acaba en"
-
-#~ msgid "Exist"
-#~ msgstr "Existen"
-
-#~ msgid "exists"
-#~ msgstr "existe"
-
-#~ msgid "Expression"
-#~ msgstr "Expresión"
-
-#~ msgid "Follow Up"
-#~ msgstr "Seguimiento"
-
-#~ msgid "is"
-#~ msgstr "es"
-
-#~ msgid "is after"
-#~ msgstr "está después de"
-
-#~ msgid "is before"
-#~ msgstr "está antes de"
-
-#~ msgid "is Flagged"
-#~ msgstr "está marcado"
-
-#~ msgid "is greater than"
-#~ msgstr "es mayor que"
-
-#~ msgid "is less than"
-#~ msgstr "es menor que"
-
-#~ msgid "is not"
-#~ msgstr "no es"
-
-#~ msgid "is not Flagged"
-#~ msgstr "no está marcado"
-
-#~ msgid "Junk Test"
-#~ msgstr "Test de correo Spam"
-
-#~ msgid "Mailing list"
-#~ msgstr "Lista de correo"
-
-#~ msgid "Message Body"
-#~ msgstr "Cuerpo del mensaje"
-
-#~ msgid "Message Header"
-#~ msgstr "Cabecera del mensaje"
-
-#~ msgid "Message is Junk"
-#~ msgstr "El mensaje es Spam"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "El mensaje no es Spam"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Mover a la carpeta"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Encauzar al programa"
-
-#~ msgid "Play Sound"
-#~ msgstr "Reproducir un sonido"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinatarios"
-
-#~ msgid "Regex Match"
-#~ msgstr "Expresión regular"
-
-#~ msgid "Replied to"
-#~ msgstr "Respondió a"
-
-#~ msgid "returns"
-#~ msgstr "devuelve"
-
-#~ msgid "returns greater than"
-#~ msgstr "devuelve mayor que"
-
-#~ msgid "returns less than"
-#~ msgstr "devuelve menor que"
-
-#~ msgid "Run Program"
-#~ msgstr "Ejecutar programa"
-
-#~ msgid "Sender"
-#~ msgstr "Remitente"
-
-#~ msgid "Set Status"
-#~ msgstr "Poner estado"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamaño (Kib)"
-
-#~ msgid "sounds like"
-#~ msgstr "suena como"
-
-#~ msgid "Source Account"
-#~ msgstr "Cuenta origen"
-
-#~ msgid "Specific header"
-#~ msgstr "Cabecera específica"
-
-#~ msgid "starts with"
-#~ msgstr "comienza por"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Parar el proceso"
-
-#~ msgid "Unset Status"
-#~ msgstr "Quitar estado"
-
 #~ msgid "Brought to you by"
 #~ msgstr "Producido por"
 
@@ -19551,9 +20276,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Finished"
 #~ msgstr "Terminar"
 
-#~ msgid "Group:"
-#~ msgstr "Grupo:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20122,9 +20844,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "component"
 #~ msgstr "componente"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmas"
-
 #~ msgid "Geographical position"
 #~ msgstr "Posición geográfica"
 
@@ -20706,21 +21425,9 @@ msgstr "%s (%d%% completado)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Acción de la alarma</b>"
 
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Sonido de la alarma</b>"
-
-#~ msgid "<b>Basics</b>"
-#~ msgstr "<b>Básico</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Clasificación</b>"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Fecha y hora</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Descripción</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Resu_men</b>"
 
@@ -21123,9 +21830,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Recibiendo los resultados de la búsqueda LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Error efectuando búsqueda"
-
 #~ msgid "Repository is offline"
 #~ msgstr "Repositorio desconectado"
 
@@ -21258,9 +21962,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Motor de libreta de direcciones local/LDAP de Evolution"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Motor de agenda en archivo local de Evolution"
-
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Motor de libreta de direcciones local de Evolution"
 
@@ -21360,9 +22061,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Use Score"
 #~ msgstr "Usar puntuación"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "No se pudo cargar el cursor\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "La carpeta contiene información de contacto"
 
@@ -25027,9 +25725,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lago Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lago Hood"
 
@@ -25423,9 +26118,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27802,9 +28494,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "South Dakota"
 #~ msgstr "Dakota del Sur"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30037,9 +30726,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Shortcut..."
 #~ msgstr "_Atajo..."
 
-#~ msgid "Information"
-#~ msgstr "Información"
-
 #~ msgid "Error"
 #~ msgstr "Error"
 
@@ -30124,9 +30810,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_Signature editor"
 #~ msgstr "Editor de _firmas"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactos..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Fábrica para importar archivos LDIF en Evolution."
 
@@ -30535,4 +31218,3 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
-
diff --git a/po/et.po b/po/et.po
index 3c31592a99..8093052974 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution pre-2.0\n"
-"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-17 16:28+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -24,14 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolutioni aadressiraamat"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontakti päis:"
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolutioni minikaart"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "aktiivne aadressiraamatu kaust"
@@ -52,34 +44,273 @@ msgstr " kaarti"
 msgid " card"
 msgstr " kaart"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "kontakti päis:"
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolutioni minikaart"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kirje saatmine ebaõnnestus!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Autentimine %1 kaudu ebaõnnestus.\n"
+"Serveri vastus:\n"
+"%2"
+
+#  mail:camel-service-auth-failed secondary
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
+"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "IMAP serveri vastus ei sisaldanud %s infot"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Gruppide nimekirja serverist ei saadud."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Serveri vastus ei sisaldanud autoriseerimisinfot\n"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Aadressiraamatut ei õnnestunud laadida"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Kirjeldus puudub."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Salvesta aadressiraamatusse"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Viga vaikimisi aadressiraamatu laadimisel."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Puhverkausta pole võimalik töödelda"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Kas soovid tehtud muudatused salvestada?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Unusta"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "Konto muudatusi ei saa salvestada."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Vastuse analüüsimine ebaõnnestus."
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Viga kontakti lisamisel"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolutioni aadressiraamatu aadressikuva"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Vaikimisi sünkroniseerimisaadress:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Aadressiraamatut ei õnnestunud laadida"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+#, fuzzy
+msgid "*Control*F2"
+msgstr "Vahemälu-kontroll:"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Autentimine ebaõnnestus.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automaatne lõpetamine"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPalun sisesta %s parool (kasutaja %s)"
+#  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);
+#  Create the contacts group
+#  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);
+#  Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "K_ontaktid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikaadid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Seadista automaatlõpetamist siit"
+
+#  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);
+#  Create the contacts group
+#  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);
+#  Create the contacts group
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution'i aadressiraamat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolutioni aadressiraamatu aadressikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolutioni aadressiraamatu kaardikuva"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: 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 "Evolution folder settings configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -110,7 +341,8 @@ msgid "New Contacts Group"
 msgstr "Uus kontaktide grupp"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Kontaktide grupp"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -122,14 +354,12 @@ msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137
-#: mail/em-migrate.c:1160
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184
-#: mail/em-migrate.c:1201
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -143,14 +373,10 @@ msgstr "Siirdamine `%s':"
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
-#: calendar/gui/migration.c:446
-#: calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195
-#: mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246
-#: mail/mail-vfolder.c:218
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -161,16 +387,10 @@ msgstr "Kohalik arvuti"
 #  Create the default Person task list
 #  orange
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:454
-#: calendar/gui/migration.c:536
-#: filter/filter-label.c:123
-#: mail/em-migrate.c:1013
-#: mail/mail-config.c:78
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Isiklik"
@@ -191,11 +411,13 @@ msgstr "Automaatlõpetamise sätted"
 
 #: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -226,49 +448,45 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
-#: calendar/gui/calendar-component.c:430
-#: calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431
-#: calendar/gui/tasks-component.c:377
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Omadused..."
 
-#  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);
-#  Create the contacts group
-#  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);
-#  Create the contacts group
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktid"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Autentimine ebaõnnestus.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -279,75 +497,16 @@ msgid "Position of the vertical pane in main view"
 msgstr "Vertikaalpaani asukoht põhivaates"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid "The number of characters that must be typed before evolution will attempt to autocomplete"
-msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+"Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F2"
-msgstr "Vahemälu-kontroll:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Automaatne lõpetamine"
-
-#  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);
-#  Create the contacts group
-#  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);
-#  Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontaktid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikaadid"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Seadista automaatlõpetamist siit"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution'i aadressiraamat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolutioni aadressiraamatu aadressikuva"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolutioni aadressiraamatu kaardikuva"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: 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 "Evolution folder settings configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Siin saad hallata oma S/MIME sertifikaate"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -355,7 +514,7 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -363,10 +522,8 @@ msgstr "Siin saad hallata oma S/MIME sertifikaate"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
-#: mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1
-#: mail/message-tags.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -392,6 +549,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
@@ -426,8 +584,7 @@ msgstr "Lisa kontaktide grupp"
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-#: mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alati"
@@ -437,14 +594,11 @@ msgid "Anonymously"
 msgstr "Anonüümselt"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Peamine"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208
-#: mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Täpsustused"
 
@@ -463,8 +617,10 @@ msgstr "E-posti aadress:"
 # !PARANDA! - sõnasus on kuidagi mäda
 #: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
@@ -472,13 +628,11 @@ msgstr "Leia võimalikud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86
-#: smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-#: mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mitte kunagi"
@@ -506,25 +660,38 @@ msgstr "Otsingu ulatus:"
 
 #: addressbook/gui/component/ldap-config.glade.h:31
 #, fuzzy
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
-"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult siis\n"
+"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
+"siis\n"
 "kui LDAP server toetab SSL või TLS protokolli."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 #, fuzzy
-msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
-msgstr ""
-"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled\n"
-"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüri taga,\n"
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
+msgstr ""
+"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
+"ainult siis kui sa oled\n"
+"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad "
+"mõlemad tulemüüri taga,\n"
 "siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus\n"
 "on juba turvaline."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
-msgid "Selecting this option means that your server does not support either SSL or TLS.  This means that your connection will be insecure, and that you will be vulnerable to security exploits. "
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
-"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. Seega\n"
+"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. "
+"Seega\n"
 "on sinu ühendus ebaturvaline ja sa võid olla turvaaukude\n"
 "tõttu ohus."
 
@@ -537,32 +704,54 @@ msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:36
-msgid "The search base is the distinguished name (DN)  of the entry where your searches will begin. If you leave this blank, the search will begin at the root of the directory tree."
+msgid ""
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:37
-msgid "The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base."
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:38
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
 #: addressbook/gui/component/ldap-config.glade.h:39
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:40
-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 "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
+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 ""
+"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
+"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
+"toetama anonüümset ligipääsu."
 
 #: addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:42
 #, fuzzy
-msgid "This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify."
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. \n"
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
@@ -580,8 +769,7 @@ msgstr "Eraldusnime (DN) kasutamine"
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
-#: mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
@@ -613,8 +801,7 @@ msgid "_Log in:"
 msgstr "Logi sellest hoolimata sisse"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#: mail/mail-config.glade.h:171
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -645,34 +832,27 @@ msgid "cards"
 msgstr "kaardid"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#: filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutit"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Kontaktide valimine aadressiraamatust"
+#: 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:208
+msgid "Remove All"
+msgstr "Eemalda kõik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eemalda"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eemalda kõik"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Kuva Kontaktiloend"
@@ -687,7 +867,7 @@ msgid "Send HTML Mail?"
 msgstr "Saata HTML sõnum?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Lisa kontaktide hulka"
 
@@ -695,16 +875,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Allikas"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Kontaktide valimine aadressiraamatust"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -726,6 +912,11 @@ msgstr "Kate_gooria:"
 msgid "_Find"
 msgstr "_Otsi"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Otsing"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -769,7 +960,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -791,7 +982,6 @@ msgid "Birthday:"
 msgstr "Sünnipäev:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -804,7 +994,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -812,7 +1002,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -907,11 +1097,9 @@ msgstr "Logi välja"
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122
-#: mail/em-migrate.c:1012
-#: mail/mail-config.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Töö"
@@ -933,22 +1121,6 @@ msgstr "_Salvesta kui:"
 msgid "_Where:"
 msgstr "_Kus:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada need kontaktid?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Kas sa tõesti soovid\n"
-"kustutada seda kontakti?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -956,16 +1128,16 @@ msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigeeritav"
 
@@ -1937,124 +2109,124 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL kiirsuhtlusklient"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "Groupwise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Teenus"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Asukoht"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Kasutajanimi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Kodu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
 #  Create the selector
 #  Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Kustuta valitud kontaktid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Otsimisvahemik ei ole sobiv."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Vigane kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-msgid "The contact cannot be saved to the selected address book. Do you want to discard changes?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "_Unusta"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
-msgid "You are moving the contact from one address book to another, but it cannot be removed from the source. Do you want to save a copy instead?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL kiirsuhtlusklient"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Kiirsuhtlusklient"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Teenus"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Asukoht"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Kasutajanimi"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakti kiirlisamine"
@@ -2072,6 +2244,22 @@ msgstr "_Täisnimi:"
 msgid "E-_mail:"
 msgstr "E-Post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Aadress _2:"
@@ -2231,7 +2419,6 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Kirjuta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11
 #: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
@@ -2239,9 +2426,9 @@ msgstr "dialog1"
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Raamat"
 
@@ -2302,404 +2489,22 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(kaart)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "kaart"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:526
-msgid "List Members"
-msgstr "Nimekirja liikmed"
-
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisatsioon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "Position"
-msgstr "Ametikoht"
-
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Video Conferencing"
-msgstr "Videokonverents"
-
-#: addressbook/gui/widgets/eab-contact-display.c:348
-#: addressbook/gui/widgets/eab-contact-display.c:363
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:349
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:353
-msgid "work"
-msgstr "töö"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:361
-#: addressbook/gui/widgets/eab-contact-display.c:580
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiiltelefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:368
-msgid "personal"
-msgstr "isiklik"
-
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Märkus"
-
-#: addressbook/gui/widgets/eab-contact-display.c:541
-msgid "Job Title"
-msgstr "Ametinimetus"
-
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Home page"
-msgstr "Kodulehekülg"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Õnnestus"
-
-#  E_BOOK_ERROR_INVALID_ARG
-#  E_BOOK_ERROR_BUSY
-#  E_BOOK_ERROR_INVALID_ARG
-#  E_BOOK_ERROR_BUSY
-#  E_BOOK_ERROR_INVALID_ARG
-#  E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-#, fuzzy
-msgid "Backend busy"
-msgstr "Kataloog on töös"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Hoidla offlain"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Aadressiraamatut ei eksisteeri"
-
-#  E_BOOK_ERROR_NO_SELF_CONTACT
-#  E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Ühtegi valikut pole määratud"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Juurdepääs keelatud"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kontakti ei leitud"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Kontakti ID on juba olemas"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Mitte toetatud protokoll"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/print.c:2349
-#: camel/camel-service.c:728
-#: camel/camel-service.c:766
-#: camel/camel-service.c:850
-#: camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Katkestatud"
-
-#  E_BOOK_ERROR_COULD_NOT_CANCEL
-#  E_BOOK_ERROR_COULD_NOT_CANCEL
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Kuulamist ei õnnestunud peatada"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Autentimine ebaõnnestus."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Autentimine on vajalik"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS ei ole kättesaadav"
-
-#  E_BOOK_ERROR_CORBA_EXCEPTION
-#  E_BOOK_ERROR_NO_SUCH_SOURCE
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "%s: sellist partitsiooni ei ole\n"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Muu viga"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
-msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution, you must install an LDAP-enabled Evolution package."
-msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "See päring ei lõpetanud edukalt."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Viga listi lisamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Viga kontakti lisamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Viga listi muutmisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Viga kontakti muutmisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Viga listi eemaldamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Viga kontakti eemaldamisel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 kontakti avamisega kaasneb %d uue akna avamine.\n"
-"Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s on juba olemas\n"
-"Kas soovid üle kirjutada?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Kirjuta üle"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "kaart.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "nimekiri"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Liiguta kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Kopeeri kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Liiguta kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Kopeeri kontaktid"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Vali sihtaadressiraamat."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Mitu VKaarti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VKaart %s kohta"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(puudub)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Peamine e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vali tegevus"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Loo uus kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pöördumine aadressiraamatu poole..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Muuda kontakti andmeid"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Ühenda e-posti aadressid"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, c-format
-msgid "Show Full VCard"
-msgstr "Kogu VKaardi kuvamine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Kompaktse VKaardi näitamine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Salvesta aadressiraamatusse"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Kontakte pole"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakte pole"
+msgstr[1] "Kontakte pole"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#, c-format
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Päring"
 
@@ -2716,31 +2521,31 @@ msgstr "Mudel"
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Nimi algab stringiga"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
@@ -2748,105 +2553,97 @@ msgstr "Edasijõudnutele..."
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102
-#: calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16
-#: ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80
-#: ui/evolution-tasks.xml.h:14
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428
-#: calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Käesolev vaade"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Suvaline kategooria"
@@ -2880,8 +2677,8 @@ msgid "Car Phone"
 msgstr "Autotelefon"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
 #: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Kategooriad"
 
@@ -2889,6 +2686,21 @@ msgstr "Kategooriad"
 msgid "Company Phone"
 msgstr "Firma telefon"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-post 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Perekonnanimi"
@@ -2925,14 +2737,29 @@ msgstr "Päevik"
 msgid "Manager"
 msgstr "Juht"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiiltelefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Hüüdnimi"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Märkus"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisatsioon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faks"
@@ -2984,31 +2811,22 @@ msgstr "Ühik"
 msgid "Web Site"
 msgstr "Koduleht"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Laius"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Kõrgus"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 #, fuzzy
 msgid "Has Focus"
 msgstr "Fookuse käitumine"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valitud"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Vilkuv kursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Väli"
@@ -3027,7 +2845,11 @@ msgstr "CPU mudel"
 msgid "Max field name length"
 msgstr "Maks. erinevus lausepikkustes:"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Veeru laius"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3041,7 +2863,7 @@ msgstr ""
 "\n"
 "Uue kontakti lisamiseks tee siin topeltklõps."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3051,13 +2873,396 @@ msgstr ""
 "\n"
 "Selles vaates kirjed puuduvad."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Veeru laius"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valitud"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Vilkuv kursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(kaart)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "kaart"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Nimekirja liikmed"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Ametikoht"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Videokonverents"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "töö"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "isiklik"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Ametinimetus"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Kodulehekülg"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Õnnestus"
+
+#  E_BOOK_ERROR_INVALID_ARG
+#  E_BOOK_ERROR_BUSY
+#  E_BOOK_ERROR_INVALID_ARG
+#  E_BOOK_ERROR_BUSY
+#  E_BOOK_ERROR_INVALID_ARG
+#  E_BOOK_ERROR_BUSY
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+#, fuzzy
+msgid "Backend busy"
+msgstr "Kataloog on töös"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Hoidla offlain"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Aadressiraamatut ei eksisteeri"
+
+#  E_BOOK_ERROR_NO_SELF_CONTACT
+#  E_BOOK_ERROR_NO_SELF_CONTACT
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Ühtegi valikut pole määratud"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Juurdepääs keelatud"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontakti ei leitud"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Kontakti ID on juba olemas"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Mitte toetatud protokoll"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Katkestatud"
+
+#  E_BOOK_ERROR_COULD_NOT_CANCEL
+#  E_BOOK_ERROR_COULD_NOT_CANCEL
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Kuulamist ei õnnestunud peatada"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autentimine ebaõnnestus."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Autentimine on vajalik"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS ei ole kättesaadav"
+
+#  E_BOOK_ERROR_CORBA_EXCEPTION
+#  E_BOOK_ERROR_NO_SUCH_SOURCE
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "%s: sellist partitsiooni ei ole\n"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Muu viga"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja "
+"kas sul on sellele vajalikud ligipääsuõigused."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase "
+"URI või kasutatav LDAP serverei ole kättesaadav."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid "
+"Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku "
+"kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid "
+"vale URI või kasutatav serverei ole kättesaadav."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "See päring ei lõpetanud edukalt."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Viga listi lisamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Viga kontakti lisamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Viga listi muutmisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Viga kontakti muutmisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Viga listi eemaldamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Viga kontakti eemaldamisel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 kontakti avamisega kaasneb %d uue akna avamine.\n"
+"Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s on juba olemas\n"
+"Kas soovid üle kirjutada?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "kaart.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "nimekiri"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Liiguta kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Kopeeri kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Liiguta kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Kopeeri kontaktid"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Vali sihtaadressiraamat."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Mitu VKaarti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VKaart %s kohta"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(puudub)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Peamine e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Vali tegevus"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Loo uus kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lisa aadress olemasolevale kontaktile \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Pöördumine aadressiraamatu poole..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Muuda kontakti andmeid"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Ühenda e-posti aadressid"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "Saada kontaktile sõnum"
+msgstr[1] "Saada kontaktile sõnum"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Kogu VKaardi kuvamine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Kompaktse VKaardi näitamine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Salvesta aadressiraamatusse"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3067,18 +3272,18 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 #, fuzzy
 msgid "Reflow Test"
 msgstr "Html test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Autoriõigus (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3102,6 +3307,11 @@ msgstr "Evolutioni VKaardi importija"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VKaart (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Trüki ümbrik"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Prindi kontaktid"
@@ -3111,11 +3321,6 @@ msgstr "Prindi kontaktid"
 msgid "Print contact"
 msgstr "Prindi kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Trüki ümbrik"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktine Tahoma"
@@ -3302,6 +3507,22 @@ msgstr "Testlehekülje trükkimine"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Faili ei saa avada"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "ei õnnestu lugeda alglaadimise aega"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Faili '%s' avamine ebaõnnestus: %s"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 #, fuzzy
 msgid "Specify the output file instead of standard output"
@@ -3329,7 +3550,8 @@ msgid "Export in asynchronous mode "
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3337,7 +3559,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3356,22 +3579,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Võimatu sisemine viga."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Faili ei saa avada"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "ei õnnestu lugeda alglaadimise aega"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Faili '%s' avamine ebaõnnestus: %s"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Viga vaikimisi aadressiraamatu laadimisel."
@@ -3388,8 +3595,276 @@ msgstr "Failinime ei esitatud."
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:44
-#: calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ära kustuta"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Saaja"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada need kontaktid?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Kokkusaamine"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Kas soovid tehtud muudatused salvestada?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
+"redaktorit?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Loobu muudatustest"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Salvesta sõnum"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Saada"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+# !PARANDA!
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution'i vKalendri importija"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3399,14 +3874,12 @@ msgid "Split Multi-Day Events:"
 msgstr "Mitmepäevaste sündmuste osadeks jagamine:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Ei saa käivitada wombat serverit"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "EI saa käivitada wombatit"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Ei saa käivitada wombat serverit"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
@@ -3414,16 +3887,92 @@ msgstr "EI saa käivitada wombatit"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Vaikimisi tähtsus:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 #, fuzzy
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "*Control*F3"
+msgstr "Vahemälu-kontroll:"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#, fuzzy
+msgid "*Control*F4"
+msgstr "Vahemälu-kontroll:"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutioni kalender ja ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+
+# !PARANDA!
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution'i kalendri iTip/iMip vaataja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution'i intelligentne kalendriimportija"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutioni aadressiraamatu komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Ülesanded"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Algus:"
@@ -3499,7 +4048,8 @@ msgstr ""
 #: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3516,11 +4066,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
-#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
@@ -3665,9 +4210,28 @@ msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/calendar-commands.c:117
-#: calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Kokkuvõte sisaldab"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Kirjeldus sisaldab"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentaar sisaldab"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Asukoht sisaldab"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Puudub"
+
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3676,9 +4240,13 @@ msgstr "Kalender"
 
 #: calendar/gui/calendar-commands.c:352
 #, 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."
+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 ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
+"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?"
 
@@ -3688,58 +4256,41 @@ msgid "Purge events older than"
 msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#: filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-component.c:504
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 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.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:437
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-component.c:509
-#: calendar/gui/calendar-component.c:514
-#: calendar/gui/calendar-component.c:516
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:461
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473
-#: calendar/gui/calendar-commands.c:475
-#: calendar/gui/calendar-component.c:528
-#: calendar/gui/calendar-component.c:535
-#: calendar/gui/calendar-component.c:541
-#: calendar/gui/calendar-component.c:543
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 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:465
-#: calendar/gui/calendar-component.c:533
-#: calendar/gui/e-week-view-main-item.c:337
-#: calendar/gui/print.c:1498
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3766,60 +4317,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid "Selected calendar is read-only, events cannot be created. Please select a read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendrid"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav kohtumine"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Kalender"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Loo uus kalender"
 
@@ -3849,27 +4392,6 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Kokkuvõte sisaldab"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Kirjeldus sisaldab"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentaar sisaldab"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Asukoht sisaldab"
-
-#: calendar/gui/cal-search-bar.c:362
-#: camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Puudub"
-
 #: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -3889,221 +4411,140 @@ msgstr " Sul ei ole õigusi avada Piloti seadet."
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Helialarmi häälestus"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Sõnumialarmi häälestus"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#  and now for the action area
+#  and now for the action area
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Helialarmi häälestus"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programmi alarmi häälestus"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Tundmatu alarmi häälestus"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Korduv alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Näidatav sõnum:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Saadetav sõnum"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Mängi heli:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Korda alarmi täiendavalt"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Käivita programm:"
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alarmid</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Send To:"
-msgstr "Saaja"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Nende parameetritega:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "korda, vahemikuga"
+msgid "<b>Options</b>"
+msgstr "<b>Ülesandeloetelu seaded</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
-#: filter/filter.glade.h:16
-msgid "hours"
-msgstr "tundi"
+#  and now for the action area
+#  and now for the action area
+#  and now for the action area
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Üldine</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Tegevus/Päästik"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Kalendri lisamine"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Lisa"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Sõnumi koostamine"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Põhilised asjad"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Kuupäev ja kell:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Sõnumid"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Mängi heli"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: calendar/gui/e-alarm-list.c:448
 #, fuzzy
 msgid "Pop up an alert"
 msgstr "GenericName=Meilide teadustaja"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Meeldetuletajad"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
 #: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Käivita programm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Saaja"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Saada sõnum"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Kokkuvõte:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Aadress:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Häälestus..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Käivita programm:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Korda alarmi täiendavalt"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Saada"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "pärast"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "enne"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "päev(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kokkusaamise lõppu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "korda, vahemikuga"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "tund(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "tundi"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(it)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "kokkusaamise algust"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Stiili nimi:"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, fuzzy, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Asukoha URL ei ole absoluutne."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid "The group '%s' is remote. You must specify a location to get the calendar from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Ülesannetegrupi lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Värv:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#: mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Vali värvus"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Kalendri lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Grupi lisamine"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Värskenda:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tüüp:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Tegevus/Päästik"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Lisa"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-#: filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nädalat"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm %s"
 
 #  FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #  has "activatable" set.
@@ -4111,10 +4552,8 @@ msgstr "nädalat"
 #  has "activatable" set.
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567
-#: mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677
-#: mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -4128,24 +4567,18 @@ msgstr "Ära eemalda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844
-#: mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329
-#: mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596
-#: mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Keela"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846
-#: mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329
-#: mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596
-#: mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Luba"
@@ -4231,7 +4664,7 @@ msgid "Free/Busy Publishing"
 msgstr "Vaba/Hõivatud info avalikustamine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Reede"
@@ -4245,7 +4678,7 @@ msgid "Minutes"
 msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Esmaspäev"
@@ -4255,7 +4688,7 @@ msgid "S_un"
 msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laupäev"
@@ -4269,7 +4702,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Pühapäev"
@@ -4283,7 +4716,7 @@ msgid "T_hu"
 msgstr "_N"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Neljapäev"
@@ -4297,7 +4730,7 @@ msgid "Time format:"
 msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Teisipäev"
@@ -4307,7 +4740,7 @@ msgid "W_eek starts:"
 msgstr "_Nädala algus:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Kolmapäev"
@@ -4341,16 +4774,12 @@ msgid "_Day begins:"
 msgstr "_Päev algab:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: filter/filter.glade.h:12
-#: mail/mail-config.glade.h:162
-#: ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41
-#: ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 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:43
-#: ui/evolution-signature-editor.xml.h:12
-#: ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:22
 msgid "_Edit"
 msgstr "_Redaktor"
@@ -4395,6 +4824,73 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne iga kokkusaamise algust"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Stiili nimi:"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, fuzzy, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Asukoha URL ei ole absoluutne."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Ülesannetegrupi lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Värv:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Vali värvus"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Kalendri lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Grupi lisamine"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Värskenda:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tüüp:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "nädalat"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
@@ -4410,7 +4906,8 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:77
 #, 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?"
+msgstr ""
+"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
 #: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
@@ -4432,92 +4929,82 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:101
 #, 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?"
+msgstr ""
+"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
+"redaktorit?"
 
 #: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideerimisviga: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " kuni "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Lõpetatud "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Tähtaeg "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Tähtaeg "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Ei saa uuendada objekti!"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Muuda kokkusaamist"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Kokkusaamine - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Ülesanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päeviku sissekanne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172
-#: calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Salvesta kui..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Praegust versiooni ei saa kasutada!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideerimisviga: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2258
-msgid " to "
-msgstr " kuni "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Lõpetatud "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Tähtaeg "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Tähtaeg "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Lähteallika avamine ebaõnnestus"
@@ -4578,9 +5065,18 @@ msgstr "Päeviku sissekannet ei ole vea tõttu võimalik kustutada"
 msgid "The item could not be deleted due to an error"
 msgstr "Elementi ei ole vea tõttu võimalik kustutada"
 
+#  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);
+#  Create the contacts group
+#  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);
+#  Create the contacts group
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Aadressiraamat..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontaktid"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4590,182 +5086,223 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Meeldetuletaja"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450
-#: ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Suund"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Koosolek"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Sündmus ilma alguskuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:649
-#: calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Lõppemise päev on vale"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Algusaeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Lõppemise aeg on vale"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalendrit '%s' ei saa avada."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "enne iga kokkusaamise algust"
+msgstr[1] "enne iga kokkusaamise algust"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "kokkusaamise lõppu"
+msgstr[1] "kokkusaamise lõppu"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "enne iga kokkusaamise algust"
+msgstr[1] "enne iga kokkusaamise algust"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Kestab kogu _päeva"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "enne iga kokkusaamise algust"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Hõivatud"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "enne iga kokkusaamise algust"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Kate_gooriad..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "enne iga kokkusaamise algust"
 
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Ülesannete nimekiri</b>"
+
+#  and now for the action area
+#  and now for the action area
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Liigitamine"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Aeg</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "S_alajane"
+msgid "A_ll day event"
+msgstr "Kestab kogu _päeva"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Kuupäev ja kellaaeg"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Salvesta kohandatud vaade..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Va_ba"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Kate_gooriad..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "As_ukoht:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Isiklik"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Liigitamine"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "A_valik"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Salajane"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Näita aega kui"
+msgid "L_ocation:"
+msgstr "As_ukoht:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Isiklik"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Avalik"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Näita aega kui"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "K_okkuvõte:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Puhasta"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Kirjeldus:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Lõpp:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647
-#: calendar/gui/e-itip-control.c:928
-#: composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928
-#: mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257
-#: widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480
-#: widgets/misc/e-dateedit.c:1595
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Puudub"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:428
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Organiseerija peab olema määrtud."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Vähemalt üks osaleja peab olema märgitud."
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegeerida..."
 
-#  FIXME: need to disable for undeletable folders
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039
-#: calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360
-#: calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584
-#: mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112
-#: ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Kustuta"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Eemalda"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4804,37 +5341,57 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1060
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
+#  and now for the action area
+#  and now for the action area
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Lisa _osavõtja"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alarmid</b>"
 
+#  and now for the action area
+#  and now for the action area
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
+msgid "<b>Organizer</b>"
+msgstr "<b>Teised</b>"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Muuda organiseerijat:"
+
+#  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);
+#  Create the contacts group
+#  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);
+#  Create the contacts group
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organiseerija:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktid"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Muuda organiseerijat:"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organiseerija:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4881,7 +5438,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -4900,199 +5458,180 @@ msgstr "See ja tulevad juhtumid"
 msgid "All Instances"
 msgstr "Kõik juhtumid"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "See kokkusaamine sisaldab ressursse, mida Evolution ei saa muuta."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Kordumiskuupäev on vigane"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "järgnevatel nädalapäevadel:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "esimene"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "teine"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "neljas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "viimane"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Muu kuupäev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "päev"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "iga"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "kord(a)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Kuupäev/kellaaeg"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Vahemikuga"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Erandid"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Eelvaade"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Korduse reegel"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "K_ohandatud kordus"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Muuda"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Eelvaade</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "E_i kordu"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Kordumine"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Eemalda"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Vahemikuga"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Li_htne kordus"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Muuda kokkusaamist"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "vähemalt"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "igavesti"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "kuu(d)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "kuni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nädal(at)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Vali sihtkoht %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Sihtkoht"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Ülesannete nimekiri"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Sõnumi kirjatüübid</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "(%) _valmis"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alarmid</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449
-#: calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-itip-control.c:720
-#: calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374
-#: mail/message-list.c:960
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448
-#: calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376
-#: mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375
-#: calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447
-#: calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Pole alanud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Edenemine"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Valmis (%%): %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5115,38 +5654,42 @@ msgstr "_Olek:"
 msgid "_Web Page:"
 msgstr "_Kodulehekülg:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Ülesanne"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Kellele määratud"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Tähtaja kuupäev on vale"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ei saa avada mooduli faili \"%s\"."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Salajane"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Häälestus</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Kirjade kustutamine</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:988
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:71
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Kaust:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "_Alguskuupäev:"
@@ -5155,64 +5698,96 @@ msgstr "_Alguskuupäev:"
 msgid "_Due date:"
 msgstr "_Tähtaeg:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Serverilt saadi vigane autentimise vastus."
+msgid "_Group:"
+msgstr "Grupp"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
 #, fuzzy
-msgid "Calendars selected for publishing"
-msgstr "valitud valiku väärtus"
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalendri seaded</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Igapäevane"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Avalikustamise sagedus"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Vaba/Hõivatud info redigeerija"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Avaliku vaba/hõivatud info asukoht"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Avaliku vaba/hõivatud info asukoht"
+msgid "Free/Busy Editor"
+msgstr "Vaba/Hõivatud info redigeerija"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Sisselogimisnimi:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Igapäevane"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Parool:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Post"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Avalikustamise sagedus"
+#, fuzzy
+msgid "_Password:"
+msgstr "Parool:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Parooli meeldejätmine"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
 #, fuzzy
-msgid "User Publishes"
-msgstr "Kasutajanimi"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Iganädalane"
 
 #: calendar/gui/e-alarm-list.c:395
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "päev"
+msgstr[1] "päev"
+
 #: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "nädalat"
+msgstr[1] "nädalat"
+
 #: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "_24 tunnine"
+msgstr[1] "_24 tunnine"
+
 #: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "minutit"
+msgstr[1] "minutit"
+
 #: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "teine"
+msgstr[1] "teine"
+
 #: calendar/gui/e-alarm-list.c:462
-#, c-format
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
@@ -5256,17 +5831,20 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-component-preview.c:71
-#: mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Avamiseks kliki %s"
 
-#: calendar/gui/e-cal-component-preview.c:156
-#: filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Nimetu"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Kokkuvõte:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5290,24 +5868,93 @@ msgstr "Tähtsus:"
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
 
-#: calendar/gui/e-calendar-table.c:352
-#: calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Avalik"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Lõppemise kuupäev"
 
-#: calendar/gui/e-calendar-table.c:353
-#: calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Isiklik"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Alguskuupäev"
 
-#: calendar/gui/e-calendar-table.c:354
-#: calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Salajane"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Vaba"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Hõivatud"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Põ"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Lõ"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ida"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Lä"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geograafiline asukoht peab olema sisestatud formaadis: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Jah"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ei"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Korduv"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Määratud"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5353,33 +6000,17 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426
-#: calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Vaba"
-
-#: calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "Hõivatud"
-
-#: calendar/gui/e-calendar-table.c:680
-#: calendar/gui/e-calendar-view.c:647
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:843
-#: calendar/gui/e-calendar-view.c:751
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1019
-#: calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1340
-#: calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894
-#: ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
@@ -5387,65 +6018,43 @@ msgstr "A_va"
 msgid "Open _Web Page"
 msgstr "_Ava veebilehekülg"
 
-#: calendar/gui/e-calendar-table.c:1021
-#: calendar/gui/e-calendar-table.c:1066
-#: calendar/gui/e-calendar-view.c:1341
-#: calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896
-#: mail/em-popup.c:691
-#: mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-calendar-table.c:1064
-#: calendar/gui/e-calendar-view.c:1319
-#: calendar/gui/e-calendar-view.c:1342
-#: calendar/gui/e-calendar-view.c:1424
-#: ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44
-#: ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17
-#: ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-calendar-table.c:1055
-#: calendar/gui/e-calendar-view.c:1347
-#: calendar/gui/e-calendar-view.c:1390
-#: ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-calendar-table.c:1027
-#: calendar/gui/e-calendar-table.c:1053
-#: calendar/gui/e-calendar-view.c:1348
-#: calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960
-#: mail/message-list.c:1650
-#: ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:1028
-#: calendar/gui/e-calendar-table.c:1062
-#: calendar/gui/e-calendar-view.c:1323
-#: calendar/gui/e-calendar-view.c:1349
-#: calendar/gui/e-calendar-view.c:1422
-#: ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43
-#: ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123
-#: ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
@@ -5465,11 +6074,26 @@ msgstr "_Märgi lõpetatuks"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1040
-#: calendar/gui/e-calendar-table.c:1058
+#  FIXME: need to disable for undeletable folders
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Kustuta"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Salvesta kui..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5480,10 +6104,8 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
-#: camel/camel-filter-driver.c:1178
-#: camel/camel-filter-driver.c:1270
-#: mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5503,12 +6125,6 @@ msgstr "Tähtsus"
 msgid "Start date"
 msgstr "Alguskuupäev"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kokkuvõte"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
@@ -5523,28 +6139,23 @@ msgstr "märgitud elemendid:"
 msgid "Copying items"
 msgstr "märgitud elemendid:"
 
-#: calendar/gui/e-calendar-view.c:1312
-#: calendar/gui/e-calendar-view.c:1400
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-calendar-view.c:1313
-#: calendar/gui/e-calendar-view.c:1405
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-calendar-view.c:1315
-#: calendar/gui/e-calendar-view.c:1415
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1329
-#: ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
@@ -5552,8 +6163,7 @@ msgstr "Vali _tänane kuupäev"
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1334
-#: ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
@@ -5573,13 +6183,11 @@ msgstr "_Ajasta koosolek..."
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1361
-#: calendar/gui/e-calendar-view.c:1393
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1362
-#: calendar/gui/e-calendar-view.c:1394
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
@@ -5591,116 +6199,18 @@ msgstr "Mine tänasele _päevale"
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-calendar-view.c:1428
-#: ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Sätted..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Lõppemise kuupäev"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Alguskuupäev"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334
-#: calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973
-#: calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136
-#: 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:1705
-#: camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: mail/em-utils.c:1115
-#: shell/e-component-registry.c:186
-#: shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tundmatu"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Korduv"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Määratud"
-
-#: calendar/gui/e-cal-model.c:915
-#: calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146
-#: calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169
-#: calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Jah"
-
-#: calendar/gui/e-cal-model.c:915
-#: calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147
-#: calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ei"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Põ"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Lõ"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-#: smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ida"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Lä"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geograafiline asukoht peab olema sisestatud formaadis: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117
-#: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120
-#: 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"
@@ -5716,58 +6226,63 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817
-#: calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "el"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820
-#: calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pl"
+#: calendar/gui/e-day-view-time-item.c:532
+#, fuzzy, c-format
+msgid "%02i minute divisions"
+msgstr "Segmendilised alamjaotised"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-day-view-top-item.c:690
-#: calendar/gui/e-week-view-main-item.c:320
-#: calendar/gui/print.c:1514
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, fuzzy, c-format
-msgid "%02i minute divisions"
-msgstr "Segmendilised alamjaotised"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "el"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pl"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
 #: calendar/gui/e-itip-control.c:596
+#, fuzzy, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Vahemikuga"
+msgstr[1] "Vahemikuga"
+
 #: calendar/gui/e-itip-control.c:601
+#, fuzzy, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Iga kord"
+msgstr[1] "Iga kord"
+
 #: calendar/gui/e-itip-control.c:603
-#: calendar/gui/e-itip-control.c:611
 #, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ja "
 
@@ -5782,10 +6297,27 @@ msgid "The %s %s of "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:638
+#, fuzzy, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "Kord kuus"
+msgstr[1] "Kord kuus"
+
 #: calendar/gui/e-itip-control.c:642
+#, fuzzy, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Iga kord"
+msgstr[1] "Iga kord"
+
 #: calendar/gui/e-itip-control.c:653
-#: calendar/gui/e-itip-control.c:662
 #, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", lõpeb"
 
@@ -5801,8 +6333,7 @@ msgstr "Lõpeb"
 msgid "Due"
 msgstr "Tähtaeg"
 
-#: calendar/gui/e-itip-control.c:773
-#: calendar/gui/e-itip-control.c:830
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
@@ -5811,51 +6342,44 @@ msgstr "iKalendri informatsioon"
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:862
-#: calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:889
-#: calendar/gui/e-itip-control.c:906
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #  Describe what the user can do
 #. Describe what the user can do
 #: calendar/gui/e-itip-control.c:913
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik tegevus."
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
+"tegevus."
 
 #: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Asukoht:"
 
-#: calendar/gui/e-itip-control.c:961
-#: calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Vastu võetud"
 
-#: calendar/gui/e-itip-control.c:965
-#: calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:969
-#: calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428
-#: calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1028
-#: calendar/gui/e-itip-control.c:1056
-#: calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095
-#: calendar/gui/e-itip-control.c:1108
-#: calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
@@ -5863,14 +6387,10 @@ msgstr "Vali tegevus"
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1030
-#: calendar/gui/e-itip-control.c:1061
-#: calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097
-#: calendar/gui/e-itip-control.c:1110
-#: calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141
-#: widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
@@ -5899,10 +6419,8 @@ msgstr "GGV juhtimise staatus"
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1122
-#: calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410
-#: mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
@@ -5966,8 +6484,7 @@ msgstr "<b>%s</b> tühistas koosoleku."
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1240
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
 #: calendar/gui/e-itip-control.c:1343
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -6091,55 +6608,36 @@ msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1805
-#: calendar/gui/e-itip-control.c:1877
-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:1821
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 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:1862
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Objekti ei suudetud leida\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Sul pole õigusi kalendri muutmiseks\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1928
-#: calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1930
-#: calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -6168,6 +6666,10 @@ msgstr "Kalendri laadimine"
 msgid "Loading calendar..."
 msgstr "Kalendri laadimine..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organiseerija:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serveri teade:"
@@ -6192,195 +6694,153 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:118
-#: calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107
-#: calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:119
-#: calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:120
-#: calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:121
-#: calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:132
-#: calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:133
-#: calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144
-#: calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:133 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 "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:134
-#: calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:135
-#: calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:157
-#: calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200
-#: calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:157 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 "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:160
-#: calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206
-#: calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-list-view.c:160 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 "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:161
-#: calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:189
-#: calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Töös"
 
-#: calendar/gui/e-meeting-time-sel.c:402
-#: designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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, %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Info puudub"
 
-#: calendar/gui/e-meeting-time-sel.c:419
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "_Häälestus"
+msgid "O_ptions"
+msgstr "Häälestus"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Näita tunde _tööpäeva piires"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Näita _suures plaanis"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automaatne valik"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "Koosoleku _algus:"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "Koosoleku l_õpp:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: 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, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:709
-#: calendar/gui/gnome-cal.c:2159
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6393,9 +6853,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
@@ -6412,17 +6870,6 @@ msgstr "Valitud objektide kustutamine..."
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884
-#: calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Ülesanded"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Päringu uuendamine"
@@ -6446,64 +6893,6 @@ msgstr "%s avamine"
 msgid "Purging"
 msgstr "Puhastamine"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F3"
-msgstr "Vahemälu-kontroll:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#, fuzzy
-msgid "*Control*F4"
-msgstr "Vahemälu-kontroll:"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutioni kalender ja ülesanded"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution'i kalendri iTip/iMip vaataja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution'i intelligentne kalendriimportija"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutioni aadressiraamatu komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendrid"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Ülesanded"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -6560,8 +6949,7 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:271
-#: calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema määrtud."
@@ -6570,23 +6958,19 @@ msgstr "Organiseerija peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:394
-#: calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:396
-#: calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:398
-#: calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Päevaraamatu informatsioon"
 
-#: calendar/gui/itip-utils.c:400
-#: calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
@@ -6622,22 +7006,26 @@ msgstr "Sa pead ise olema sündmusest osavõtja."
 #: calendar/gui/migration.c:146
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #: calendar/gui/migration.c:150
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -6647,14 +7035,12 @@ msgstr "Sünnipäevad ja tähtpäevad"
 
 #  Create the Webcal source group
 #. Create the Webcal source group
-#: calendar/gui/migration.c:462
-#: calendar/gui/migration.c:544
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr "Veebis"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708
-#: calendar/gui/migration.c:860
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6830,8 +7216,7 @@ msgstr "L"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1939
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
@@ -6839,8 +7224,7 @@ msgstr "%a, %d. %b"
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1944
-#: calendar/gui/print.c:1946
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
@@ -6860,10 +7244,6 @@ msgstr "Valitud kuu (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valitud aasta (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Ülesanne"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6893,10 +7273,8 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2559
-#: calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737
-#: mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
@@ -6918,10 +7296,21 @@ msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/tasks-component.c:408
-#: calendar/gui/tasks-component.c:410
-#: mail/mail-component.c:508
-#: calendar/gui/tasks-component.c:457
 #, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "Uus ülesanne"
+msgstr[1] "Uus ülesanne"
+
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Valitud"
+msgstr[1] "Valitud"
+
+#: calendar/gui/tasks-component.c:457
+#, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Kalender ja ülesanded"
 
@@ -6934,41 +7323,40 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid "Selected task list is read-only, events cannot be created. Please select a read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Uus ülesannet grupp"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "Ü_lesannete grupp"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Loo uus kontaktide grupp"
 
 #: calendar/gui/tasks-control.c:367
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
+"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui "
+"lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
 #: calendar/gui/tasks-control.c:370
@@ -8636,15 +9024,13 @@ msgstr "kirjete ettevalmistamine võrdlemiseks"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:669
-#: camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: camel/camel-filter-driver.c:713
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
@@ -8655,19 +9041,16 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Haldurilt saadi veateade:</p><p>%1</p>"
 
-#: camel/camel-filter-driver.c:945
-#: camel/camel-filter-driver.c:954
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1043
-#: camel/camel-filter-driver.c:1420
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1052
-#: camel/camel-filter-driver.c:1426
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -8689,14 +9072,12 @@ msgstr "Võetakse vastu teadet %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1148
-#: camel/camel-filter-driver.c:1160
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1174
-#: camel/camel-filter-driver.c:1265
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
@@ -8721,53 +9102,15 @@ msgstr ""
 #: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
-msgstr "<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
+msgstr ""
+"<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
 
-#: camel/camel-filter-search.c:670
-#: camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toetamata operatsioon: lisa sõnum: %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Toetamata operatsioon: otsing UID järgi: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Sõnumite liigutamine"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Sõnumite kopeerimine"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Rämpsukontroll"
-
-#: camel/camel-folder.c:1682
-#, fuzzy
-msgid "Learning non-junk"
-msgstr "Sõnum on rämps"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Uute sõnumite filtreerimine"
-
-#: camel/camel-folder-search.c:355
-#: camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8776,16 +9119,14 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:365
-#: camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder-search.c:672
-#: camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
@@ -8794,8 +9135,7 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder-search.c:758
-#: camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
@@ -8814,6 +9154,43 @@ 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:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toetamata operatsioon: lisa sõnum: %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toetamata operatsioon: otsimine avaldise järgi: %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toetamata operatsioon: otsing UID järgi: %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Sõnumite liigutamine"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Sõnumite kopeerimine"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Rämpsukontroll"
+
+#: camel/camel-folder.c:1682
+#, fuzzy
+msgid "Learning non-junk"
+msgstr "Sõnum on rämps"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Uute sõnumite filtreerimine"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8843,14 +9220,10 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: camel/camel-gpg-context.c:791
-#: camel/camel-gpg-context.c:1283
-#: camel/camel-gpg-context.c:1441
-#: camel/camel-gpg-context.c:1532
-#: camel/camel-gpg-context.c:1639
-#: camel/providers/nntp/camel-nntp-store.c:1231
-#: camel/providers/nntp/camel-nntp-store.c:1329
-#: mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
@@ -8882,27 +9255,21 @@ msgstr "gpg käivitamine ebaõnnestus: %s"
 msgid "Failed to GPG %s: %s\n"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1262
-#: camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1276
-#: camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
 #: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1300
-#: camel/camel-gpg-context.c:1434
-#: camel/camel-gpg-context.c:1525
-#: camel/camel-gpg-context.c:1548
-#: camel/camel-gpg-context.c:1632
-#: camel/camel-gpg-context.c:1656
-#: camel/camel-gpg-context.c:1726
-#: camel/camel-gpg-context.c:1777
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg käivitamine ebaõnnestus."
 
@@ -8910,12 +9277,9 @@ msgstr "gpg käivitamine ebaõnnestus."
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1400
-#: camel/camel-gpg-context.c:1406
-#: camel/camel-gpg-context.c:1412
-#: camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
@@ -8935,8 +9299,7 @@ msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1663
-#: camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
@@ -8945,27 +9308,6 @@ msgstr "Krüpteeritud sisu"
 msgid "Unable to parse message content"
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
-#: camel/camel-lock.c:92
-#: camel/camel-lock.c:113
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "fcntl(2) abil lukustamine nurjus: %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "flock(2) abil lukustamine nurjus: %s"
-
 #: camel/camel-lock-client.c:100
 #, fuzzy, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8976,8 +9318,7 @@ msgstr "Ei suuda luua lukustamisabilise toru: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
 
-#: camel/camel-lock-client.c:191
-#: camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, fuzzy, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
@@ -8987,6 +9328,26 @@ msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
 msgid "Could not lock '%s'"
 msgstr "%s: Ei saa lukustada küpsise faili %s"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "%s - Lukufaili saamise päring ületas ajapiirangu. Ürita hiljem uuesti."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "fcntl(2) abil lukustamine nurjus: %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "flock(2) abil lukustamine nurjus: %s"
+
 #: camel/camel-movemail.c:107
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
@@ -9036,14 +9397,12 @@ msgstr "Viga faili lugemisel."
 msgid "Error writing mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-movemail.c:465
-#: camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-multipart-encrypted.c:229
-#: camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 
@@ -9051,8 +9410,7 @@ msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: vigane struktuur"
 
-#: camel/camel-multipart-signed.c:673
-#: camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "analüüsimisviga"
 
@@ -9082,8 +9440,7 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-provider.c:356
-#: camel/camel-session.c:160
+#: camel/camel-provider.c:356 camel/camel-session.c:160
 #, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
@@ -9096,8 +9453,7 @@ msgstr "Anonüümne"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 
-#: camel/camel-sasl-anonymous.c:112
-#: camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus."
 
@@ -9133,16 +9489,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist CRAM-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist CRAM-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist DIGEST-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist DIGEST-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9178,7 +9542,9 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -9186,19 +9552,27 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -9218,12 +9592,10 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: camel/camel-sasl-gssapi.c:189
-#: camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274
-#: camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9258,8 +9630,7 @@ msgstr ""
 msgid "Login"
 msgstr "Kasutajanimi"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
@@ -9273,7 +9644,9 @@ msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
 #, fuzzy
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-plain.c:32
@@ -9306,57 +9679,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulaaravaldise kompileerimine nurjus: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vajab kasutajanime osa"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vajab hosti osa"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vajab kataloogitee osa"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:764
-#: camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:785
-#: camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hosti lahendamine ebaõnnestus: lõimu ei saa luua: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: ei leia hosti"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hostinime lahendamine ebaõnnestus: %s: põhjus teadmata"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Aadressi lahendamine"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Hostinime lahendamine ebaõnnestus: hosti ei leitud"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Hostinime lahendamine ebaõnnestus: põhjus teadmata"
 
@@ -9411,8 +9782,7 @@ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 msgid "Cannot add CMS SigningTime"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:325
-#: camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
 #, fuzzy, c-format
 msgid "Encryption cert for '%s' does not exist"
 msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
@@ -9436,7 +9806,7 @@ msgstr "Vali sertifikaat [%1] krüptimise jaoks"
 msgid "Cannot add CMS SignerInfo"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Ei saa luua andmebaasikataloogi!"
@@ -9446,8 +9816,7 @@ msgstr "Ei saa luua andmebaasikataloogi!"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
 
-#: camel/camel-smime-context.c:441
-#: camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Ei saa lugeda METAR andmeid.\n"
@@ -9505,8 +9874,7 @@ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/camel-smime-context.c:589
-#: camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
 #, fuzzy
 msgid "Cannot calculate digests"
 msgstr "faili ei õnnestu sulgeda"
@@ -9516,8 +9884,7 @@ msgstr "faili ei õnnestu sulgeda"
 msgid "Cannot set message digests"
 msgstr "Sõnumi tähtsuseks määratakse:"
 
-#: camel/camel-smime-context.c:614
-#: camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Sertifikaadi importimine ebaõnnestus"
 
@@ -9531,7 +9898,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Ei leia tühja kohta"
 
 #: camel/camel-smime-context.c:651
@@ -9547,47 +9914,47 @@ msgstr "Dekooder ebaõnnestus"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
+msgid "Cannot find certificate for `%s'"
+msgstr "Ei leia \"%s\" programmifaili"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#  PORT_GetError(); ??
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "CMS sõnumit ei saa luua"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "CMS EnvelopedData-t ei saa luua"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "CMS EnvelopedData-t ei saa manustada"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "CMS andmeobjekti ei saa manustada"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "CMS RecipientInfo-t ei saa luua"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr "CMS RecipientInfo-t ei saa lisada"
-
-#: camel/camel-smime-context.c:877
 #, fuzzy
-msgid "Can't create encoder context"
-msgstr "ei suuda luua objekti '%s'"
+msgid "Cannot add CMS RecipientInfo"
+msgstr "CMS RecipientInfo-t ei saa lisada"
 
 #: camel/camel-smime-context.c:888
 #, fuzzy
@@ -9629,14 +9996,13 @@ msgstr ""
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:389
-#: camel/camel-vee-store.c:351
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:439
-#: camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
@@ -9645,9 +10011,8 @@ msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:779
-#: mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
@@ -9782,8 +10147,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "&Funktsioon sooritatakse rakendusel:"
 
-#: camel/camel-tcp-stream-openssl.c:696
-#: camel/camel-tcp-stream-ssl.c:826
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9796,13 +10160,11 @@ msgstr ""
 "Sõrmejälg:       %s\n"
 "Allkiri:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "HEA"
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:832
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "HALB"
 
@@ -9890,8 +10252,7 @@ msgstr "Viga `%s' salvestamisel: %s"
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:841
-#: camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 
@@ -9900,7 +10261,7 @@ msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
@@ -9919,14 +10280,16 @@ msgid "Checking for new mail"
 msgstr "Kontrollin uusi sõnumeid"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele sõnumitele "
+msgstr ""
+"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
+"sõnumitele "
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
@@ -9950,12 +10313,11 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71
-#: mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parool"
 
@@ -9970,330 +10332,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, fuzzy, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "SMTP serverile saadetud QUIT käsk ei õnnestunud.\n"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ootamatu vastus IMAP serverilt %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, fuzzy, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ootamatu vastus IMAP serverilt: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Ühendus serverisse suleti ootamatult"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Saadi BYE vastus"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr ""
-"Kirjeldatud kausta loomine nurjus:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:748
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ei saa kätte sõnumit %s kaustast %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:753
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:878
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
-
-#: camel/providers/imap4/camel-imap4-folder.c:907
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:986
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-folder.c:990
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-folder.c:998
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1002
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kaustad"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Näita ainult tellitud kaustu"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nimeruum"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "E-posti loetakse ja hoitakse IMAP serveris."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Teenu&sest võrgus teatamine"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Ei saa ühenduda %s (port: %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL ei ole saadaval"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Ühendus katkestatud"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
-msgstr "Ei saa luua ühendust LDAP serveriga"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Ei saa luua ühendust LDAP serveriga"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545
-#: shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Tundmatu viga"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ootamatu vastus IMAP serverilt: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Andmeid pole"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Konto tüüp: lahutatud IMAP konto"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Tundmatu viga"
+
 #  for imap ALERT codes, account user@host
 #  for imap ALERT codes, account user@host
 #. for imap ALERT codes, account user@host
@@ -10364,7 +10424,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10393,7 +10453,8 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2660
@@ -10435,6 +10496,27 @@ msgstr "Parool proxyserveriga ühendumiseks."
 msgid "Command:"
 msgstr "Käsk:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Kaustad"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Näita ainult tellitud kaustu"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Kasuta serveri pakutava kaustade nimeruumi asemel enda oma"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Nimeruum"
+
 #: 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"
@@ -10456,44 +10538,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Teenu&sest võrgus teatamine"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Ei saa ühenduda %s (port: %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL ei ole saadaval"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Ühendus katkestatud"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Ei saa luua ühendust LDAP serveriga"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS laiend ei ole toetatud."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "DCOP'iga pole võimalik registreerida.\n"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "Palun sisesta parool %1 jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10504,30 +10635,267 @@ msgstr ""
 "Serveri vastus:\n"
 "%2"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu ülemkaust: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "SMTP serverile saadetud QUIT käsk ei õnnestunud.\n"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ootamatu vastus IMAP serverilt %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa valida: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Ühendus serverisse suleti ootamatult"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Saadi BYE vastus"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+"Kirjeldatud kausta loomine nurjus:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa valida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ei saa kätte sõnumit %s kaustast %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Tundmatu viga"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa lisada `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Sõnumeid ei saa kopeerida kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "E-posti loetakse ja hoitakse IMAP serveris."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Ei saa luua ühendust LDAP serveriga"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa luua: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa luua: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kausta `%s' ei saa kustutada: Spetsiaalkaust"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Andmeid pole"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Konto tüüp: lahutatud IMAP konto"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10545,7 +10913,8 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Eksperimentaalne IMAP 4(.1) klient\n"
-"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist imap'i.\n"
+"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist "
+"imap'i.\n"
 "\n"
 " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
 
@@ -10603,7 +10972,9 @@ msgstr "Kohalik postijagaja"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Kohalikku e-posti võetakse standardsest \"mbox\" vorminguga puhvrist"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -10633,7 +11004,9 @@ msgstr "Standardne Unix'i \"mbox\" puhver"
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga puhverfailides"
+msgstr ""
+"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
+"puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
@@ -10702,19 +11075,28 @@ msgstr "Ei saa salvestada kokkuvõtet: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Sõnumite ei saa lisada kokkuvõttesse: tundmatu põhjus"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#  Inbox is always first
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Sisendkast"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Sõnumi lisamine maildir kausta nurjus: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10730,48 +11112,48 @@ msgstr ""
 "Ei saa kätte sõnumit %s kaustast %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Vigane sõnumi sisu"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kausta `%s' ei saadud: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Kausta `%s' ei saa luua: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Kausta `%s' ei saadud: seda ei eksisteeri."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kausta `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11159,7 +11541,8 @@ msgid "Unable to save grouplist file for %s: %s"
 msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näita kaustasid lühendatult (comp.os.linux asemel c.o.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11175,7 +11558,9 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:118
@@ -11310,8 +11695,7 @@ msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 msgid "Retrieving POP message %d"
 msgstr "POP sõnumi %d vastuvõtt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: composer/e-msg-composer.c:1225
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
 #: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
@@ -11329,8 +11713,7 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr "Keela kõigi POP3 laienduste toetus"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-#: mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11339,11 +11722,18 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "E-posti laetakse alla POP serverist"
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus valik, mida toetavad paljud POP serverid."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus "
+"valik, mida toetavad paljud POP serverid."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:195
@@ -11351,46 +11741,53 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Autentimine LDAP serverile nurjus"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ei õnnestu luua ühendust WAIS serveriga."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s'  Sisselogimine POP serverisse %s ebaõnnestus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP serverisse %s ei saa sisse logida: SASL protokolli viga"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentimine LDAP serverile nurjus"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11399,7 +11796,16 @@ msgstr ""
 "Ei saa luua ühendust POP serveriga.\n"
 "Viga parooli saatmisel: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Ei saa luua ühendust POP serveriga.\n"
+"Viga parooli saatmisel: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kausta '%s' ei ole olemas."
@@ -11410,7 +11816,9 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
@@ -11426,7 +11834,8 @@ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+msgstr ""
+"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
@@ -11456,8 +11865,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:122
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11748,8 +12156,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:298
-#: mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "manus"
 
@@ -11793,64 +12200,6 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Faili avamine ebaõnnestus"
-
-#: composer/e-msg-composer.c:1291
-#, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "Sõnumi vastuvõtmine nurjus"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Pealkirjata sõnum"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Ava fail"
-
-#: composer/e-msg-composer.c:1998
-#: mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automaatselt genereeritud"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Allkiri:"
-
-#: composer/e-msg-composer.c:2298
-#: composer/e-msg-composer.c:2327
-#, c-format
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "_Manuseriba peitmine (tõsta manused siia)"
-
-#: composer/e-msg-composer.c:2330
-#: composer/e-msg-composer.c:3208
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "_Manuseriba kuvamine (tõsta manused siia)"
-
-#: composer/e-msg-composer.c:2347
-#: composer/e-msg-composer.c:3100
-#: composer/e-msg-composer.c:3101
-msgid "Compose a message"
-msgstr "Sõnumi koostamine"
-
-#: composer/e-msg-composer.c:4254
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postituse sihtkoht"
@@ -11910,7 +12259,9 @@ msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #: composer/e-msg-composer-hdrs.c:607
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 
 #  * Post-To
@@ -11936,6 +12287,84 @@ msgstr "Klõpsa siia, et valida kaustad kuhu postitada"
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Faili avamine ebaõnnestus"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Sõnumi vastuvõtmine nurjus"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Pealkirjata sõnum"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ava fail"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automaatselt genereeritud"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Allkiri:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba peitmine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Manuseriba kuvamine (tõsta manused siia)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sõnumi koostamine"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Edastatud sõnum - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Originaalsõnumi manustamine"
+msgstr[1] "Originaalsõnumi manustamine"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #  mail-composer:no-attach primary
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
@@ -11943,13 +12372,6 @@ msgstr "Faili(de) manustamine"
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Faili manustamine sõnumile"
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 #, fuzzy
@@ -11963,19 +12385,36 @@ msgstr "Katalooge ei saa sõnumeile manustada."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
-msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
+#  mail-composer:no-build-message primary
+#. mail-composer:attach-nomessages primary
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Sõnumit ei saa luua."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Kuna \"{1}\"."
+
 #  mail-composer:recover-autosave title
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:12
+#: composer/mail-composer-errors.xml.h:16
 #, fuzzy
 msgid "Unfinished messages found"
 msgstr "Topeltkirju ei leitud."
 
 #  mail-composer:recover-autosave primary
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
@@ -11983,123 +12422,115 @@ msgstr ""
 "Kas tõesti kustutada %n kirja?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+#: composer/mail-composer-errors.xml.h:20
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Ära taasta"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Taasta"
 
 #  mail-composer:no-autosave primary
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ajutisse faili kirjutamine ei õnnestunud."
 
 #  mail-composer:no-autosave secondary
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
+msgstr ""
+"Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" "
+"üldse teha."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Hoiatus: salvestamata sõnum"
 
 #  mail-composer:exit-unsaved primary
 #  mail-composer:exit-unsaved primary
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
 
 #  mail-composer:exit-unsaved secondary
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+#: composer/mail-composer-errors.xml.h:32
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Loobu muudatustest"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Salvesta sõnum"
 
 #  mail-composer:no-build-message primary
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Sõnumit ei saa luua."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 #, fuzzy
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Kuna \"${0}\", pead sa valima teised kirjade sätted."
 
 #  mail-composer:no-sig-file primary
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38
-#: mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Kuna \"{1}\"."
-
 #  mail-composer:all-accounts-deleted primary
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Kõik kontod on kustutatud."
 
 #  mail-composer:all-accounts-deleted secondary
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
 #  mail-composer:no-build-message primary
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Uut akent ei saa teha.\n"
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr ""
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 #, fuzzy
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti.\n"
@@ -12139,7 +12570,8 @@ msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
@@ -12179,8 +12611,10 @@ msgstr "<b>E-posti saatmine:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -12209,7 +12643,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:249
@@ -12221,8 +12657,7 @@ msgstr ""
 "Kirjutada üle?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:251
-#: widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -12256,10 +12691,7 @@ msgstr "Katekooriate sünkroniseerimine:"
 #  time, in 12-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185
-#: e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -12269,10 +12701,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  time, in 24-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
@@ -12351,39 +12780,25 @@ msgstr "%d.%m.%Y"
 #  strptime format for a time of day, in 12-hour format.
 #  strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339
-#: e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343
-#: e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348
-#: e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414
-#: widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352
-#: e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411
-#: widgets/misc/e-dateedit.c:1636
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12393,19 +12808,59 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
+#, fuzzy, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "teine"
+msgstr[1] "teine"
+
 #: filter/filter-datespec.c:74
+#, fuzzy, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "10 minutit"
+msgstr[1] "10 minutit"
+
 #: filter/filter-datespec.c:75
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:76
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:77
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:78
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:79
-#: filter/filter-datespec.c:280
 #, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:283
-#: filter/filter-datespec.c:294
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "praegu"
 
@@ -12420,10 +12875,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Vali aeg, millega võrrelda"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Filtri reeglid"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12440,9 +12891,7 @@ msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8
-#: filter/filter-errors.xml.h:12
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
@@ -12451,192 +12900,50 @@ msgstr "Failinime andmine on kohustuslik"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Faili \"{0}\" ei eksisteeri või see pole tavaline fail."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Puuduv kaust."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Kausta valimine on kohustuslik."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Vigane regulaaravaldis \"{0}\"."
 
 #  filter:bad-regexp secondary
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22
-#: filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime määrama."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Sa pead sellele vKaustale nime andma."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Nimi \"{0}\" on juba kasutusel."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Palun vali mõni teine nimi."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Ühtegi allikat pole valitud."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vali faili"
 
-#  and now for the action area
-#  and now for the action area
-#  and now for the action area
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>siis</b>"
-
-#: filter/filter-folder.c:238
-#: filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Kausta valimine"
-
-#: filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filtri reeglid</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vKausta allikad</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Võrdle"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Sissetulev"
-
-#: filter/filter.glade.h:6
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Sõnumi kuupäeva võrreldakse allpool\n"
-"määratud ajahetkega."
-
-#: filter/filter.glade.h:8
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Sõnumi kuupäeva võrreldakse ajahetkega,\n"
-"mis on suhteline filtri käivitamise hetkega.\n"
-"Näiteks: 2 nädalat tagasi"
-
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Sõnumi kuupäeva võrreldakse allpool\n"
-"määratud ajahetkega."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "ajaga, mis on suhteline käesoleva hetkega"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "tagasi"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "kuud"
-
-#: filter/filter.glade.h:19
-#: mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekundit"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "ainult kirjeldatud kaustad"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "praegune aeg"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "sinu poolt määratud aeg"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "koos kõigi aktiivsete võrgukaustadega"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "koos kõigi kohalike kalatoogidega"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "aastat"
-
-#: filter/filter-label.c:121
-#: mail/em-migrate.c:1011
-#: mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tähtis"
 
 #  forest green
 #  forest green
 #. forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:1014
-#: mail/mail-config.c:79
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
 #: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Ülesanne"
@@ -12644,15 +12951,12 @@ msgstr "Ülesanne"
 #  blue
 #  blue
 #. blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:1015
-#: mail/mail-config.c:80
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
 #: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Hiljem"
 
-#: filter/filter-part.c:532
-#: shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -12702,6 +13006,74 @@ msgstr "sissetulev"
 msgid "outgoing"
 msgstr "väljaminev"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filtri reeglid</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Võrdle"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Sissetulev"
+
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Sõnumi kuupäeva võrreldakse allpool\n"
+"määratud ajahetkega."
+
+#: filter/filter.glade.h:6
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Sõnumi kuupäeva võrreldakse ajahetkega,\n"
+"mis on suhteline filtri käivitamise hetkega.\n"
+"Näiteks: 2 nädalat tagasi"
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Sõnumi kuupäeva võrreldakse allpool\n"
+"määratud ajahetkega."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "ajaga, mis on suhteline käesoleva hetkega"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "tagasi"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "kuud"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekundit"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "praegune aeg"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "sinu poolt määratud aeg"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "aastat"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Reegli lisamine"
@@ -12714,60 +13086,76 @@ msgstr "Muuda reeglit"
 msgid "Rule name"
 msgstr "Reegli nimi"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Hindereeglid"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "*Control*F1"
+msgstr "Vahemälu-kontroll:"
 
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Hinne"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Kella häälestus"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Sisu sisaldab"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Sisu ei sisalda"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Sisu või teema sisaldab"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sisesta siia oma meiliaadress"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Sõnum sisaldab"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolutioni meiliklient"
 
-#: filter/searchtypes.xml.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Recipients contain"
-msgstr "ei sisalda"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Saatja sisaldab"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolutioni aadressiraamatu komponent"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Teema sisaldab"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutioni kirjakoostaja"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Teema ei sisalda"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtuaalsed _kaustad"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolutioni Netscape Mail'i importija"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Lisa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "E-Post"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VKausta allikas"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Meilikontod"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Meili häälestus"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Post"
 
 #  translators: default account indicator
 #. translators: default account indicator
@@ -12783,8 +13171,7 @@ msgstr "Konto nimi"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305
-#: mail/em-composer-prefs.c:424
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
 #: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Nimetu"
@@ -12813,9 +13200,320 @@ msgstr "tundmatu saatja"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: mail/em-composer-utils.c:1547
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filtri reeglid"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Kausta valimine"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Omista ülesanne"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Määratud"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Manus"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Sisu sisaldab"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Kopeeri kausta"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Vastuvõetud"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Kirje saadetud!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Kustuta"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Sisu ei sisalda"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "Faili %s pole olemas"
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Faili %s pole olemas"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Sisu ei sisalda"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Sisu ei sisalda"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "EI saa käivitada wombatit"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Kuupäev"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Nimi algab stringiga"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "_Välju"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Tekst"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Lõpeb"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Vastukaja"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Loend"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "pärast"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "enne"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Tähistatud"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Loend"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Tähistatud"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Juuni"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Silt"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s meililist"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Saadetav sõnum"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Saadetav sõnum"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Sõnumid"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Märgista kui _mitte rämps"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Tõsta kausta"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Välju programmist"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Mängi heli:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Loetud"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "ei sisalda"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Vastused"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "on väiksem kui"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Käivita programm:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Hinne"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Saada"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Olek"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Suurus"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Lähteraamat"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "ainult kirjeldatud kaustad"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Peata laadimine"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Teema"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Ühendriigid"
+
+#  and now for the action area
+#  and now for the action area
+#  and now for the action area
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>siis</b>"
+
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
@@ -12827,7 +13525,19 @@ msgstr "Kausta omadused"
 
 #. TODO: can this be done in a loop?
 #: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Abiteade"
+msgstr[1] "Abiteade"
+
 #: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Järgmine _lugemata sõnum"
+msgstr[1] "Järgmine _lugemata sõnum"
+
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr "<kausta valimiseks kliki siia>"
@@ -12836,9 +13546,8 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2310
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
@@ -12850,466 +13559,415 @@ msgstr "Loo"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VKaustad"
+
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#  UNMATCHED is always last
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+#, fuzzy
+msgid "UNMATCHED"
+msgstr "Puudub \\{"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Laadimine..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:850
-#: mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:852
-#: mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:958
-#: ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:959
-#: ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:961
-#: mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Liiguta"
 
-#: mail/em-folder-tree.c:963
-#: mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Lohistamise pide"
 
-#: mail/em-folder-tree.c:2083
-#: mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798
-#: mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2083
-#: mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2310
-#: mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2572
-#: ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution.xml.h:37
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Liiguta..."
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Nimeta ümber..."
 
 #  TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-tree.c:2588
-#: ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: mail/em-folder-tree-model.c:199
-#: mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "VKaustad"
-
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#  UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205
-#: mail/em-folder-tree-model.c:207
-#, fuzzy
-msgid "UNMATCHED"
-msgstr "Puudub \\{"
-
-#  Inbox is always first
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211
-#: mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Sisendkast"
-
-#: mail/em-folder-tree-model.c:469
-#: mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Laadimine..."
-
-#: mail/em-folder-view.c:414
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418
-#: mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474
-#: mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "E-Post"
-
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895
-#: mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:900
-#: ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:901
-#: mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:902
-#: mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:903
-#: mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Vastu_kaja..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Märgista kui lõpetatud"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:911
-#: ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Märgi _mitteloetuks"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:915
-#: ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:916
-#: ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista kui _mitte rämps"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:924
-#: ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
-#: mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Silt"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Rakenda _filtrid"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "_Rämpsu filtreerimine"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _meililoendi järgi"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710
-#: mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#: mail/em-format.c:750
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82
-#: mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Saatja"
-
-#: mail/em-format.c:751
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Vastus-Kuhu"
-
-#: mail/em-format.c:752
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kellele"
-
-#: mail/em-format.c:753
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Koopia"
-
-#: mail/em-format.c:754
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Pimekoopia"
-
-#: mail/em-format.c:755
-#: mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Teema"
-
-#: mail/em-format.c:756
-#: mail/em-format-html.c:1563
-#: mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Kuupäev"
-
-#: mail/em-format.c:757
-#: mail/em-format-html.c:1586
-#: mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Uudisegrupid"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "\"%s\" tüüpi manus"
-
-#: mail/em-format.c:1024
-#: mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Toetamata allkirjavorming"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Viga allkirja tõestamisel"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Tundmatu viga allkirja tõestamisel"
-
-#: mail/em-format-html.c:452
-#: mail/em-format-html.c:454
+#  message-search popup match count string
+#  message-search popup match count string
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' tõmbamine"
+msgid "Matches: %d"
+msgstr "Sobivaid: %d"
 
-#: mail/em-format-html.c:559
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html.c:560
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html.c:561
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
+"on tõese sõnumiga."
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html.c:568
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:644
+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:650 mail/em-format-html.c:568
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html.c:569
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html.c:570
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html.c:571
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Sertifikaadi kuvamine"
+
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr "See sertifikaat ei ole kuvatav"
+
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Tähtaja ületanud:"
+
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
+msgstr "_Sisekuva"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "_Peida"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Lehekülg %d %d-st"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' tõmbamine"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
+
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
@@ -13343,9 +14001,34 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Saatja"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Vastus-Kuhu"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kellele"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Koopia"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Pimekoopia"
+
 #. pseudo-header
-#: mail/em-format-html.c:1523
-#: mail/em-format-quote.c:309
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
 #: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Postiprogramm:"
@@ -13370,83 +14053,43 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#  message-search popup match count string
-#  message-search popup match count string
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "Sobivaid: %d"
-
-#: mail/em-format-html-display.c:644
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
-
-#: mail/em-format-html-display.c:645
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist on tõese sõnumiga."
-
-#: mail/em-format-html-display.c:646
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
-
-#: mail/em-format-html-display.c:647
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Kuupäev"
 
-#: mail/em-format-html-display.c:653
-msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
-msgstr ""
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Uudisegrupid"
 
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format-html-display.c:655
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr ""
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757
-#: smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "_Sertifikaadi kuvamine"
-
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
-msgstr "See sertifikaat ei ole kuvatav"
-
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Tähtaja ületanud:"
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
 
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr "_Sisekuva"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Toetamata allkirjavorming"
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "_Peida"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Viga allkirja tõestamisel"
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Lehekülg %d %d-st"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Tundmatu viga allkirja tõestamisel"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13471,11 +14114,13 @@ msgstr "Kord kuus"
 #: mail/em-migrate.c:1168
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"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 ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -13509,8 +14154,7 @@ msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2413
-#: mail/em-migrate.c:2425
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
@@ -13523,7 +14167,9 @@ msgstr ""
 " %s"
 
 #: mail/em-migrate.c:2594
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:700
@@ -13555,7 +14201,7 @@ msgstr "S_aada sõnum..."
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
@@ -13608,11 +14254,23 @@ msgstr "Aadressi lisamine"
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtuaalsed _kaustad"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Lisa"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VKausta allikas"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automaatne viidatuvastus"
@@ -13723,7 +14381,10 @@ msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
 #: mail/evolution-mail.schemas.in.in.h:27
-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."
+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:28
@@ -13744,7 +14405,9 @@ msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
 #: mail/evolution-mail.schemas.in.in.h:32
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+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:33
@@ -13752,7 +14415,9 @@ msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:34
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:35
@@ -13768,8 +14433,14 @@ msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-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 "Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on aadressiraamatus 3 - Alati laadi pildid võrgust maha."
+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 ""
+"Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi "
+"ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on "
+"aadressiraamatus 3 - Alati laadi pildid võrgust maha."
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
@@ -13843,7 +14514,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -13857,13 +14529,17 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+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:60
 #, 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"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
@@ -13953,7 +14629,11 @@ msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
 #: mail/evolution-mail.schemas.in.in.h:82
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
@@ -14056,7 +14736,9 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:106
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+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/evolution-mail.schemas.in.in.h:107
@@ -14067,69 +14749,38 @@ msgstr ""
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "*Control*F1"
-msgstr "Vahemälu-kontroll:"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Kella häälestus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sisesta siia oma meiliaadress"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolutioni meiliklient"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolutioni aadressiraamatu komponent"
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutioni Elm'i importija"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolutioni kirjakoostaja"
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutioni Netscape Mail'i importija"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutioni Outlook Express 4 importija"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolutioni Netscape Mail'i importija"
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolutioni Pine'i importija"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Meilikontod"
+# !PARANDA!
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolutioni mbox'i importija"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Meili häälestus"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Expressi 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14138,16 +14789,14 @@ msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:221
 #: mail/importers/evolution-outlook-importer.c:255
-#: mail/importers/netscape-importer.c:1251
-#: mail/importers/pine-importer.c:117
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importimine..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:223
 #: mail/importers/evolution-outlook-importer.c:257
-#: mail/importers/netscape-importer.c:1253
-#: mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -14190,39 +14839,6 @@ msgstr "'%s' importimine"
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
 
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutioni Elm'i importija"
-
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutioni Netscape Mail'i importija"
-
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutioni Outlook Express 4 importija"
-
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutioni Pine'i importija"
-
-# !PARANDA!
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolutioni mbox'i importija"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Expressi 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14333,18 +14949,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-account-gui.c:957
-#: mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:961
-#: mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:965
-#: mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
@@ -14372,111 +14985,165 @@ msgstr "%s meililist"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:469
-#: mail/mail-component.c:471
+#: mail/mail-component.c:459
+#, fuzzy, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "Valitud"
+msgstr[1] "Valitud"
+
+#: mail/mail-component.c:461
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:484
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:486
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:488
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:492
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
+
 #: mail/mail-component.c:494
-#: mail/mail-component.c:496
-#: mail/mail-component.c:498
-#: mail/mail-component.c:502
-#: mail/mail-component.c:504
-#: mail/mail-component.c:671
 #, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Teenuse kontrollimine"
-
-#: mail/mail-config.c:973
-#: mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Serveriga ühendumine..."
-
-#: mail/mail-config-druid.c:362
-#: mail/mail-config.glade.h:92
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteet"
 
 #: mail/mail-config-druid.c:364
 #, fuzzy
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+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 ""
-"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
-"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
+"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
+"\"Mittekohustuslikud\" väljad\n"
+"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
+"sõnumitesse."
 
-#: mail/mail-config-druid.c:370
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Meili vastuvõtmine"
 
 #: mail/mail-config-druid.c:372
 #, fuzzy
-msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. Kui sa ei ole para-\n"
-"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. "
+"Kui sa ei ole para-\n"
+"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
 #: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382
-#: mail/mail-config.glade.h:131
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Meili saatmine"
 
 #: mail/mail-config-druid.c:384
 #, fuzzy
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+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 ""
-"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
-"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
+"välja saata. Kui sa ei ole\n"
+"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:389
-#: mail/mail-config.glade.h:37
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontohaldus"
 
 #: mail/mail-config-druid.c:391
-msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Teenuse kontrollimine"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Serveriga ühendumine..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Toetatavate tüüpide tuvastamine"
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Eelvaade</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL toetus ei ole selles evolutioni ehituses saadaval</b>"
@@ -14640,8 +15307,7 @@ msgstr ""
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:47
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
@@ -14738,7 +15404,7 @@ msgstr "Originaalsõnumite ei tsiteerita"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
@@ -14826,7 +15492,9 @@ msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
 #: mail/mail-config.glade.h:104
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
@@ -14845,7 +15513,9 @@ msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 #: mail/mail-config.glade.h:112
 #, 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"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
 #: mail/mail-config.glade.h:113
 #, fuzzy
@@ -14965,7 +15635,10 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:147
-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."
+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:149
@@ -15070,6 +15743,116 @@ msgstr "värv"
 msgid "description"
 msgstr "kirjeldus"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vKausta allikad</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digitaalne allkiri</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Krüpteerimine</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Vastu võetud"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Lõpetatud"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Tõstutundlik"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Otsing sõnumist"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Otsing:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "_Vastukaja sildi järgi"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Kaustade tellimused"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "&Litsents"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ühtegi pole valitud"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Server:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Turvalisuse info"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Aktsepteeritud litsentside loend"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Tähtaeg:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Silt:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Telli"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Lõpeta tellimus"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "ainult kirjeldatud kaustad"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "koos kõigi aktiivsete võrgukaustadega"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "koos kõigi kohalike ja aktiivsete võrgukaustadega"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "koos kõigi kohalike kalatoogidega"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -15077,8 +15860,12 @@ msgstr "Vigane autentimine"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see autentimist üleüldse."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
+"autentimist üleüldse."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15089,29 +15876,32 @@ msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
 #, fuzzy
-msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
+"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#  mail:ask-send-html secondary
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.h:15
-#: mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27
-#: mail/mail-errors.xml.h:32
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Saada"
+msgstr "Saada"
 
 #  mail:ask-send-no-subject primary
 #. mail:ask-send-no-subject primary
@@ -15119,44 +15909,52 @@ msgstr "_Saada"
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 
-#  mail:ask-send-no-subject secondary
 #. mail:ask-send-no-subject secondary
 #: mail/mail-errors.xml.h:19
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
 #  mail:ask-send-only-bcc-contact primary
 #  mail:ask-send-only-bcc primary
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22
-#: mail/mail-errors.xml.h:29
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+msgstr ""
+"Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
-#  mail:ask-send-only-bcc-contact secondary
 #. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#  mail:ask-send-only-bcc secondary
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
 #. mail:ask-default-drafts primary
@@ -15166,7 +15964,9 @@ msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
 
 #  default charset used in mail view
@@ -15178,13 +15978,13 @@ msgstr "Kasuta _vaikekodeeringut"
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45
-#: mail/mail-errors.xml.h:50
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
@@ -15196,7 +15996,9 @@ msgstr "_Puhasta"
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
 #: mail/mail-errors.xml.h:51
@@ -15210,7 +16012,9 @@ msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
 #. mail:camel-exception primary
@@ -15221,8 +16025,10 @@ msgstr ""
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 msgstr ""
 
 #. mail:async-error primary
@@ -15245,25 +16051,6 @@ msgstr "Viga käsu täitmisel."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15280,10 +16067,7 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94
-#: mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa salvestada."
@@ -15319,10 +16103,10 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116
-#: mail/mail-errors.xml.h:120
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
 #. mail:no-rename-spethal-folder primary
@@ -15342,20 +16126,18 @@ msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128
-#: mail/mail-errors.xml.h:132
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130
-#: mail/mail-errors.xml.h:192
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
 
@@ -15365,30 +16147,22 @@ msgid "Because \"{2}\"."
 msgstr "Kuna \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136
-#: mail/mail-errors.xml.h:140
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138
-#: mail/mail-errors.xml.h:146
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" ei saa avada."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142
-#: mail/mail-errors.xml.h:150
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" ei saa avada."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144
-#: mail/mail-errors.xml.h:148
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
 
@@ -15403,9 +16177,8 @@ msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" ei saa avada"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156
-#: mail/mail-errors.xml.h:160
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi ei saa salvestada."
 
@@ -15426,8 +16199,11 @@ msgstr "Kustuta konto?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Kas sa tõesti soovid kustutada seda kontot?"
+msgstr ""
+"Kas sa tõesti soovid\n"
+"kustutada seda kontakti?"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15435,8 +16211,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ära kustuta"
+msgstr "_Taasta"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15467,6 +16244,7 @@ msgstr "Loobu muudatustest?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Kas soovid tehtud muudatused salvestada?"
 
@@ -15486,7 +16264,9 @@ msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
-msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
@@ -15524,29 +16304,57 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Puuduv kaust."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Kausta valimine on kohustuslik."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Sa pead sellele vKaustale nime andma."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Ühtegi allikat pole valitud."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Eira"
 
-#: mail/mail-errors.xml.h:217
-#: widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Lisa"
 
@@ -15651,8 +16459,7 @@ msgstr "Konto %s salvestamine"
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1559
-#: mail/mail-ops.c:1610
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
@@ -15671,7 +16478,19 @@ msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
 #: mail/mail-ops.c:1763
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Sõnumi %s vastuvõtt"
+msgstr[1] "Sõnumi %s vastuvõtt"
+
 #: mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Sõnumite liigutamine"
+msgstr[1] "Sõnumite liigutamine"
+
 #: mail/mail-ops.c:1899
 #, c-format
 msgid ""
@@ -15718,30 +16537,6 @@ msgstr "Ühendun lahti: %s"
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Tõstutundlik"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Otsing sõnumist"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Otsing:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitaalne allkiri</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Krüpteerimine</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Turvalisuse info"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Katkestan..."
@@ -15773,8 +16568,7 @@ msgstr "Tühista _kõik"
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:412
-#: mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Ootamine..."
 
@@ -15850,15 +16644,15 @@ msgstr "'%s:%s' vkaustade uuendamine"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
@@ -15971,8 +16765,7 @@ msgstr "Vastukaja"
 msgid "For Your Information"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: mail/message-tag-followup.c:77
-#: ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
@@ -15981,17 +16774,11 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Käsule %s ei tulnud vastust."
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Loetud"
-
-#: mail/message-tag-followup.c:80
-#: ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:81
-#: ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -15999,49 +16786,51 @@ msgstr "Vasta kõigile"
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:294
-#: mail/message-tags.glade.h:3
-#, fuzzy
-msgid "Flag to Follow Up"
-msgstr "_Vastukaja sildi järgi"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Sisu sisaldab"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Lõpetatud"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Sisu ei sisalda"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Sisu või teema sisaldab"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Tähtaeg:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Sõnum sisaldab"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Silt:"
+#: mail/searchtypes.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "ei sisalda"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Kaustade tellimused"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Saatja sisaldab"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ühtegi pole valitud"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Teema sisaldab"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Server:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Teema ei sisalda"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Telli"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolutioni kest"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Lõpeta tellimus"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolutioni test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Testi vaate komponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16069,15 +16858,20 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-msgid "If set to true, Evolution will start up in offline mode instead of online mode."
+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:8
-msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
+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:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
@@ -16102,34 +16896,21 @@ msgstr ""
 msgid "mail"
 msgstr "kirjad"
 
-#: shell/e-shell.c:588
-#: shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%.0f kb/s"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Tundmatu süsteemi viga."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Vigased argumendid"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "OAF'i ei saa registreerida"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Autentimine</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Ei leia häälestusandmebaasi"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Tegevused viiakse täide"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Üldine viga"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:592
-#: shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -16139,17 +16920,18 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: shell/e-shell-importer.c:149
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
 #: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:158
-#: shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
@@ -16161,8 +16943,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:229
-#: shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16175,8 +16956,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:451
-#: shell/e-shell-importer.c:1055
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
@@ -16190,8 +16970,7 @@ msgstr "Importimine"
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:477
-#: shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
@@ -16231,8 +17010,7 @@ msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:752
-#: shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16245,8 +17023,7 @@ msgstr ""
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:882
-#: shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
@@ -16278,7 +17055,9 @@ msgstr "Importimise alustamine"
 
 #: shell/e-shell-startup-wizard.c:795
 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"
+"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 ""
@@ -16303,26 +17082,6 @@ msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Lülitumine: %1"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
@@ -16349,20 +17108,103 @@ msgstr "Grupitöö võimalused"
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:575
-#: ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:588
-#: ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
+"seda nuppu."
+
+#: shell/e-shell-window.c:344
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
+
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "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-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Lülitumine: %1"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%.0f kb/s"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Tundmatu süsteemi viga."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Vigased argumendid"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF'i ei saa registreerida"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Ei leia häälestusandmebaasi"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Üldine viga"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Uus"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution'i impordiassistent"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "Impordi failist"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "Ajav_öönd:"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uus test"
@@ -16375,19 +17217,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Loo uus testielement"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolutioni kest"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolutioni test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Testi vaate komponent"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faili importimiseks Evolution'i vajuta \"Impordi\"."
@@ -16427,8 +17256,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:195
-#: smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Impordi"
 
@@ -16445,7 +17273,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16465,7 +17293,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16474,64 +17302,148 @@ msgstr ""
 "Tänud\n"
 "Ximian Evolution'i meeskond\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Alusta offlainrežiimis"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Alusta onlainrežiimis"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, 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:130
-#: smime/gui/certificate-manager.c:353
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Sisu sisaldab"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ei saa käivitada wombat serverit"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution'i kontoassistent"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:245
-#: smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
 #: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:254
-#: smime/gui/certificate-manager.c:455
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:263
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -16643,11 +17555,12 @@ msgid "Backup All"
 msgstr "Kogu päev"
 
 #: 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)."
+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:1076
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -16723,13 +17636,11 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34
-#: smime/lib/e-cert.c:818
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35
-#: smime/lib/e-cert.c:822
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
@@ -16759,7 +17670,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
@@ -16775,12 +17687,17 @@ msgstr "Sinu sertifikaadid"
 msgid "_Edit CA Trust"
 msgstr " %d = EI usalda\n"
 
-#: smime/lib/e-cert.c:238
-#: smime/lib/e-cert.c:248
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikaat on juba olemas."
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 #  x509 certificate usage types
+#. x509 certificate usage types
 #: smime/lib/e-cert.c:424
 msgid "Sign"
 msgstr "Allkirjasta"
@@ -16897,13 +17814,11 @@ msgstr "Teema avaliku võtme info"
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:809
-#: smime/lib/e-cert.c:858
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit ei saa töödelda"
 
-#: smime/lib/e-cert.c:830
-#: smime/lib/e-cert.c:842
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -16949,8 +17864,7 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:940
-#: smime/lib/e-cert.c:943
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -16963,8 +17877,7 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1091
-#: smime/lib/e-cert.c:1211
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -16984,11 +17897,6 @@ msgstr "Teema unikaalne ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Sertifikaat on juba olemas."
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 faili parool"
@@ -17048,8 +17956,7 @@ msgstr "Süsteemi %s sulgemine (%s)\n"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopeeri kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:4
-#: ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
@@ -17057,8 +17964,7 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -17074,8 +17980,7 @@ msgstr "Liiguta kontakt(id) teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -17083,10 +17988,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:20
-#: ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -17136,24 +18039,17 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16
-#: ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
+#: 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:15
-#: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107
-#: ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:27
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35
-#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
@@ -17161,8 +18057,7 @@ msgstr "_Edasta kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -17219,8 +18114,7 @@ msgstr "Loend"
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:15
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Järgmine"
 
@@ -17228,8 +18122,7 @@ msgstr "Järgmine"
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -17241,8 +18134,7 @@ msgstr "Kalendri trükkimine"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publitseeri selle kalendri vaba/hõivatud info"
 
-#: ui/evolution-calendar.xml.h:23
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhastamine"
 
@@ -17282,8 +18174,7 @@ msgstr "Näitab ühte nädalat"
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:249
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
 #: widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Täna"
@@ -17304,19 +18195,16 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Sündmus avamine"
 
-#: ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-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 "_Sulge"
 
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:2
+#: 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-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Sulge"
@@ -17325,15 +18213,12 @@ msgstr "Sulge"
 msgid "Close this item"
 msgstr "Sulgeb elemendi"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Kustuta see element"
 
-#: 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:13
+#: 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:13
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -17341,27 +18226,23 @@ msgstr "Peatööriistariba"
 msgid "Preview the printed item"
 msgstr "Trükitava elemendi eelvaatlemine"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Trüki see element"
 
-#: ui/evolution-comp-editor.xml.h:11
-#: ui/evolution-contact-editor.xml.h:8
+#: 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 "_Salvesta kui..."
 
-#: ui/evolution-comp-editor.xml.h:12
-#: ui/evolution-contact-editor.xml.h:9
+#: 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 "Salvesta ja sulge"
 
-#: ui/evolution-comp-editor.xml.h:13
-#: ui/evolution-contact-editor.xml.h:10
+#: 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"
@@ -17375,13 +18256,11 @@ msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 msgid "Save this item to disk"
 msgstr "Salvestab elemendi kettale"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:15
+#: 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:44
-#: ui/evolution-signature-editor.xml.h:13
-#: ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fail"
@@ -17390,8 +18269,7 @@ msgstr "_Fail"
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ui/evolution-composer-entries.xml.h:2
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
@@ -17403,8 +18281,7 @@ msgstr "Lõika valitud tekst lõikelauale"
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ui/evolution-composer-entries.xml.h:5
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -17460,13 +18337,11 @@ msgstr "Koo_soleku ärajätmine"
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3
-#: ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "_Edasta iKalendrina"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Edastab elemendi e-posti kaudu"
 
@@ -17551,13 +18426,11 @@ msgstr "_Filtrid..."
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) kopeerimine lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) lõikamine lõikelauale"
 
@@ -17578,7 +18451,8 @@ msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17589,8 +18463,7 @@ msgstr "Märgi Kõik loetuks"
 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:74
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Sõnumi(te) asetamine lõikepuhvrist"
 
@@ -17638,8 +18511,7 @@ msgstr "Esitab sõnumeid jutulõngadena"
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteeri valik"
 
@@ -17647,18 +18519,6 @@ msgstr "_Inverteeri valik"
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Sulgeb akna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Sul_ge"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Saatja lisamine _aadressiraamatusse"
@@ -18058,8 +18918,7 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129
-#: ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18067,6 +18926,16 @@ msgstr "T_ööriistad"
 msgid "_Undelete"
 msgstr "_Taasta"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Sulgeb akna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Sul_ge"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Manusta"
@@ -18075,8 +18944,7 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -18092,8 +18960,7 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
@@ -18151,10 +19018,6 @@ msgstr "Salvesta käesolev fail teise nime all"
 msgid "Save the message in a specified folder"
 msgstr "Salvesta käesolev fail teise kausta"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Saada"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18558,7 +19421,8 @@ msgstr "Vali ajavöönd"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"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 ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
@@ -18597,8 +19461,7 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Praegu"
 
@@ -18659,16 +19522,13 @@ msgstr "lääne-euroopa"
 msgid "Western European, New"
 msgstr "Lääne-euroopa, uust"
 
-#: widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "traditsiooniline"
 
-#: widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
@@ -18685,8 +19545,7 @@ msgstr "visuaalne"
 msgid "Unknown character set: %s"
 msgstr "Tundmatu märgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:216
-#: widgets/misc/e-charset-picker.c:479
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -18702,14 +19561,12 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
 #: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
 #: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
@@ -18726,8 +19583,10 @@ msgstr "Evolutioni päring"
 #. setup a dummy error
 #: widgets/misc/e-error.c:417
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+"<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -18746,7 +19605,9 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: widgets/misc/e-expander.c:198
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
@@ -18795,18 +19656,15 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:92
-#: widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: widgets/misc/e-filter-bar.h:93
-#: widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Täpsemalt..."
 
@@ -18822,8 +19680,7 @@ msgstr "_Otsing"
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:547
-#: widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
@@ -18873,3 +19730,157 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Serverilt saadi vigane autentimise vastus."
+
+#, fuzzy
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "valitud valiku väärtus"
+
+#~ msgid "Login name:"
+#~ msgstr "Sisselogimisnimi:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#, fuzzy
+#~ msgid "User Publishes"
+#~ msgstr "Kasutajanimi"
+
+#~ msgid "C_alendar"
+#~ msgstr "_Kalender"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Helialarmi häälestus"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Sõnumialarmi häälestus"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Helialarmi häälestus"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programmi alarmi häälestus"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Tundmatu alarmi häälestus"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Korduv alarm"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Näidatav sõnum:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Nende parameetritega:"
+
+#~ msgid "Basics"
+#~ msgstr "Põhilised asjad"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Kuupäev ja kell:"
+
+#~ msgid "Reminders"
+#~ msgstr "Meeldetuletajad"
+
+#~ msgid "_Options..."
+#~ msgstr "_Häälestus..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Aadressiraamat..."
+
+#~ msgid "Reminder"
+#~ msgstr "Meeldetuletaja"
+
+#~ msgid "B_usy"
+#~ msgstr "_Hõivatud"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "S_alajane"
+
+#~ msgid "Date & Time"
+#~ msgstr "Kuupäev ja kellaaeg"
+
+#~ msgid "F_ree"
+#~ msgstr "Va_ba"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Isiklik"
+
+#~ msgid "Pu_blic"
+#~ msgstr "A_valik"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Lisa _osavõtja"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
+
+#~ msgid "Preview"
+#~ msgstr "Eelvaade"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Korduse reegel"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "K_ohandatud kordus"
+
+#~ msgid "_Modify"
+#~ msgstr "_Muuda"
+
+#~ msgid "_No recurrence"
+#~ msgstr "E_i kordu"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Li_htne kordus"
+
+#~ msgid "% _Complete"
+#~ msgstr "(%) _valmis"
+
+#~ msgid "Progress"
+#~ msgstr "Edenemine"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Salajane"
+
+#~ msgid "Folder:"
+#~ msgstr "Kaust:"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objekti ei suudetud leida\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Sul pole õigusi kalendri muutmiseks\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Loetud aadressiraamatu kirje %1, kokku %2"
+
+#~ msgid "_Options"
+#~ msgstr "_Häälestus"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Koosoleku _algus:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Koosoleku l_õpp:"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "CMS sõnumit ei saa luua"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "ei suuda luua objekti '%s'"
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Hindereeglid"
diff --git a/po/eu.po b/po/eu.po
index c7d7d9a9e6..eec0fd49eb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-04-05 21:04+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution-en helbide-liburua"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontaktu-goiburua: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution-en txarteltxoa"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "uneko helbide-liburuaren karpeta"
@@ -49,34 +41,250 @@ msgstr " txartelak"
 msgid " card"
 msgstr " txartel"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "kontaktu-goiburua: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution-en txarteltxoa"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Ezin izan da kurtsorea kargatu\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Ezin izan da helbide-liburua kargatu"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategoria-editorea ez dago erabilgarri."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Gorde helbide-liburuan"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Errorea helbide-liburu lehenetsia kargatzean."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Errorea bilaketa egitean"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Aldaketak gorde nahi dituzu?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Ez"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "eta beste txartel bat."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Ezin da mezua eskuratu editoretik"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Errorea txartela gehitzean"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Ezin izan da helbide-liburua kargatu"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP zerbitzarian anonimoki sartzea"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Huts egin du autentifikatzean.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Osatze automatikoa"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Ziurtagiria:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfiguratu osatze automatikoa hemen"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution-en helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-en helbide-liburuko helbide-leihoa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuaren osagaia"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -109,7 +317,7 @@ msgstr "Kontaktu berria"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontaktuak:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,15 +341,15 @@ msgid "Migrating `%s':"
 msgstr "'%s' migratzen:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -150,19 +358,19 @@ msgid "Personal"
 msgstr "Pertsonala"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzarian"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP zerbitzariak"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Osatze automatikoaren ezarpenak"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -170,57 +378,66 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktuak"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP zerbitzarian anonimoki sartzea"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Huts egin du autentifikatzean.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -240,60 +457,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Osatze automatikoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Ziurtagiria:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Konfiguratu osatze automatikoa hemen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution-en helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-en helbide-liburuko helbide-leihoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuaren osagaia"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -301,7 +464,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -310,8 +473,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -337,6 +499,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentifikazioa"
@@ -385,13 +548,11 @@ msgid "Anonymously"
 msgstr "Anonimoki"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -657,34 +818,26 @@ msgid "cards"
 msgstr "txartel"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutu"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Hautatu kontaktuak helbide-liburutik"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Kendu denak"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Kendu"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Kendu denak"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ikusi kontaktuen zerrenda"
@@ -699,7 +852,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML mezua bidali?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Gehitu kontaktuei"
 
@@ -707,15 +860,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Hautatu kontaktuak helbide-liburutik"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -742,6 +903,11 @@ msgstr "_Kategoria:"
 msgid "_Find"
 msgstr "Bilatu"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Bilatu"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -787,9 +953,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Falta:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -814,7 +979,6 @@ msgid "Birthday:"
 msgstr "U_rtebetetzea:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "E_gutegia:"
@@ -830,15 +994,15 @@ msgid "Company:"
 msgstr "Enpresakoa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontaktua"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -948,8 +1112,8 @@ msgstr "_Web orriaren helbidea:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -971,44 +1135,28 @@ msgid "_File under:"
 msgstr "Fitxategi-izena:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Zerbitzaria:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ziur zaude kontaktu hauek\n"
-"ezabatu nahi dituzula?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ziur zaude kontaktu hau\n"
-"ezabatu nahi duzula?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Helbidea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editagarria"
 
@@ -1987,139 +2135,131 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Taldea"
+msgid "Service"
+msgstr "Zerbitzua prest"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Kokalekua:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Erabiltzaile-izena:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Etxekoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Taldea"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Errepikatze-data ez da baliozkoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Bilatu kontaktua hemen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Ez"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Zerbitzua prest"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Kokalekua:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Erabiltzaile-izena:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
@@ -2137,6 +2277,22 @@ msgstr "_Izen-abizenak:"
 msgid "E-_mail:"
 msgstr "_Helb. el:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ziur zaude kontaktu hauek\n"
+"ezabatu nahi dituzula?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ziur zaude kontaktu hau\n"
+"ezabatu nahi duzula?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. helbidea:"
@@ -2263,49 +2419,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Hautatu kontaktuak helbide-liburutik"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Kideak"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Hautatuta"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ezkutatu helbideak zerrenda honetara mezuak bidaltzean"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Zerrenda-izena:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "kontaktu-zerrendaren editorea"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "1 elkarrizketa-koadroa"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Liburua"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Zerrenda berria da"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Beharrezko partaideak"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Gorde zerrenda VCard gisa"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Aldatutako kontaktua:"
@@ -2344,11 +2521,414 @@ msgstr ""
 "karpeta honetan.  Hala ere gehitu nahi duzu?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Erakutsi kontaktuak"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Bilatu kontaktua hemen:"
+msgstr[1] "Bilatu kontaktua hemen:"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Kontsulta"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Errorea liburu-ikuspegia lortzean"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Modeloa"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Errorea txartela aldatzean"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Izena honela hasten da:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "Helb. el. honela hasten da:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategoria da:"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Edozein eremuk hau dauka:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Aurreratua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Mota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Gorde VCard gisa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Kontaktu berria..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Kontaktuen zerrenda berria..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Joan karpeta honetara..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Inportatu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Bilatu kontaktuak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Helbide-liburuaren iturburuak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Pilot-aren ezarpenak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Birbidali kontaktua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Bidali mezua kontaktuari"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Inprimatu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Inprimatu gutun-azala"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Helbide-liburua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Helbide-liburua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Ebaki"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiatu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Itsatsi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Uneko ikuspegia"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Edozein kategoria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Laguntzailea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Laguntzailearen telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Laneko faxa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Laneko telefonoa"
+
+#: 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:6
+msgid "Callback Phone"
+msgstr "Atzera deitzeko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Autoko telefonoa"
+
+#: 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:3
+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:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Helb. el."
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "2. helb. el."
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "3. helb. el."
+
+#: 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 "Gorde honela"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#, fuzzy
+msgid "Given Name"
+msgstr "Eremu-izena"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Etxeko faxa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Etxeko telefonoa"
+
+#: 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:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefonoa"
+
+#: 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:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefono mugikorra"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Oharra"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Bulegoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Erakundea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Beste fax bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Beste telefono bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Bilagailua"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Telefono nagusia"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Irrati-telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "Teletipoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex-a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Titulua"
+
+#: 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"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Zabalera"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Altuera"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Fokua du"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Eremua"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Eremu-izena"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Testu-eredua"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Eremu-izenaren geh. luzera"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Zutabe-zabalera"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Ez dago ikuspegi honetan erakusteko elementurik.\n"
+"\n"
+"Egin klik bikoitza hemen kontaktu berria sortzeko."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Ez dago ikuspegi honetan erakusteko elementurik."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Moldagailua"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Hautatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Kurtsorea du"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2361,117 +2941,90 @@ msgid "map"
 msgstr "Amapala"
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Kideak"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Erakundea"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Taldea"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 #, fuzzy
 msgid "Fax"
 msgstr "Lan fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Lanekoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Pertsonala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Oharra"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "Kar_gua:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Helb. el."
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Etxeko faxa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Helbide-liburu hori ez dago"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Kontaktuen zerrenda berria"
@@ -2479,74 +3032,74 @@ msgstr "Kontaktuen zerrenda berria"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ez da txartela aurkitu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Ezin izan da objektua eguneratu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS ez dago erabilgarri"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Ez dago horrelako mezurik"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2554,7 +3107,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
 "eta sarbidea baduzula."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2562,7 +3115,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo LDAP zerbitzaria ezin dela atzitu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2573,7 +3126,7 @@ msgstr ""
 "erabili nahi baduzu Evolution-en programa konpilatu behar duzu CVS "
 "iturburuetatik beheko estekatik OpenLDAP eskuratuz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2581,7 +3134,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo zerbitzaria ezin dela atzitu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2594,7 +3147,7 @@ msgstr ""
 "gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
 "hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2606,48 +3159,48 @@ msgstr ""
 "edo gehitu denbora-muga, helbide-liburu honen\n"
 "direktorio-zerbitzariaren hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Kontsulta ez da behar bezala egin."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2656,7 +3209,7 @@ msgstr ""
 "%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
 "Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2665,49 +3218,49 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Eraman txartela hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiatu txartela hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Eraman txartelak hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiatu txartelak hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "%s - VCard-a"
@@ -2717,48 +3270,38 @@ msgstr "%s - VCard-a"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Helb. el. nagusia"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "2. helb. el."
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "3. helb. el."
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Hautatu ekintza bat"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Sortu \"%s\" kontaktu berria"
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen \"%s\" kontaktuari"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
@@ -2784,377 +3327,6 @@ msgstr "Gorde kontaktua VCard gisa"
 msgid "Save in addressbook"
 msgstr "Gorde helbide-liburuan"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Erakutsi kontaktuak"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Bilatu kontaktua hemen:"
-msgstr[1] "Bilatu kontaktua hemen:"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Kontsulta"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Errorea liburu-ikuspegia lortzean"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Modeloa"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Errorea txartela aldatzean"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Izena honela hasten da:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "Helb. el. honela hasten da:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategoria da:"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Edozein eremuk hau dauka:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Aurreratua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Mota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Helbide-liburua"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Gorde VCard gisa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Kontaktu berria..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Kontaktuen zerrenda berria..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Joan karpeta honetara..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Inportatu..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Bilatu kontaktuak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Helbide-liburuaren iturburuak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Pilot-aren ezarpenak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Birbidali kontaktua"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Bidali mezua kontaktuari"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Inprimatu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Inprimatu gutun-azala"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Helbide-liburua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Helbide-liburua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Ebaki"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopiatu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Itsatsi"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Uneko ikuspegia"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Edozein kategoria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Laguntzailea"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Laguntzailearen telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Laneko faxa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Laneko telefonoa"
-
-#: 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:6
-msgid "Callback Phone"
-msgstr "Atzera deitzeko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Autoko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-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:13
-msgid "Family Name"
-msgstr "Deitura"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Gorde honela"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
-msgid "Given Name"
-msgstr "Eremu-izena"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Etxeko faxa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Etxeko telefonoa"
-
-#: 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:20
-#, fuzzy
-msgid "ISDN Phone"
-msgstr "Telefonoa"
-
-#: 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
-msgid "Nickname"
-msgstr "Goitizena"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Bulegoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Beste fax bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Beste telefono bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Bilagailua"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Telefono nagusia"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Irrati-telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: 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:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "Teletipoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex-a"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Titulua"
-
-#: 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"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Zabalera"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Altuera"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Fokua du"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Hautatuta"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Kurtsorea du"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Eremua"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Eremu-izena"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Testu-eredua"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Eremu-izenaren geh. luzera"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ez dago ikuspegi honetan erakusteko elementurik.\n"
-"\n"
-"Egin klik bikoitza hemen kontaktu berria sortzeko."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Ez dago ikuspegi honetan erakusteko elementurik."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Moldagailua"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Zutabe-zabalera"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Txartelen ikuspegia"
@@ -3197,6 +3369,11 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Inprimatu gutun-azala"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3208,11 +3385,6 @@ msgstr "Inprimatu hautatutako kontaktuak"
 msgid "Print contact"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Inprimatu gutun-azala"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3399,6 +3571,23 @@ msgstr "K_ontaktuen zerrenda"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Ezin da mezua ireki"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ezin izan da helbide-liburua kargatu"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ezin da helbide-liburua ireki"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3456,23 +3645,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Barne-errorea"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Ezin da mezua ireki"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Ezin izan da helbide-liburua kargatu"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ezin da helbide-liburua ireki"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Errorea helbide-liburu lehenetsia kargatzean."
@@ -3489,40 +3661,367 @@ msgstr "Ez da fitxategi-izenik eman."
 msgid "Unnamed List"
 msgstr "Zerrenda izengabea"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ez ezabatu"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Bidali honi:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Hitzordua"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Aldaketak gorde nahi dituzu?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Ez gorde"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Bidali"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution-en egutegiaren fitxategi lokalaren modulua"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Zatitu egun anitzeko gertaerak:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Ezin izan da wombat abiarazi"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren egutegiaren aplikazio-blokea irakurri"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokea irakurri"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution-en egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en egutegia konfiguratzeko kontrola"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en egutegiaren/zereginen editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution-en egutegiaren eta zereginen osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution-en probaren osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zereginak"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Hasi:"
@@ -3618,10 +4117,6 @@ 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
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
@@ -3770,9 +4265,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Laburpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Iruzkinak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Sailkatu gabeak"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3796,8 +4312,8 @@ msgid "Purge events older than"
 msgstr "hau baino txikiagoa ematen du"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "egun"
 
@@ -3808,7 +4324,7 @@ msgstr "%A, %Y %B %d"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
@@ -3858,66 +4374,54 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Bilera"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Egun _osoko hitzordua"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Kaledonia Berria"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "E_gutegia:"
+msgid "Cale_ndar"
+msgstr "Egutegia"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
@@ -3948,27 +4452,6 @@ msgstr "Asteko ikuspegia"
 msgid "Month View"
 msgstr "Hileko ikuspegia"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Laburpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Iruzkinak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Sailkatu gabeak"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegia irekitzean"
@@ -3986,223 +4469,132 @@ msgstr "Egutegia irekitzeko baimena ukatu egin da"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Audio alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Mezu-alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Posta elektronikoaren alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programa-alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Alarma ezezagunen aukerak"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarma-errepikapena"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Bistaratuko den mezua:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Bidali beharreko mezua"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Jo soinua:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Errepikatu alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Ireki programa:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Bidali honi:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Falta:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Argumentu hauekin:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Ordu-zonak"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "1 elkarrizketa-koadroa"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Falta:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "bider, maiztasun honekin:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmak"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ordu"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Prestatu mezua"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Gehitu"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Oinarriak"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Ordua:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Mezuak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Jo soinua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Oroigarriak"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Bidali honi:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Bidali mezua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Laburpena:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "K_ontua:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Aukerak..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Ireki programa:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Errepikatu alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "geroago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "lehenago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "egun"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "hitzordu-amaiera baino"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "bider, maiztasun honekin:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ordu"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Fitxategi-izen bat zehaztu behar duzu."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "`%s' kargatzeko behar den metodoa ez da onartzen"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Zereginen zerrenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Koloreak"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Aukeratu kolorea"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Gehitu taldea..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Freskatu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Mota:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URLa:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Gehitu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "aste"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmak"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4320,7 +4712,7 @@ msgid "Free/Busy Publishing"
 msgstr "Libre/okupatuta eskaera"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Ostirala"
@@ -4334,7 +4726,7 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Astelehena"
@@ -4344,7 +4736,7 @@ msgid "S_un"
 msgstr "_ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Larunbata"
@@ -4358,7 +4750,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Igandea"
@@ -4372,7 +4764,7 @@ msgid "T_hu"
 msgstr "o_g."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Osteguna"
@@ -4386,7 +4778,7 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Asteartea"
@@ -4396,7 +4788,7 @@ msgid "W_eek starts:"
 msgstr "Astearen _hasiera:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Asteazkena"
@@ -4430,7 +4822,8 @@ msgstr "_Konprimatu asteburuak hileko ikuspegian"
 msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4480,6 +4873,80 @@ msgstr "a_z."
 msgid "before every appointment"
 msgstr "lehenago"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Fitxategi-izen bat zehaztu behar duzu."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "`%s' kargatzeko behar den metodoa ez da onartzen"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Zereginen zerrenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Koloreak"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Aukeratu kolorea"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Gehitu taldea..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Freskatu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Mota:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URLa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "aste"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
@@ -4524,81 +4991,75 @@ msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Balidazio-errorea: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Falta: "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Falta: "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Gorde honela..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Balidazio-errorea: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Falta: "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Falta: "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4668,8 +5129,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Helbide-liburua..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontaktuak"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4679,161 +5141,222 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Oroigarria"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informazioa"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Mugaeguna hasiera-eguna baino lehenagokoa da!"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "lehenago"
+msgstr[1] "lehenago"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "hitzordu-amaiera baino"
+msgstr[1] "hitzordu-amaiera baino"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "lehenago"
+msgstr[1] "lehenago"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "E_gun osoko gertaera"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "lehenago"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Okupatuta"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "lehenago"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriak..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "lehenago"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Zereginen zerrenda"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Sailkapena"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Falta:</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Konfidentziala"
+msgid "A_ll day event"
+msgstr "E_gun osoko gertaera"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data eta ordua"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Gorde ikuspegi pertsonalizatua..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "L_ibre"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegoriak..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "K_okalekua:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "E_gutegia:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_batua"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Sailkapena"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Publikoa"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Konfidentziala"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Erakutsi ordua honela"
+msgid "L_ocation:"
+msgstr "K_okalekua:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Pribatua"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publikoa"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Erakutsi ordua honela"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Labu_rpena:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmak"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Azalpena:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Amaiera:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "E_zabatu"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Kendu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4872,36 +5395,45 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Partaidea"
+msgid "<b>Attendees</b>"
+msgstr "<b>Falta:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Gehitu bidaltzailea helbide-liburuan"
+msgid "<b>Organizer</b>"
+msgstr "<b>Falta:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Antolatzailea:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktuak"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Aldatu antolatzailea"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Antolatzailea:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -4978,148 +5510,143 @@ msgstr "Instantzia hau eta ondorengoak"
 msgid "All Instances"
 msgstr "Instantzia guztiak"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Errepikatze-data ez da baliozkoa"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "lehen"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "bigarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "hirugarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "laugarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "azken"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Beste data bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "eguna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "aldiz"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ordua:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Errepikatze-aldia"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Salbuespenak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Aurrebista"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Errepikatze-araua"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Errepikapen pertsonalizatua"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Aldatu"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "E_rrepikapenik ez"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Kendu"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Errepikatze-aldia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Errepikapen _soila"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Editatu hitzordua"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "errepikatu arte"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "betiko"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "hilabete"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "data hau arte:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "aste"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "urte"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Bidalketa-helburua"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Ezabatu karpeta hau"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Mezu berrien jakinarazpena"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "Osatuta %"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Bidalitako mezuak eta zirriborroak"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Eginda"
 
@@ -5131,8 +5658,8 @@ msgstr "Handia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Egiten ari da"
@@ -5144,22 +5671,22 @@ msgid "Low"
 msgstr "Txikia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ez da hasi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Lanean"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Osatutako ehunekoa: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5184,37 +5711,42 @@ msgstr "_Egoera:"
 msgid "_Web Page:"
 msgstr "_Web orriaren helbidea:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zeregina"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin da helbide-liburua ireki"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidentziala"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Mezu berrien jakinarazpena"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Bidalitako mezuak eta zirriborroak"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Kar_peta:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5225,60 +5757,58 @@ msgstr "Ha_siera-data:"
 msgid "_Due date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
+msgid "_Group:"
+msgstr "Taldea:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Egutegi-informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Eguna"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Libre/okupatuta informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Libre/okupatuta informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Zerrenda-izena:"
+msgid "_Daily"
+msgstr "Eguna"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Pasahitza"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Pasahitza"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Gogoratu pasahitz hau"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URLa:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Erabiltzaile-izena:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Astea"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5360,7 +5890,7 @@ msgstr "%s - %s"
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Egin klik zeregina gehitzeko"
@@ -5369,6 +5899,11 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Untitled"
 msgstr "Izengabea"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Laburpena:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5382,7 +5917,7 @@ msgstr "_Mugaeguna:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Egoera:"
 
@@ -5396,20 +5931,93 @@ msgstr "_Lehentasuna:"
 msgid "Web Page:"
 msgstr "_Web orriaren helbidea:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Publikoa"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Amaiera-eguna"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Pribatua"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Konfidentziala"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Laburpena"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Okupatuta"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "H"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "M"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Bai"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ez"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Errepikatua"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Esleitua"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5455,96 +6063,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Okupatuta"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ireki mezua"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta'"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "E_zabatu"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Gorde honela..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
@@ -5553,181 +6167,112 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "% Complete"
 msgstr "Osatuta %"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Eginda"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Egite-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Mugaeguna"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Laburpena"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Mezuak lekuz aldatzen"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Mezuak kopiatzen"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Hautatu _haria"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman karpeta honetara..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ezarpenak..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Amaiera-eguna"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Hasiera-data"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Errepikatua"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Esleitua"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Bai"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ez"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "H"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "M"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5751,36 +6296,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutu-zatiketa"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutu-zatiketa"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5847,342 +6392,321 @@ msgid ", ending on "
 msgstr ", data honetan amaituta: "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Hasiera:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Amaiera:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Egoera"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Eginda:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Falta:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Falta: "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 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:918
-msgid "<i>None</i>"
-msgstr "<i>Bat ere ez</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Kokalekua:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena.  Partaide gisa gehitu?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Errorea izan da CORBA sisteman\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objektua ezin izan da aurkitu\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Ez dauzkazu egutegia eguneratzeko behar diren baimenak\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Partaidearen egoera ezin izan da eguneratu\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
@@ -6211,6 +6735,10 @@ msgstr "Egutegia kargatzen"
 msgid "Loading calendar..."
 msgstr "Egutegia kargatzen ari da..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Antolatzailea:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Zerbitzariaren mezua:"
@@ -6227,11 +6755,6 @@ msgstr "data-hasiera"
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Beharrezko partaideak"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
@@ -6299,6 +6822,28 @@ msgstr "Delegatua"
 msgid "In Process"
 msgstr "Egiten ari da"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y.eko %Bren %da"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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, %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:1604
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
@@ -6307,98 +6852,64 @@ msgstr "Bulegotik kanpo"
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Gehitu bidaltzailea helbide-liburuan"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "Au_kerak"
+msgid "O_ptions"
+msgstr "Aukerak"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Bilera _hasteko ordua:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Bilera amai_tzeko ordua:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y.eko %Bren %da"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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, %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:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6407,120 +6918,53 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s - zereginak irekitzen"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Errorea %s(e)n:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Irudi-kargatzea"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s - zereginak irekitzen"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zereginak"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Hitzordurik ez."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Ireki honekin: %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution-en egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en egutegia konfiguratzeko kontrola"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en egutegiaren/zereginen editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution-en egutegiaren eta zereginen osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution-en probaren osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zereginak"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6860,10 +7304,6 @@ msgstr "Hautatutako hilabetea (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zeregina"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6894,7 +7334,7 @@ msgid "Contacts: "
 msgstr "Kontaktuak: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
@@ -6923,7 +7363,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Zereginik ez"
 msgstr[1] "Zereginik ez"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6944,35 +7384,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sortu zeregin berria"
@@ -8651,69 +9085,69 @@ msgstr "'%s' karpeta prestatzen lineaz kanpo erabiltzeko"
 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:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du `%s' prozesu umea sortzean: %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Baliogabeko mezu-korrontea jaso da %s(e)tik: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -8735,43 +9169,6 @@ msgstr "Argumentu baliogabeak: (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Mezuak lekuz aldatzen"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Mezuak kopiatzen"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d mezu eskuratzen"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8817,7 +9214,44 @@ msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburu ezezagunean: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Mezuak lekuz aldatzen"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Mezuak kopiatzen"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d mezu eskuratzen"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8828,15 +9262,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Huts egin du gpg erabiltzaile-IDaren aholkua analizatzean."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Errorea gpg pasaesaldi-eskaera analizatzean."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8845,29 +9279,29 @@ msgstr ""
 "Pasaesaldia behar da erabiltzaile honen gakoa \n"
 "desblokeatzeko: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Huts egin du gako sekretua desblokeatzean: 3 pasaesaldi oker eman dira."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna GnuPG-tik: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Huts egin du enkriptatzean: Ez da baliozko hartzailerik zehaztu."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8878,69 +9312,89 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du GPG ezartzean %s mezuan: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du gpg exekutatzean: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Huts egin du gpg exekutatzean."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indexatu gorputzaren edukia"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ezin da mezua eskuratu editoretik"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
+
+#: 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 "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ezin izan da '%s' blokeatu"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8963,26 +9417,6 @@ msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
-
-#: 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 "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ezin izan da '%s' blokeatu"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9241,7 +9675,7 @@ msgstr "Erreferentziatutako kredentzialak iraungita daude."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9327,55 +9761,55 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Ostalari-bilaketak huts egin du: haria ezin da sortu: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Helbidea ebazten"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: arrazoi ezezaguna"
 
@@ -9451,7 +9885,7 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
@@ -9547,7 +9981,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Editatu sinadura"
 
 #: camel/camel-smime-context.c:651
@@ -9562,49 +9996,48 @@ msgstr "IMAP komandoak huts egin du: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Huts egin du handizkako algoritmo arrunta aurkitzean."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Sortu _araua mezutik"
+msgid "Cannot create CMS Message"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ezin da %s fitxategia erantsi: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ezin da %s fitxategia erantsi: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9651,7 +10084,8 @@ msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
@@ -9660,8 +10094,8 @@ msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ekaina"
@@ -9782,7 +10216,7 @@ msgstr "Gako-erabilerak ez du onartzen ziurtagiri-sinatzea"
 msgid "Error in application verification"
 msgstr "Errorea aplikazioa egiaztatzean"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9795,11 +10229,11 @@ msgstr ""
 "Hatz-marka:       %s\n"
 "Sinadura:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "TXARRA"
 
@@ -9823,7 +10257,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9838,7 +10272,7 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9847,7 +10281,7 @@ msgstr ""
 "Ziurtagiri-arazoa: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9856,7 +10290,7 @@ msgstr ""
 "Ziurtagiri-domeinu txarra: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9865,7 +10299,7 @@ msgstr ""
 "Ziurtagiria iraungita: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9874,7 +10308,7 @@ msgstr ""
 "Ziurtagiri-errebokatzeen zerrenda iraungita: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -9898,7 +10332,7 @@ msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
@@ -9919,8 +10353,8 @@ msgid "Checking for new mail"
 msgstr "Begiratu mezu berririk dagoen"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
@@ -9952,8 +10386,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9974,332 +10408,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lainobera itxia"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Karpetak"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Erakutsi harpidetutako karpetak soilik"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Izen-lekua"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
-"pasahitzaren bidez."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP zerbitzaria"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP zerbitzua:  %s - %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Ezin da %s(r)ekin konektatu (%d ataka): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS ez dago erabilgarri"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Konexioa etenda"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Errore ezezaguna"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
-"mekanismoa onartzen."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Shell komandoa"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Zereginik ez"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Errore ezezaguna"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10368,7 +10498,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10443,6 +10573,27 @@ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 msgid "Command:"
 msgstr "Shell komandoa"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Karpetak"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Erakutsi harpidetutako karpetak soilik"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Izen-lekua"
+
 #: 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"
@@ -10465,44 +10616,94 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "%s IMAP zerbitzaria"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP zerbitzua:  %s - %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Ezin da %s(r)ekin konektatu (%d ataka): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS ez dago erabilgarri"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Konexioa etenda"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS hedapena ez da onartzen."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL negoziazioek huts egin dute"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10513,30 +10714,292 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Karpeta guraso ezezaguna: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
+"pasahitzaren bidez."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
+"mekanismoa onartzen."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Shell komandoa"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Zereginik ez"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10703,18 +11166,26 @@ msgstr "Ezin izan da laburpena gorde: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10730,25 +11201,25 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ezin da karpeta atzitu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' karpeta ez dago."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
@@ -10757,23 +11228,23 @@ msgstr ""
 "Ezin izan da `%s' karpeta sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ez da maildir direktorioa."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11372,20 +11843,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Ezin da %s POP zerbitzariarekin konektatu (%d ataka): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Huts egin du %s POP zerbitzariarekin modu seguruan konektatzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ezin izan da %s POP zerbitzariarekin konektatu"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11394,28 +11870,28 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
 "mekanismoa onartzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du %s POP zerbitzarian: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ezin da %s POP zerbitzarian saioa hasi: SASL protokolo-errorea"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11424,7 +11900,16 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Ezin da %s POP zerbitzariarekin konektatu.\n"
+"Errorea pasahitza bidaltzean: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
@@ -11639,97 +12124,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> eskaerak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -11737,28 +12222,28 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP komandoak huts egin du: %s"
@@ -11822,98 +12307,6 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ezin da mezua ireki"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Ezin da mezua eskuratu editoretik"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Ireki fitxategia"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automatikoki sortua"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Sinadura:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Prestatu mezua"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da helbidea hautatzeko kontrola aktibatu."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu.\n"
-"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
-"bertsio zuzena duzula instalatuta.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
@@ -11996,17 +12389,89 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ezin da mezua ireki"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ezin da mezua eskuratu editoretik"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mezu izengabea"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ireki fitxategia"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatikoki sortua"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Sinadura:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Prestatu mezua"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Birbidalitako mezua - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Erantsi jatorrizko mezua"
+msgstr[1] "Erantsi jatorrizko mezua"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Erantsi fitxategi bat mezuari"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12024,54 +12489,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Ezin izan da kanalizaziorik sortu: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Hurrengo _irakurri gabeko mezua"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ez inportatu"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Kendu"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Errorea lasterbideak gordetzean."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12079,57 +12558,74 @@ msgid ""
 msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Ez gorde"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Gorde mezua honela..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Kontu bat konfiguratu behar duzu mezuak idatzi ahal izateko."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Ezin izan da kanalizaziorik sortu: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da helbidea hautatzeko kontrola aktibatu."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da HTML editorearen osagaia aktibatu.\n"
+"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
+"bertsio zuzena duzula instalatuta.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12433,11 +12929,6 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Iragazteko arauak"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12466,19 +12957,8 @@ msgstr "Fitxategi-izen bat zehaztu behar duzu."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "%s karpeta kentzen"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Karpeta bat zehaztu behar duzu."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12486,159 +12966,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Esleipena"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Karpeta birtualari izena eman behar diozu."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Ez da zerbitzaririk hautatu"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Aukeratu fitxategi bat"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Falta:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Hautatu karpeta"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Iragazteko arauak"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Karpeta birtualen iturburuak"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Konparazio-ordua:"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Sarrerakoa"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Mezuaren data zehaztutako datako\n"
-"12:00am orduarekin konparatuko da."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Mezuaren data iragazketa gertatzen den\n"
-"orduarekiko erlazioan konparatuko da."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Mezuaren data sistemako uneko orduarekin\n"
-"konparatuko da iragazketa egiten denean."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "uneko orduarekiko erlatiboa den ordua"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "lehenago"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "hilabete"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundo igarotakoan"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "zehaztutako karpetak bakarrik"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "uneko ordua"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "zuk zehaztutako ordua"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "urruneko karpeta aktibo guztiekin"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "karpeta lokal guztiekin"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "urte"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Garrantzitsua"
 
@@ -12708,6 +13066,71 @@ msgstr "sarrerakoa"
 msgid "outgoing"
 msgstr "irteerakoa"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Iragazteko arauak"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Konparazio-ordua:"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Sarrerakoa"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Mezuaren data zehaztutako datako\n"
+"12:00am orduarekin konparatuko da."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Mezuaren data iragazketa gertatzen den\n"
+"orduarekiko erlazioan konparatuko da."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Mezuaren data sistemako uneko orduarekin\n"
+"konparatuko da iragazketa egiten denean."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "uneko orduarekiko erlatiboa den ordua"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "lehenago"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "hilabete"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundo igarotakoan"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "uneko ordua"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "zuk zehaztutako ordua"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "urte"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Gehitu araua"
@@ -12720,60 +13143,73 @@ msgstr "Editatu araua"
 msgid "Rule name"
 msgstr "Arau-izena"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Puntuazio-arauak"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuazioa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Mezuak prestatzeko hobespenak"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "gorputzak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
+"besteak beste."
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "gorputzak ez dauka hau"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "gorputzak edo gaiak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguratu hemen zure posta-kontuak"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "mezuak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution-en posta"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "hartzaileak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "bidaltzaileak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution-en postaren osagaiak"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "gaiak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "gaiak ez dauka hau"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Karpeta birtualak"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren hobespenen kontrola"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Gehitu"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Posta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Karpeta birtualen iturburua"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Posta-kontuak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Posta-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Posta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12806,53 +13242,313 @@ msgstr "_Gehitu sinadura"
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"Jatorrizko mezua:\n"
-"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Iragazteko arauak"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Hautatu karpeta"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Doitu puntuazioa"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Esleitu kolorea"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Esleitu puntuazioa"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Eranskinak"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Soinu-seinalea"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "hau daukana"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiatu karpeta honetara"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Jasotze-data"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Bidaltze-data"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "hau ez daukana"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ez dago"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ez du hau ematen"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Ez"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Zirriborroa"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Bai"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "badago"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Adierazpena"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Jarraipena"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "da"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "ez da"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "ekaina"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Posta-zerrenda"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Mezuaren gorputza"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Mezuaren goiburua"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Mezuak"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Bidali beharreko mezua"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Eraman karpeta honetara"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Programatik irten"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Jo soinua"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Irakurrita"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Hartzailea"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Adierazpen erregularra"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Erantzunda"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "hau ematen du"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "hau baino handiagoa ematen du"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "hau baino txikiagoa ematen du"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Ireki programa:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuazioa"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Bidaltzailea"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Ezarri egoera"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamaina (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Iturburu-kontua"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Goiburu espezifikoa"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Utzi prozesatzeari"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Gaia"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Egoera ezarri gabe"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Falta:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala bilaketatik..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Letra-tipoen propietateak"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propietateak"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "Ka_rpeta-izena:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Laguntza-mezua"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Laguntza-mezua"
+msgstr[1] "Laguntza-mezua"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Hurrengo _irakurri gabeko mezua"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Hurrengo _irakurri gabeko mezua"
+msgstr[1] "Hurrengo _irakurri gabeko mezua"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12862,414 +13558,431 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Create New Folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Karpeta birtualak"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Eraman"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Bertan behera utzi zeregina"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiatu"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ikusi"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "K_opiatu..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Lekuz aldatu..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Izena aldatu"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propietateak..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Izena _aldatu..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Karpeta birtualak"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Kargatzen..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Posta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Jarraitu..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Mar_katu ez-garrantzitsu gisa"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Iragazteko arauak"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Nork"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Bat datozenak:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Erantzun honi"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Esleitua"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Nori"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editatu sinadura"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Gaia"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Gorde sinadura"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s eranskina"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+msgid "Unencrypted"
+msgstr "Etenda"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Onartzen ez den eskema"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Errorea zerrenda aldatzean"
+msgid "Encrypted"
+msgstr "PGP enkriptatzea"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Ezin da egiaztatu 'leaf' sinadura"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s mezua eskuratzen"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Esleitua"
+msgid "_View Certificate"
+msgstr "_Ziurtagiri-IDa:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Editatu sinadura"
+msgid "This certificate is not viewable"
+msgstr "Ziurtagiria oraindik ez da baliozkoa"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Gorde sinadura"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Atzeratua:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Etenda"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Ikusi barnean"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "PGP enkriptatzea"
+msgid "_Hide"
+msgstr "Ezkutatu"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d/%d orria"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "%s mezua eskuratzen"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13306,9 +14019,35 @@ msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 msgid "Formatting message"
 msgstr "Mezuak lekuz aldatzen"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Nork"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Erantzun honi"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Nori"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
@@ -13322,106 +14061,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Bat datozenak:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s eranskina"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
-
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Ziurtagiri-IDa:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Ziurtagiria oraindik ez da baliozkoa"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Atzeratua:"
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Onartzen ez den eskema"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Ikusi barnean"
+msgid "Error verifying signature"
+msgstr "Errorea zerrenda aldatzean"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Ezkutatu"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d/%d orria"
+msgid "Unknown error verifying signature"
+msgstr "Ezin da egiaztatu 'leaf' sinadura"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13543,7 +14223,7 @@ msgstr "Bidali _mezua zerrendara..."
 msgid "_Add to Addressbook"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
@@ -13557,7 +14237,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Karpeta"
 
@@ -13594,11 +14274,24 @@ msgid "Add address"
 msgstr "Helbidea"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Karpeta birtualak"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Karpeta birtualen iturburua"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -14084,66 +14777,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Inportatu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Mezuak prestatzeko hobespenak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
-"besteak beste."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Konfiguratu hemen zure posta-kontuak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution-en posta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution-en postaren osagaiak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution-en Elm inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-en Netscape Mail inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution-en Outlook Express 4 inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren hobespenen kontrola"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution-en Pine inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Posta-kontuak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution-en mbox inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Posta-hobespenak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Posta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14205,34 +14865,6 @@ msgstr "Inportatzen"
 msgid "Importing mailbox"
 msgstr "Fitxategiak inportatzen"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution-en Elm inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution-en Netscape Mail inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution-en Outlook Express 4 inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution-en Pine inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution-en mbox inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14399,80 +15031,86 @@ msgstr "%s posta-zerrenda"
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d hautatuta"
+msgid_plural "%d deleted"
+msgstr[0] "%d hautatuta"
+msgstr[1] "%d hautatuta"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d bidali gabe"
+msgid_plural "%d junk"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Zirriborroak"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Zirriborroak"
+msgstr[1] "Zirriborroak"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d bidali"
+msgid_plural "%d sent"
+msgstr[0] "%d bidali"
+msgstr[1] "%d bidali"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d bidali gabe"
+msgid_plural "%d unsent"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d guztira"
+msgid_plural "%d total"
+msgstr[0] "%d guztira"
+msgstr[1] "%d guztira"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d bidali gabe"
+msgid_plural ", %d unread"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Karpeta birtual berria"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Posta-iragazkiak"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Zerbitzua egiaztatzen"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Zerbitzariarekin konektatzen..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitatea"
@@ -14534,16 +15172,24 @@ msgstr ""
 "egingo dira Evolution-eko posta-kontua sortzeko. Idatzi behean kontuari eman "
 "nahi diozun izena. Izen hori bistaratzeko bakarrik erabiliko da."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Zerbitzua egiaztatzen"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Aurrebista"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14818,7 +15464,7 @@ msgstr "Ez aipatu jatorrizko mezua"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
@@ -15183,6 +15829,119 @@ msgstr "kolorea"
 msgid "description"
 msgstr "azalpena"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Karpeta birtualen iturburuak"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Onartua"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Osatuta"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Maiuskula/minuskula"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Bilatu mezuan"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Bilatu:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Markatu jarraipena egiteko"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Karpeta-harpidetzak"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ez da bat ere hautatu"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Zerbitzaria:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontuaren informazioa"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
+"Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Posta-kontuak"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Noizko:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bandera:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Harpidetu"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Harpidetza _kendu"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "zehaztutako karpetak bakarrik"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "urruneko karpeta aktibo guztiekin"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "karpeta lokal guztiekin"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15390,14 +16149,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15502,8 +16253,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ezin da karpeta eraman: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15554,8 +16306,9 @@ msgstr "Ezin izan da objektua eguneratu"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "eta beste txartel bat."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15584,8 +16337,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ez ezabatu"
+msgstr "_Desezabatu"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15649,8 +16403,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Ezin da karpeta ezabatu:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15692,13 +16449,44 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "%s karpeta kentzen"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Karpeta bat zehaztu behar duzu."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Karpeta birtualari izena eman behar diozu."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ez da zerbitzaririk hautatu"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15706,16 +16494,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Gainidatzi"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15877,7 +16665,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15886,46 +16674,21 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Maiuskula/minuskula"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Bilatu mezuan"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Bilatu:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Kontuaren informazioa"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
@@ -15961,24 +16724,24 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -16033,15 +16796,15 @@ msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
@@ -16105,7 +16868,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -16161,10 +16924,6 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Irakurrita"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Erantzun"
@@ -16177,50 +16936,51 @@ msgstr "Erantzun denei"
 msgid "Review"
 msgstr "Berrikusi"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Markatu jarraipena egiteko"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "gorputzak hau dauka"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Osatuta"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "gorputzak ez dauka hau"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
-"Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "gorputzak edo gaiak hau dauka"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Noizko:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "mezuak hau dauka"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bandera:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "hartzaileak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Karpeta-harpidetzak"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "bidaltzaileak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ez da bat ere hautatu"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "gaiak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Zerbitzaria:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "gaiak ez dauka hau"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Harpidetu"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Harpidetza _kendu"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution-en probaren osagaia"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16290,31 +17050,18 @@ msgstr ""
 msgid "mail"
 msgstr "Helb. el."
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%B %d"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Errore ezezaguna"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentu baliogabeak"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ezin da OAFen erregistratu"
+msgid "<b>Active Connections</b>"
+msgstr "Konexio aktiboak"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Ez da aurkitu konfigurazioko datu-basea"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Konexio aktiboak"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Errore generikoa"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16501,30 +17248,6 @@ msgstr "Karpeta-izenak ezin du \"#\" karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mezu-hartzailea: %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
@@ -16542,113 +17265,94 @@ msgstr "Bug buddy ez dago instalatuta."
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Taldea"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrol-laukia"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Berria"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Zeregin berria"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Proba"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Sortu zeregin berria"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Konexio aktiboak"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Konexio aktiboak"
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mezu-hartzailea: %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "E_gutegia:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontaktuak: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Posta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Zereginak:"
+msgid "Uknown system error."
+msgstr "Errore ezezaguna"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Karpeta-_mota:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentu baliogabeak"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Ireki beste erabiltzaile baten karpeta"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ezin da OAFen erregistratu"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "K_ontua:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Ka_rpeta-izena:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Errore generikoa"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Erabiltzaile-izena:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Berria"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fitxategiak inportatzen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Ordu-zona "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16662,7 +17366,7 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Aurrera\" botoian. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16674,19 +17378,20 @@ msgstr ""
 "\n"
 "Egin klik \"Aplikatu\" botoian, ezarpenak gordetzeko. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Zeregin berria"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution-en probaren osagaia"
+msgid "Create a new test item"
+msgstr "Sortu zeregin berria"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16753,7 +17458,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16789,7 +17494,7 @@ msgstr ""
 "Gogorik lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16798,39 +17503,39 @@ msgstr ""
 "Eskerrik asko\n"
 "Ximian Evolution taldea\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ez esan berriro"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16905,6 +17610,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17172,6 +17899,12 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Txartelaren ID hori badago lehendik"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17401,12 +18134,6 @@ msgstr "Gaia: %s"
 msgid "Certificate Signature Value"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Txartelaren ID hori badago lehendik"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17550,8 +18277,8 @@ msgstr "Ikusi uneko kontaktua"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Ekintzak"
@@ -18036,16 +18763,6 @@ msgstr "_Alderantzikatu hautapena"
 msgid "_Threaded Message List"
 msgstr "_Harian sartutako mezu-zerrenda"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Itxi leiho hau"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "It_xi"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18458,6 +19175,16 @@ msgstr "_Tresnak"
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "It_xi"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -18540,10 +19267,6 @@ msgstr "Gorde uneko fitxategia beste izen batekin"
 msgid "Save the message in a specified folder"
 msgstr "Gorde mezua adierazitako karpetan"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Bidali"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19126,7 +19849,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19289,27 +20012,267 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Zerrenda-izena:"
+
+#~ msgid "URL:"
+#~ msgstr "URLa:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "kontaktu-zerrendaren editorea"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Gorde zerrenda VCard gisa"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Taldea"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Ezin izan da wombat abiarazi"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "E_gutegia:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Audio alarmaren aukerak"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Mezu-alarmaren aukerak"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Posta elektronikoaren alarmaren aukerak"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programa-alarmaren aukerak"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Alarma ezezagunen aukerak"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarma-errepikapena"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Bistaratuko den mezua:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Bidali beharreko mezua"
+
+#~ msgid "Play sound:"
+#~ msgstr "Jo soinua:"
+
+#~ msgid "Run program:"
+#~ msgstr "Ireki programa:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Argumentu hauekin:"
+
+#~ msgid "Basics"
+#~ msgstr "Oinarriak"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Ordua:"
+
+#~ msgid "Reminders"
+#~ msgstr "Oroigarriak"
+
+#~ msgid "_Options..."
+#~ msgstr "_Aukerak..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Helbide-liburua..."
+
+#~ msgid "Reminder"
+#~ msgstr "Oroigarria"
+
+#~ msgid "B_usy"
+#~ msgstr "_Okupatuta"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Konfidentziala"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data eta ordua"
+
+#~ msgid "F_ree"
+#~ msgstr "L_ibre"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_batua"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Publikoa"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Partaidea"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#~ msgid "Preview"
+#~ msgstr "Aurrebista"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Errepikatze-araua"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Errepikapen pertsonalizatua"
+
+#~ msgid "_Modify"
+#~ msgstr "_Aldatu"
+
+#~ msgid "_No recurrence"
+#~ msgstr "E_rrepikapenik ez"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Errepikapen _soila"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "Osatuta %"
+
+#~ msgid "Progress"
+#~ msgstr "Lanean"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Kon_fidentziala"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Kar_peta:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Hasiera:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Amaiera:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Eginda:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Falta:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Bat ere ez</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Errorea izan da CORBA sisteman\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objektua ezin izan da aurkitu\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Ez dauzkazu egutegia eguneratzeko behar diren baimenak\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Partaidearen egoera ezin izan da eguneratu\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#~ msgid "_Options"
+#~ msgstr "Au_kerak"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Bilera _hasteko ordua:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Bilera amai_tzeko ordua:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea %s(e)n:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Sortu _araua mezutik"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Ezin izan da mezua prestatzeko leihoa sortu:\n"
+#~ "Ezin da HTML editorearen osagaia aktibatu."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Puntuazio-arauak"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Ka_rpeta-izena:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Izena aldatu"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propietateak..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kontrol-laukia"
+
+#~ msgid "C_alendar:"
+#~ msgstr "E_gutegia:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontaktuak: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Posta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Zereginak:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Karpeta-_mota:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Ireki beste erabiltzaile baten karpeta"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Ka_rpeta-izena:"
+
+#~ msgid "_User:"
+#~ msgstr "_Erabiltzaile-izena:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Ezin izan da egin kontsulta Root DSEn"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Errorea eskema-informazioa eskuratzean"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  E_rakutsi onartzen diren oinarriak "
 
@@ -19383,9 +20346,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Webcam:"
 #~ msgstr "Orrialdea"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategoria-editorea ez dago erabilgarri."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19441,9 +20401,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "Ezabatzen ari zaren gertaera bilera bat da. Bilera bertan beherautzi dela "
 #~ "dioen oharra bidali nahi duzu?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19461,47 +20418,15 @@ msgstr "%s (%%%d osatuta)"
 #~ "Ezabatzen ari zaren egunkari-sarrera argitaratuta dago. Bertan behera "
 #~ "utzi dela dioen oharra bidali nahi nahi duzu?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Ziur zaude izenik gabeko zeregin hau ezabatu nahi duzula?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Gonbidatu beste batzuk..."
 
@@ -19535,10 +20460,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Ezin izan da wombat zerbitzaria abiarazi"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Errorea mezua automatikoki gordetzean: %s\n"
@@ -19562,179 +20483,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Doitu puntuazioa"
-
-#~ msgid "Assign Color"
-#~ msgstr "Esleitu kolorea"
-
-#~ msgid "Assign Score"
-#~ msgstr "Esleitu puntuazioa"
-
-#~ msgid "Attachments"
-#~ msgstr "Eranskinak"
-
-#~ msgid "Beep"
-#~ msgstr "Soinu-seinalea"
-
-#~ msgid "contains"
-#~ msgstr "hau daukana"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiatu karpeta honetara"
-
-#~ msgid "Date received"
-#~ msgstr "Jasotze-data"
-
-#~ msgid "Date sent"
-#~ msgstr "Bidaltze-data"
-
-#~ msgid "Deleted"
-#~ msgstr "Ezabatuta"
-
-#~ msgid "does not contain"
-#~ msgstr "hau ez daukana"
-
-#~ msgid "does not end with"
-#~ msgstr "ez da honela amaitzen"
-
-#~ msgid "does not exist"
-#~ msgstr "ez dago"
-
-#~ msgid "does not return"
-#~ msgstr "ez du hau ematen"
-
-#~ msgid "does not sound like"
-#~ msgstr "ez da honen antzekoa"
-
-#~ msgid "does not start with"
-#~ msgstr "ez da honela hasten"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ez"
-
-#~ msgid "Draft"
-#~ msgstr "Zirriborroa"
-
-#~ msgid "ends with"
-#~ msgstr "honela amaitzen da"
-
-#~ msgid "Exist"
-#~ msgstr "Bai"
-
-#~ msgid "exists"
-#~ msgstr "badago"
-
-#~ msgid "Expression"
-#~ msgstr "Adierazpena"
-
-#~ msgid "Follow Up"
-#~ msgstr "Jarraipena"
-
-#~ msgid "is"
-#~ msgstr "da"
-
-#~ msgid "is after"
-#~ msgstr "honen ondorengoa da"
-
-#~ msgid "is before"
-#~ msgstr "honen aurrekoa da"
-
-#~ msgid "is Flagged"
-#~ msgstr "Banderaduna da"
-
-#~ msgid "is greater than"
-#~ msgstr "hau baino handiagoa da"
-
-#~ msgid "is less than"
-#~ msgstr "hau baino txikiagoa da"
-
-#~ msgid "is not"
-#~ msgstr "ez da"
-
-#~ msgid "is not Flagged"
-#~ msgstr "ez da Banderaduna"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "ekaina"
-
-#~ msgid "Mailing list"
-#~ msgstr "Posta-zerrenda"
-
-#~ msgid "Message Body"
-#~ msgstr "Mezuaren gorputza"
-
-#~ msgid "Message Header"
-#~ msgstr "Mezuaren goiburua"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Mezuak"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Bidali beharreko mezua"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Eraman karpeta honetara"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Programatik irten"
-
-#~ msgid "Play Sound"
-#~ msgstr "Jo soinua"
-
-#~ msgid "Recipients"
-#~ msgstr "Hartzailea"
-
-#~ msgid "Regex Match"
-#~ msgstr "Adierazpen erregularra"
-
-#~ msgid "Replied to"
-#~ msgstr "Erantzunda"
-
-#~ msgid "returns"
-#~ msgstr "hau ematen du"
-
-#~ msgid "returns greater than"
-#~ msgstr "hau baino handiagoa ematen du"
-
-#~ msgid "returns less than"
-#~ msgstr "hau baino txikiagoa ematen du"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Ireki programa:"
-
-#~ msgid "Sender"
-#~ msgstr "Bidaltzailea"
-
-#~ msgid "Set Status"
-#~ msgstr "Ezarri egoera"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamaina (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "honen antzekoa da"
-
-#~ msgid "Source Account"
-#~ msgstr "Iturburu-kontua"
-
-#~ msgid "Specific header"
-#~ msgstr "Goiburu espezifikoa"
-
-#~ msgid "starts with"
-#~ msgstr "honela hasten da"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Utzi prozesatzeari"
-
-#~ msgid "Unset Status"
-#~ msgstr "Egoera ezarri gabe"
-
 #~ msgid "Working"
 #~ msgstr "Lanean"
 
@@ -19938,9 +20686,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Finished"
 #~ msgstr "Amaituta"
 
-#~ msgid "Group:"
-#~ msgstr "Taldea:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20600,12 +21345,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Errorea bilaketa egitean"
-
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Ezin izan da kurtsorea kargatu\n"
-
 #~ msgid "EBook not loaded\n"
 #~ msgstr "EBook ez dago kargatuta\n"
 
@@ -20794,9 +21533,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Save as..."
 #~ msgstr "_Gorde honela..."
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmak"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Kokaleku geografikoa"
 
@@ -23389,9 +24125,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -24775,9 +25508,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25168,9 +25898,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27556,9 +28283,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "South Dakota"
 #~ msgstr "Hego Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30104,9 +30828,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "View the selected folder"
 #~ msgstr "Bistaratu hautatutako karpeta"
 
-#~ msgid "_Copy..."
-#~ msgstr "K_opiatu..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Karpeta-barra"
 
@@ -30116,18 +30837,12 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Joan karpeta honetara..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Lekuz aldatu..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Karpeta berria"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Ken_du beste erabiltzaile baten karpeta"
 
-#~ msgid "_Rename..."
-#~ msgstr "Izena _aldatu..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "La_sterbide-barra"
 
@@ -30146,9 +30861,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "With _Category"
 #~ msgstr "Kategoria hau _dutenak"
 
-#~ msgid "Information"
-#~ msgstr "Informazioa"
-
 #~ msgid "Error"
 #~ msgstr "Errorea"
 
@@ -30161,8 +30873,5 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution-en helbide-liburuko lokala/LDAP modulua"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution-en egutegiaren fitxategi lokalaren modulua"
-
 #~ msgid "Evolution Addressbook local file backend"
 #~ msgstr "Evolution-en helbide-liburuaren fitxategi lokalaren modulua"
diff --git a/po/fa.po b/po/fa.po
index cc1026c12b..a8797d259b 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-11 20:23+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -22,14 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -52,33 +44,234 @@ msgstr "کارت‌ها"
 msgid " card"
 msgstr "۱ کارت"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "نشانی"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr ""
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "نشانی"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr ""
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+msgid "Cannot move contact."
+msgstr ""
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+msgid "Unable to save contact(s)."
+msgstr ""
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+msgid "Error saving contacts to {0}: {1}"
+msgstr ""
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr ""
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+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 "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -110,8 +303,9 @@ msgid "New Contacts Group"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
-msgstr ""
+#, fuzzy
+msgid "Contacts Grou_p"
+msgstr "ایجاد پنجره‌ی جدید"
 
 #: addressbook/gui/component/addressbook-component.c:111
 #, fuzzy
@@ -134,15 +328,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -151,19 +345,19 @@ msgid "Personal"
 msgstr "شخصی"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -171,57 +365,66 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr ""
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -242,58 +445,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-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 "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -301,7 +452,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -310,8 +461,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -337,6 +487,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr ""
 
@@ -380,13 +531,11 @@ msgid "Anonymously"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "جزئیات"
 
@@ -600,33 +749,26 @@ msgid "cards"
 msgstr "کارت‌ها"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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.c:702
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "حذف همه"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "حذف همه"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -641,7 +783,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr ""
 
@@ -649,14 +791,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "منبع"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -679,6 +828,11 @@ msgstr "_شهر:"
 msgid "_Find"
 msgstr ""
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "تاریخ آغاز:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -720,9 +874,8 @@ msgid "<b>Work</b>"
 msgstr "قبلی"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -747,7 +900,6 @@ msgid "Birthday:"
 msgstr "روز _تولد:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "تقویم:"
 
@@ -762,15 +914,15 @@ msgid "Company:"
 msgstr "فرمان:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr ""
 
@@ -875,8 +1027,8 @@ msgstr "نشانی صفحه‌ی _وب:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -898,39 +1050,27 @@ msgid "_File under:"
 msgstr "_نام پرونده:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "نشانی"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr ""
 
@@ -1902,131 +2042,123 @@ msgstr "زامبیا"
 msgid "Zimbabwe"
 msgstr "زیمبابوه"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
-msgid "Jabber"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "منبع"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "تغییر نام"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "منزل"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "کتاب منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "کتاب مقصد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "نیجر"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "منبع"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "تغییر نام"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2044,6 +2176,18 @@ msgstr "نام _کامل:"
 msgid "E-_mail:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "نشانی _۲:"
@@ -2169,46 +2313,65 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "اعضا"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "_حذف شود..."
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "نام _فهرست:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "کتاب"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr ""
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
-msgid "Contact List Editor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
+msgid "Contact List Editor"
 msgstr ""
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
@@ -2245,399 +2408,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "اعضای فهرست"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "سازمان"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "کاری"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "شخصی"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "عنوان شغل"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "صفحه‌ی آغازه"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "موفقیت"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "نشانی"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr ""
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "لغو شد"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "فهرست"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(هیچ‌کدام)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "نشانی"
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2651,9 +2426,9 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr ""
 
@@ -2669,133 +2444,133 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "پیش‌رفته..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -2829,6 +2604,8 @@ msgid "Car Phone"
 msgstr ""
 
 #: 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:3
 msgid "Categories"
 msgstr ""
 
@@ -2836,6 +2613,21 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "نام خانوادگی"
@@ -2872,14 +2664,29 @@ msgstr ""
 msgid "Manager"
 msgstr "مدیر"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "دفتر"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "سازمان"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2931,29 +2738,21 @@ msgstr ""
 msgid "Web Site"
 msgstr "وبگاه"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -2970,7 +2769,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -2979,19 +2782,375 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "اعضای فهرست"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "کاری"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "شخصی"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "عنوان شغل"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "صفحه‌ی آغازه"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "موفقیت"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "نشانی"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "لغو شد"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr ""
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "فهرست"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(هیچ‌کدام)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "نشانی"
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3036,6 +3195,11 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
@@ -3045,11 +3209,6 @@ msgstr ""
 msgid "Print contact"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3234,6 +3393,20 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3288,20 +3461,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3318,39 +3477,344 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "حذف"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+msgid "Send Notice"
+msgstr ""
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+msgid "Save Appointment"
+msgstr ""
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "پیغام _بعدی"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+msgid "Could not start evolution-data-server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr ""
@@ -3434,10 +3898,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr ""
@@ -3578,9 +4038,29 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3598,8 +4078,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr ""
 
@@ -3610,7 +4090,7 @@ msgstr ""
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr ""
@@ -3658,62 +4138,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
 msgstr "_تقویم"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3743,26 +4213,6 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3780,221 +4230,132 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "تقویم‌ها"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "_پیغام‌ها"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_پیغام‌ها"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
 #, fuzzy
-msgid "Reminders"
-msgstr "اعضا"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr ""
+msgid "_Arguments:"
+msgstr "نام حساب"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "شماره‌ی _درگاه:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "نام حساب"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
-msgid "hour(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-msgid "minute(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "start of appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "کومورو"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_Type:"
-msgstr "_عنوان:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "_اضافه شود"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
+msgid "Alarms"
+msgstr "همیشه"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4110,7 +4471,7 @@ msgid "Free/Busy Publishing"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
@@ -4124,7 +4485,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr ""
@@ -4134,7 +4495,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr ""
@@ -4148,7 +4509,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr ""
@@ -4162,7 +4523,7 @@ msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr ""
@@ -4176,7 +4537,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr ""
@@ -4186,7 +4547,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr ""
@@ -4220,7 +4581,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4270,6 +4632,77 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "کومورو"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "_عنوان:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "_اضافه شود"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr ""
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4314,77 +4747,71 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
-msgid "Could not update object"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
-msgid "Edit Appointment"
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
-msgid "Changes made to this item may be discarded if an update arrives"
+#: calendar/gui/dialogs/comp-editor.c:264
+msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
-msgid "Unable to use current version!"
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
-msgid "Validation error: %s"
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
 msgstr ""
 
 #: calendar/gui/dialogs/copy-source-dialog.c:57
@@ -4448,7 +4875,7 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
+msgid "Contacts..."
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
@@ -4459,160 +4886,215 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "سازمان"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
+msgid "1 day before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
+msgid "1 hour before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
+msgid "15 minutes before appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "تاجیکستان"
+
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr ""
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "قبلی"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_محرمانه"
+msgid "A_ll day event"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
+msgid "C_ustomize..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr ""
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "تقویم:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "_خانوادگی"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+msgid "L_ocation:"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+msgid "_Alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "_خانوادگی"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_حذف شود"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4651,36 +5133,44 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "قبلی"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "نشانی"
+msgid "<b>Organizer</b>"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "Change Or_ganizer"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/e-meeting-time-sel.c:415
+msgid "Con_tacts..."
 msgstr ""
 
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "_سازمان:"
+
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr ""
@@ -4746,148 +5236,139 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Preview"
+msgid "<b>Exceptions</b>"
 msgstr "قبلی"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "قبلی"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "This appointment rec_urs"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "انتخاب نام‌ها"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "تاجیکستان"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
+msgid "<span weight=\"bold\">Status</span>"
 msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
@@ -4899,8 +5380,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
@@ -4912,23 +5393,22 @@ msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "_شغل:"
+msgid "P_ercent complete:"
+msgstr "_تاریخ تکمیل:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4953,36 +5433,40 @@ msgstr ""
 msgid "_Web Page:"
 msgstr "نشانی صفحه‌ی _وب:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "پوشه:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -4993,55 +5477,53 @@ msgstr "تاریخ آغاز:"
 msgid "_Due date:"
 msgstr "نشانی صفحه‌ی _وب:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+msgid "_Group:"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
+msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "جزئیات"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "نام _فهرست:"
+msgid "_Daily"
+msgstr "جزئیات"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr ""
+#, fuzzy
+msgid "_Manual"
+msgstr "مالی"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "شماره‌ی _درگاه:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+msgid "_Remember password"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr ""
+#, fuzzy
+msgid "_Username:"
+msgstr "تغییر نام"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "هفته"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5123,7 +5605,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5132,6 +5614,11 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5144,7 +5631,7 @@ msgstr "نشانی صفحه‌ی _وب:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr ""
 
@@ -5158,19 +5645,89 @@ msgstr "شماره‌ی _درگاه:"
 msgid "Web Page:"
 msgstr "نشانی صفحه‌ی _وب:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr ""
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
@@ -5217,95 +5774,101 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_حذف شود"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5314,176 +5877,108 @@ msgstr ""
 msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "تاریخ آغاز:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1156
+msgid "Moving items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1158
+msgid "Copying items"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "انتخاب _همه"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_حذف شود..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_تقویم"
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "تقویم جدید"
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5504,35 +5999,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:585
@@ -5600,341 +6095,318 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr ""
+#, fuzzy
+msgid "Starts"
+msgstr "تاریخ آغاز:"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5963,6 +6435,10 @@ msgstr ""
 msgid "Loading calendar..."
 msgstr ""
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -5979,11 +6455,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6051,6 +6522,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 ""
+
+#. 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:1604
+msgid "%m/%d/%Y"
+msgstr ""
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6059,206 +6552,107 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:417
-#, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "نشانی"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+msgid "O_ptions"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "نمایس هفته‌ی کاری"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 ""
-
-#. 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:1604
-msgid "%m/%d/%Y"
-msgstr ""
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:824
+#: calendar/gui/e-tasks.c:846
 #, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
+msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6598,10 +6992,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr ""
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6632,7 +7022,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr ""
 
@@ -6660,7 +7050,7 @@ msgid_plural "%d tasks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6680,33 +7070,27 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+msgid "Tasks Gro_up"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "ایجاد پنجره‌ی جدید"
@@ -8372,69 +8756,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8456,41 +8840,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr ""
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr ""
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr ""
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8530,7 +8879,42 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr ""
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8538,43 +8922,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8582,99 +8966,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -8909,7 +9293,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8988,55 +9372,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9106,7 +9490,7 @@ msgstr ""
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr ""
 
@@ -9187,7 +9571,7 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr ""
 
 #: camel/camel-smime-context.c:651
@@ -9201,44 +9585,40 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr ""
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+msgid "Cannot create CMS Message"
 msgstr ""
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+msgid "Cannot create CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+msgid "Cannot attach CMS data object"
 msgstr ""
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+msgid "Cannot create CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr ""
-
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:888
@@ -9285,7 +9665,8 @@ msgstr ""
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
@@ -9294,8 +9675,8 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9415,7 +9796,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9424,11 +9805,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9445,7 +9826,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9455,35 +9836,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9507,7 +9888,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9526,8 +9907,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9558,8 +9939,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9578,144 +9959,220 @@ msgstr ""
 msgid "Checklist"
 msgstr "فهرست"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3190
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:415
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:421
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
-msgid "Cannot select folder `%s': Bad command"
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:335
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:341
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:476
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
-msgid "Cannot expunge folder `%s': Unknown"
+msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:481
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
-msgid "Cannot expunge folder `%s': Bad command"
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:616
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
+msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:621
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:746
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
+msgid "No such message"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2463
 #, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
+msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:775
+#: camel/providers/imap/camel-imap-folder.c:2471
 #, c-format
-msgid "Cannot append message to folder `%s': Bad command"
+msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:854
+#: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:858
+#: camel/providers/imap/camel-imap-folder.c:2660
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:866
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:870
+#: camel/providers/imap/camel-imap-message-cache.c:417
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgid "Failed to cache %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for New Mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:48
+msgid "Connection to Server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Use custom command to connect to server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Command:"
+msgstr "فرمان:"
+
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:42
 #: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:44
 #: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:46
 #: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
+#: camel/providers/imap/camel-imap-provider.c:64
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
+msgid "IMAP"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
+#: camel/providers/imap/camel-imap-provider.c:78
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9725,16 +10182,16 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:206
 #: camel/providers/nntp/camel-nntp-store.c:224
@@ -9742,360 +10199,311 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
+msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:418
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
+msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:492
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:723
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
+#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
+#: camel/providers/imap/camel-imap-store.c:1315
+msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
-msgid "Cannot create folder `%s': Bad command"
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:859
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
-msgid "Cannot delete folder `%s': Special folder"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:891
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
 #, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
 #, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "فرمان:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1105
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
+msgid "Failed sending command to IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-command.c:656
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1154
+#: camel/providers/imap4/camel-imap4-engine.c:232
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgid "Unexpected greeting from IMAP server %s."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-utils.c:85
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
+msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-utils.c:291
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap4/camel-imap4-folder.c:359
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr ""
 
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
+#: camel/providers/imap4/camel-imap4-folder.c:365
 #, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
+msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:389
+#: camel/providers/imap4/camel-imap4-folder.c:502
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:399
+#: camel/providers/imap4/camel-imap4-folder.c:507
 #, c-format
-msgid "IMAP command failed: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
+msgid "Cannot expunge folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:649
+#: camel/providers/imap4/camel-imap4-folder.c:697
 #, c-format
-msgid "IMAP server response did not contain %s information"
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:685
+#: camel/providers/imap4/camel-imap4-folder.c:702
 #, c-format
-msgid "Unexpected OK response from IMAP server: %s"
+msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:226
+#: camel/providers/imap4/camel-imap4-folder.c:827
 #, c-format
-msgid "Could not create directory %s: %s"
+msgid "Cannot append message to folder `%s': Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:245
+#: camel/providers/imap4/camel-imap4-folder.c:856
 #, c-format
-msgid "Could not load summary for %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
+msgid "Cannot append message to folder `%s': Bad command"
 msgstr ""
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap4/camel-imap4-folder.c:939
 #, c-format
-msgid "Unable to retrieve message: %s"
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap4/camel-imap4-folder.c:947
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
-msgid "No such message"
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2285
-#: camel/providers/imap/camel-imap-folder.c:2355
-msgid "Fetching summary information for new messages"
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2463
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2471
+#: camel/providers/imap4/camel-imap4-store.c:271
 #, c-format
-msgid "Incomplete server response: no UID provided for message %d"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2484
+#: camel/providers/imap4/camel-imap4-store.c:383
 #, c-format
 msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-folder.c:2660
-msgid "Could not find message body in FETCH response."
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap4/camel-imap4-store.c:428
 #, c-format
-msgid "Could not open cache directory: %s"
+msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap4/camel-imap4-store.c:502
 #, c-format
-msgid "Failed to cache message %s: %s"
+msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap4/camel-imap4-store.c:733
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for New Mail"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:48
-msgid "Connection to Server"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Command:"
-msgstr "فرمان:"
-
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:76
-msgid "IMAP"
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:78
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
-msgid "SSL/TLS extension not supported."
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
-msgid "SSL negotiations failed"
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap4/camel-imap4-store.c:1000
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap4/camel-imap4-store.c:1005
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1282
-#: camel/providers/smtp/camel-smtp-transport.c:486
+#: camel/providers/imap4/camel-imap4-store.c:1253
 #, c-format
-msgid "No support for authentication type %s"
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1305
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "فرمان:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
 #, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1319
-msgid "You didn't enter a password."
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap4/camel-imap4-store.c:1396
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap4/camel-imap4-store.c:1401
 #, c-format
-msgid "No such folder %s"
+msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
-msgid "The parent folder is not allowed to contain subfolders"
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap4/camel-imap4-utils.c:456
 #, c-format
-msgid "Unknown parent folder: %s"
+msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr ""
 
 #: camel/providers/imapp/camel-imapp-provider.c:39
@@ -10258,18 +10666,26 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10283,48 +10699,48 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10886,55 +11302,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -11141,93 +11569,93 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr ""
@@ -11235,26 +11663,26 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr ""
 
@@ -11317,88 +11745,6 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "ایالات متحده"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11477,16 +11823,86 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "ایالات متحده"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "_پیغام‌ها"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "ایالات متحده"
+msgstr[1] "ایالات متحده"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11504,104 +11920,126 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr ""
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "حذف"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "حذف"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "پیغام _بعدی"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr ""
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
+msgstr ""
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -11889,10 +12327,6 @@ msgstr ""
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr ""
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -11918,364 +12352,598 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr ""
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr ""
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
+#: filter/filter-file.c:288
+msgid "Choose a file"
 msgstr ""
 
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
 msgstr ""
 
-#: filter/filter-file.c:288
-msgid "Choose a file"
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
 msgstr ""
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
 msgstr ""
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
 msgstr ""
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "_نام پرونده:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
 msgstr ""
 
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "اعضا"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr ""
+
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
 msgstr ""
 
 #: filter/filter.glade.h:21
-msgid "the current time"
+msgid "years"
 msgstr ""
 
-#: filter/filter.glade.h:22
-msgid "the time you specify"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
 msgstr ""
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
+#: filter/rule-editor.c:685
+msgid "Rule name"
 msgstr ""
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: filter/filter.glade.h:27
-msgid "years"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
-msgid "Important"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: filter/filter-rule.c:790
-#, fuzzy
-msgid "Rule name:"
-msgstr "_نام پرونده:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "All related"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
 msgstr ""
 
-#: filter/filter-rule.c:877
+#: 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:99
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
-msgid "Replies"
-msgstr "اعضا"
+msgid "_Mail"
+msgstr "مالی"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
 msgstr ""
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "incoming"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
 msgstr ""
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
 msgstr ""
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
 msgstr ""
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
 msgstr ""
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
 msgstr ""
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
 msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
 msgstr ""
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
 msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
 msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "بلیز"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
 msgstr ""
 
-#: filter/vfolder-editor.c:108
+#: mail/em-filter-i18n.h:8
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "_پوشه"
+msgid "Copy to Folder"
+msgstr "_تقویم"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_اضافه شود"
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "_تاریخ تکمیل:"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "بخش"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "_حذف شود"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
 msgstr ""
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
 msgstr ""
 
-#: mail/em-account-prefs.c:472
-msgid "Account name"
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "نشانی"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
 msgstr ""
 
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
 msgstr ""
 
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
 msgstr ""
 
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "فهرست"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "متن"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "_شغل:"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
-msgid "an unknown sender"
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "فهرست"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
 msgstr ""
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#: mail/em-filter-i18n.h:29
+msgid "is before"
 msgstr ""
 
-#: mail/em-folder-browser.c:129
-msgid "Create _Virtual Folder From Search..."
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
 msgstr ""
 
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "نام پوشه"
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "فهرست"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr ""
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: mail/em-filter-i18n.h:38
 #, fuzzy
-msgid "Total messages"
+msgid "Mailing list"
+msgstr "نشانی پست الکترونیکی"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
 msgstr "_پیغام‌ها"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "_پیغام‌ها"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_پیغام‌ها"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "_پیغام‌ها"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "تقویم جدید"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr ""
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "لهستان"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "اعضا"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "اعضا"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
 msgstr ""
 
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr ""
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "اعضا"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "ایالات متحده"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr ""
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "کتاب منبع"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr ""
+
+#: mail/em-filter-i18n.h:61
+#, fuzzy
+msgid "starts with"
+msgstr "تاجیکستان"
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "_شغل:"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "ایالات متحده"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
+
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "نشانی"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "_پیغام‌ها"
+msgstr[1] "_پیغام‌ها"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "ایالات متحده"
+msgstr[1] "ایالات متحده"
+
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr ""
@@ -12284,396 +12952,412 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "کرواسی"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "_پیغام‌ها"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "فرمان:"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr ""
 
-#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
-msgid "_New Folder..."
-msgstr ""
-
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr ""
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr ""
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr ""
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "فرمان:"
 
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_پیشرفته..."
 
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
+msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr ""
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
+msgstr "_نام کامل..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr ""
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "_شغل:"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:651
+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.c:1306
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr ""
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12709,113 +13393,84 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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."
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
 #: mail/em-junk-filter.c:86
@@ -12921,7 +13576,7 @@ msgstr ""
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12934,7 +13589,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr ""
 
@@ -12968,11 +13623,24 @@ msgid "Add address"
 msgstr "اضافه کردن نشانی"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "_پیغام‌ها"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "_پوشه"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_اضافه شود"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13424,64 +14092,34 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "مالی"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
@@ -13536,34 +14174,6 @@ msgstr ""
 msgid "Importing mailbox"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13705,79 +14315,85 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
-msgstr ""
+msgid_plural "%d deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, c-format
-msgid "%d drafts"
-msgstr ""
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d sent"
-msgstr ""
+msgid_plural "%d sent"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
-msgstr ""
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
-msgstr ""
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_پوشه"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -13827,15 +14443,22 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "قبلی"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14084,7 +14707,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
@@ -14415,10 +15038,117 @@ msgstr ""
 msgid "description"
 msgstr ""
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+msgid "Accept License"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
+#, fuzzy
 msgid "Invalid authentication"
-msgstr ""
+msgstr "سازمان"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
@@ -14455,8 +15185,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr ""
+msgstr "اعضا"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14598,14 +15329,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -14613,8 +15336,9 @@ msgstr ""
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
+#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
+msgstr "نشانی"
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:90
@@ -14671,8 +15395,9 @@ msgstr ""
 
 #. mail:ask-delete-folder title
 #: mail/mail-errors.xml.h:122
+#, fuzzy
 msgid "Delete \"{0}\"?"
-msgstr ""
+msgstr "_حذف شود"
 
 #. mail:ask-delete-folder primary
 #: mail/mail-errors.xml.h:124
@@ -14762,8 +15487,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "حذف"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -14851,13 +15577,41 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr ""
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr ""
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14865,15 +15619,15 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr ""
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr ""
 
@@ -15028,52 +15782,28 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr ""
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr ""
@@ -15109,24 +15839,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15181,15 +15911,15 @@ msgstr ""
 msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
@@ -15253,7 +15983,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15309,10 +16039,6 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15325,46 +16051,48 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
@@ -15428,29 +16156,16 @@ msgstr ""
 msgid "mail"
 msgstr ""
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr ""
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr ""
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
 msgstr ""
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15617,23 +16332,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -15651,113 +16349,85 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/evolution-test-component.c:140
-msgid "New Test"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_آزمایش"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-#, fuzzy
-msgid "C_alendar:"
-msgstr "_تقویم"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "_میانی:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-#, fuzzy
-msgid "_Tasks:"
-msgstr "تاجیکستان"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "پوشه:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "نام حساب"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "نام پوشه"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -15766,7 +16436,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -15774,16 +16444,16 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
 msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr ""
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_آزمایش"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -15844,7 +16514,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15864,45 +16534,45 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15972,6 +16642,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16209,6 +16901,11 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr ""
@@ -16410,11 +17107,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16554,8 +17246,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
@@ -17031,16 +17723,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr ""
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_بستن"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17443,6 +18125,16 @@ msgstr "_ابزارها"
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr ""
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_بستن"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17525,10 +18217,6 @@ msgstr ""
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18084,7 +18772,7 @@ msgid "Evolution Query"
 msgstr ""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18232,6 +18920,47 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "نام _فهرست:"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_محرمانه"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "قبلی"
+
+#~ msgid "Folder:"
+#~ msgstr "پوشه:"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "نشانی"
+
+#~ msgid "Folder Name"
+#~ msgstr "نام پوشه"
+
+#, fuzzy
+#~ msgid "C_alendar:"
+#~ msgstr "_تقویم"
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "_میانی:"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "تاجیکستان"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "پوشه:"
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "نام پوشه"
+
 #~ msgid "Email address:"
 #~ msgstr "نشانی پست الکترونیکی:"
 
@@ -18252,10 +18981,6 @@ msgstr ""
 #~ msgstr "نمی‌توان URI را بار کرد"
 
 #, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "_پیغام‌ها"
-
-#, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "نشانی _۲:"
 
@@ -18271,10 +18996,6 @@ msgstr ""
 #~ msgid "calendar"
 #~ msgstr "تقویم:"
 
-#, fuzzy
-#~ msgid "task list"
-#~ msgstr "تاجیکستان"
-
 #~ msgid "A_ddress..."
 #~ msgstr "_نشانی..."
 
@@ -18284,9 +19005,6 @@ msgstr ""
 #~ msgid "Blog address:"
 #~ msgstr "نشانی وب‌نوشت:"
 
-#~ msgid "Organi_zation:"
-#~ msgstr "_سازمان:"
-
 #~ msgid "_Manager's name:"
 #~ msgstr "نام _مدیر:"
 
@@ -18341,9 +19059,6 @@ msgstr ""
 #~ msgid "Business 2"
 #~ msgstr "کاری ۲"
 
-#~ msgid "Department"
-#~ msgstr "بخش"
-
 #~ msgid "Anniversary"
 #~ msgstr "سالگرد ازدواج"
 
diff --git a/po/fi.po b/po/fi.po
index 2053c5025f..8d9b4cb1d4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-16 21:25+0300\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-13 21:10+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -22,14 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolutionin osoitekirja"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "Yhteystiedon otsake: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "Evolutionin minikortti"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "Valittu osoitekirjakansio"
@@ -50,34 +42,261 @@ msgstr " korttia"
 msgid " card"
 msgstr " kortti"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "Yhteystiedon otsake: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "Evolutionin minikortti"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kohdetta ei voitu lähettää!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"IMAP-palvelimelle tunnistautuminen epäonnistui.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Tarkista, että salasanasi on kirjoitettu oikein. Muista että monissa "
+"salasanoissa isot ja pienet kirjaimet ovat eri asia. Tarkista ettei CapsLock "
+"ole päällä."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Ryhmälistaa ei voitu hakea palvelimelta."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP-palvelimen vaste ei sisältänyt tietoja %s:stä"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Osoitekirjaa ei voitu ladata"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Ei kuvausta saatavilla"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Tallenna osoitekirjaan"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Virhe ladattaessa oletusosoitekirjaa."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Saapuvien viestien kansiota ei voitu käsitellä"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Haluatko tallentaa muutokset?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "Hylkää"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "Ja yksi muu yhteystieto."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Olet siirtämässä yhteystietoa osoitekirjasta toiseen, mutta sitä ei voida "
+"poistaa lähdeosoitekirjasta. Haluatko tallentaa uuteen osoitekirjaan kopion?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Viestin sisältöä ei voitu tulkita"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Virhe lisättäessä yhteystietoa"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution osoitekirjan osoitteiden katselin"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Osoitekirjaa ei voitu ladata"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voitu lukea"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Kirjautuminen epäonnistui.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automaattinen täydennys"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "_Yhteystiedot"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Varmenteet"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Määrittele automaatinen täydennys"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Yhteystiedot"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Osoitekirja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution osoitekirjan osoite-ponnahdusikkuna"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution osoitekirjan osoitteiden katselin"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution osoitekirjan kortin katselin"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutionin osoitekirjan komponentti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime varmenteiden hallinta"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution kansioiden asetusten määrittely"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Hallitse S/Mime varmenteitasi"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -108,7 +327,8 @@ msgid "New Contacts Group"
 msgstr "Uusi yhteystietoryhmä"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Yhteystietoryhmä"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -131,18 +351,14 @@ msgid "Migrating `%s':"
 msgstr "Siirretään  '%s'"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:246 mail/mail-vfolder.c:218
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -206,36 +422,45 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti kun Evolution muuntaa Pilotin synkronointitietojasi..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Osoitekirja '%s' poistetaan. Oletko varma että haluat jatkaa?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Yhteystiedot"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Kirjautuminen epäonnistui.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -257,58 +482,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Automaattinen täydennys"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "_Yhteystiedot"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Varmenteet"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Määrittele automaatinen täydennys"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Osoitekirja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution osoitekirjan osoite-ponnahdusikkuna"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution osoitekirjan osoitteiden katselin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution osoitekirjan kortin katselin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolutionin osoitekirjan komponentti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime varmenteiden hallinta"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution kansioiden asetusten määrittely"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Hallitse S/Mime varmenteitasi"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -316,7 +489,7 @@ msgstr "Hallitse S/Mime varmenteitasi"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -325,7 +498,7 @@ msgstr "Hallitse S/Mime varmenteitasi"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -351,6 +524,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Todennus</b>"
 
@@ -392,13 +566,11 @@ msgid "Anonymously"
 msgstr "Anonyymisti"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Yleistä"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
@@ -628,33 +800,26 @@ msgid "cards"
 msgstr "kortteja"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuutti"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Valitse yhteystiedot osoitekirjasta"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution osoitekirjan nimien valinta"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Poista kaikki"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Poista"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Poista kaikki"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Näytä yhteystietolista"
@@ -669,7 +834,7 @@ msgid "Send HTML Mail?"
 msgstr "Lähetä HTML-postia?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Lisää yhteystietoihin"
 
@@ -677,15 +842,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Lähde"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution osoitekirjan nimien valinta"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Valitse yhteystiedot osoitekirjasta"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -707,6 +879,11 @@ msgstr "_Ryhmä:"
 msgid "_Find"
 msgstr "_Etsi:"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Etsi"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Sähköpostiosoite</b>"
@@ -744,7 +921,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Työ</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -766,7 +943,6 @@ msgid "Birthday:"
 msgstr "Syntymäpäivä:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
@@ -779,7 +955,7 @@ msgid "Company:"
 msgstr "Yritys:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -787,7 +963,7 @@ msgid "Contact"
 msgstr "Yhteystieto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -879,8 +1055,8 @@ msgstr "Web-lokin osoite:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -903,22 +1079,6 @@ msgstr "_Näytä nimellä:"
 msgid "_Where:"
 msgstr "_Missä: "
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa nämä yhteystiedot?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa tämän yhteystiedon?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -926,16 +1086,16 @@ msgid "Address"
 msgstr "Osoite"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -1907,77 +2067,99 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL pikaviestin"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "Groupwise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Palvelu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Sijainti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Käyttäjätunnus"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Muut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Groupwise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Valitse kuva tälle yhteystiedolle"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1985,11 +2167,11 @@ msgstr ""
 "Yhteystieto on virheellinen:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Virheellinen yhteystieto."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -1997,12 +2179,7 @@ msgstr ""
 "Yhteystietoa ei voida tallentaa valittuun osoitekirjaan. Haluatko hylätä "
 "muutokset?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "Hylkää"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2010,28 +2187,6 @@ msgstr ""
 "Olet siirtämässä yhteystietoa osoitekirjasta toiseen, mutta sitä ei voida "
 "poistaa lähdeosoitekirjasta. Haluatko tallentaa uuteen osoitekirjaan kopion?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL pikaviestin"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Palvelu"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Sijainti"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Käyttäjätunnus"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
@@ -2049,6 +2204,22 @@ msgstr "_Koko nimi:"
 msgid "E-_mail:"
 msgstr "Sähköposti:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tämän yhteystiedon?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -2204,16 +2375,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Kirja"
 
@@ -2274,405 +2445,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(kartta)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "kartta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:526
-msgid "List Members"
-msgstr "Listan jäsenet"
-
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#: addressbook/gui/widgets/eab-contact-display.c:324
-msgid "E-mail"
-msgstr "Sähköposti"
-
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisaatio"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "Position"
-msgstr "Asema"
-
-#: addressbook/gui/widgets/eab-contact-display.c:347
-msgid "Video Conferencing"
-msgstr "Videoneuvottelu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:348
-#: addressbook/gui/widgets/eab-contact-display.c:363
-msgid "Phone"
-msgstr "Puhelin"
-
-#: addressbook/gui/widgets/eab-contact-display.c:349
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:353
-msgid "work"
-msgstr "työ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:361
-#: addressbook/gui/widgets/eab-contact-display.c:580
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
-#: addressbook/gui/widgets/eab-contact-display.c:368
-msgid "personal"
-msgstr "henkilökohtainen"
-
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Huomio"
-
-#: addressbook/gui/widgets/eab-contact-display.c:541
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Sähköposti"
-
-#: addressbook/gui/widgets/eab-contact-display.c:572
-msgid "Home page"
-msgstr "Kotisivu"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Onnistui"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Taustajärjestelmä käytössä"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Lähde poissa käytöstä"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Osoitekirjaa ei ole olemassa"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "Omaa yhteystietoa ei ole määritelty"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Lupa evätty"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Yhteystietoa ei löytynyt"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Yhteystiedon tunniste on jo olemassa"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokolla ei ole tuettu"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Peruutettu"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Ei voitu perua"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Todennus epäonnistui"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Todennus vaaditaan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS ei ole käytettävissä"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "Lähdettä ei ole olemassa"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Muu virhe"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Osoitekirjan avaus epäonnistui. Tarkista että polku on olemassa ja että "
-"sinulla on oikeudet käyttää sitä."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Osoitekirjan avaus epäonnistui. Olet joko syöttänyt virheellisen URI:n tai "
-"LDAP-palvelinta ei tavoiteta."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
-"tuen Evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
-"ei voida tavoittaa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
-"määritelty palauttamaan tai Evolution näyttämään.\n"
-"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
-"osoitekirjan hakemistopalvelimen asetuksissa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen\n"
-"aikarajoitus, jonka olet asettanut tällä osoitekirjalle. Tarkenna\n"
-"hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
-"hakemistopalvelimen asetuksissa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Tämä kysely ei valmistunut menestyksellisesti."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Virhe lisättäessä listalle"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Virhe lisättäessä yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Virhe muokattaessa listaa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Virhe muokattessa yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Virhe poistettaessa listaa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Virhe poistettaessa yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 yhteystiedo avaaminen avaisi myös %d uutta ikkunaa.\n"
-"Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s on jo olemassa\n"
-"Haluatko ylikirjoittaa?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Kirjoita yli"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "kortti.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Siirry yhteystieto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Kopioi yhteystieto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Siirrä yhteystiedot"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Kopioi yhteystiedot"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Valitse osoitekirja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Useita VCardeja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard %s:lle"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(ei nimeä)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Ensisijainen sähköposti"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Sähköposti 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Sähköposti 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Valitse toiminto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Luo uusi yhteystieto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Etsitään osoitekirjasta..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Muokkaa yhteystietoja"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Yhdistä sähköpostiosoite"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "Ja yksi muu yhteystieto."
-msgstr[1] "ja %d muuta yhteystietoa."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Näytä kaikki VCardin tiedot"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Näytä pieni vCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Tallenna osoitekirjaan"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
@@ -2686,9 +2458,9 @@ msgstr[1] "%d yhteystietoa"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Kysely"
 
@@ -2704,31 +2476,31 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Luokka on"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
@@ -2736,97 +2508,97 @@ msgstr "Edistyneet..."
 msgid "Type"
 msgstr "Tyyppi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:535
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Tallenna VCardina..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "_Tuo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Osoitekirjan lähteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "_Pilotin asetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Välitä yhteystieto eteenpäin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Tulosta kuori"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Kopioi osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Siirrä osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
 #: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Nykyinen näkymä"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
@@ -2860,8 +2632,8 @@ msgid "Car Phone"
 msgstr "Autopuhelin"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
 #: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Categories"
 msgstr "Ryhmät"
 
@@ -2869,6 +2641,21 @@ msgstr "Ryhmät"
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Sähköposti"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Sähköposti 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Sähköposti 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Sukunimi"
@@ -2905,14 +2692,29 @@ msgstr "Päiväkirja"
 msgid "Manager"
 msgstr "Johtaja"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Huomio"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Asema"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisaatio"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faksi"
@@ -2964,29 +2766,21 @@ msgstr "Yksikkö"
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Leveys"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Korkeus"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "On kohdistettu"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valittu"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "On kohdistin"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Kenttä"
@@ -3003,7 +2797,11 @@ msgstr "Tekstimalli"
 msgid "Max field name length"
 msgstr "Kentän maksimipituus"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sarakkeen leveys"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3017,7 +2815,7 @@ msgstr ""
 "\n"
 "Luo uusi yhteystieto kaksoisnäpäyttämällä."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3027,13 +2825,385 @@ msgstr ""
 "\n"
 "Näkymässä ei ole mitään näytettävää."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sarakkeen leveys"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valittu"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "On kohdistin"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(kartta)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "kartta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Listan jäsenet"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Asema"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Videoneuvottelu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Puhelin"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "työ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "henkilökohtainen"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Tehtävänimike"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Kotisivu"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Onnistui"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Taustajärjestelmä käytössä"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Lähde poissa käytöstä"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Osoitekirjaa ei ole olemassa"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "Omaa yhteystietoa ei ole määritelty"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Lupa evätty"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Yhteystietoa ei löytynyt"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Yhteystiedon tunniste on jo olemassa"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokolla ei ole tuettu"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Ei voitu perua"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Todennus epäonnistui"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Todennus vaaditaan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS ei ole käytettävissä"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Lähdettä ei ole olemassa"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Muu virhe"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Osoitekirjan avaus epäonnistui. Tarkista että polku on olemassa ja että "
+"sinulla on oikeudet käyttää sitä."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Osoitekirjan avaus epäonnistui. Olet joko syöttänyt virheellisen URI:n tai "
+"LDAP-palvelinta ei tavoiteta."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
+"tuen Evolutioniin, asenna versio joka on käännetty LDAP-tuen kanssa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
+"ei voida tavoittaa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
+"määritelty palauttamaan tai Evolution näyttämään.\n"
+"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
+"osoitekirjan hakemistopalvelimen asetuksissa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen\n"
+"aikarajoitus, jonka olet asettanut tällä osoitekirjalle. Tarkenna\n"
+"hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
+"hakemistopalvelimen asetuksissa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Tämä kysely ei valmistunut menestyksellisesti."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Virhe lisättäessä listalle"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Virhe lisättäessä yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Virhe muokattaessa listaa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Virhe muokattessa yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Virhe poistettaessa listaa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Virhe poistettaessa yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 yhteystiedo avaaminen avaisi myös %d uutta ikkunaa.\n"
+"Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s on jo olemassa\n"
+"Haluatko ylikirjoittaa?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Kirjoita yli"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "kortti.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Siirry yhteystieto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Kopioi yhteystieto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Siirrä yhteystiedot"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Kopioi yhteystiedot"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Valitse osoitekirja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Useita VCardeja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard %s:lle"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(ei nimeä)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Ensisijainen sähköposti"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Valitse toiminto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Luo uusi yhteystieto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Etsitään osoitekirjasta..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Muokkaa yhteystietoja"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Yhdistä sähköpostiosoite"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "Ja yksi muu yhteystieto."
+msgstr[1] "ja %d muuta yhteystietoa."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Näytä kaikki VCardin tiedot"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Näytä pieni vCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Tallenna osoitekirjaan"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3043,17 +3213,17 @@ msgstr "Korttinäkymä"
 msgid "GTK Tree View"
 msgstr "GTK puunäkymä"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Uudelleenvirtauksen testi"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Tekijänoikeudet (C) 2000, Ximin, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Tämä testaa reflow canvas:ia"
 
@@ -3077,6 +3247,11 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Tulosta kirjekuori"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
@@ -3086,11 +3261,6 @@ msgstr "Tulosta yhteystiedot"
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Tulosta kirjekuori"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3275,6 +3445,20 @@ msgstr "Yhteystiedon tulostustesti"
 msgid "This should test the contact print code"
 msgstr "Tämän pitäisi testata yhteystiedon tulostuksen koodia"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Tiedostoa ei voida avata"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Listaa osoitekirjoista ei löytynyt"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "Kirjaa ei voitu avata"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
@@ -3332,20 +3516,6 @@ msgstr "Normaalissa tilassa optiota koko ei pitäisi tarvita"
 msgid "Impossible internal error."
 msgstr "Mahdoton sisäinen virhe."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Tiedostoa ei voida avata"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Listaa osoitekirjoista ei löytynyt"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "Kirjaa ei voitu avata"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Virhe ladattaessa oletusosoitekirjaa."
@@ -3362,6 +3532,278 @@ msgstr "Tiedostonimeä ei annettu."
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Älä poista"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Lähetä:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tämän yhteystiedon?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Tapaaminen"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Haluatko tallentaa muutokset?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Hylkää muutokset"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Tallenna viesti"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Lähetä"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolutionin vCalendar-tuoja"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Jos suljet, näitä viestejä ei lähetetä ennen kuin Evolution on käynnistetty "
+"uudestaan."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3372,29 +3814,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Jaa usean päivän tapahtumat:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "wombat-palvelinta ei voitu käynnistää"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "wombattia ei voitu käynnistää"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "wombat-palvelinta ei voitu käynnistää"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilotin kalenterin ohjelmalohkoa ei voitu lukea"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Prioriteetin oletusarvo:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilotin tehtävien ohjelmalohkoa ei voitu lukea"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalenterit"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutionin kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenterin määrittely"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalenterin viestin skeduloinnin katselin"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutionin kalenterin/tehtävien muokkain"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolutionin kalenterin komponentti"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolutionin tehtävien komponentti"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Kalenterit"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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 "Evolution kalenterin hälytys ja huomautuspalvelu"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Alkaen:"
@@ -3492,10 +3998,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudelleen"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenterin hälytys ja huomautuspalvelu"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
@@ -3636,8 +4138,28 @@ msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Kuvaus sisältää"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentti sisältää"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Sijainti sisältää"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ei vastaavaa"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3658,8 +4180,8 @@ msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "päivää"
 
@@ -3669,12 +4191,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3723,64 +4241,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Valittu kalenteri ei ole kirjoitettava, tapahtumia ei voida luoda. Valitse "
-"kirjoitettava kalenteri."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Kalenteri"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalenteri"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -3810,26 +4316,6 @@ msgstr "Työviikko"
 msgid "Month View"
 msgstr "Kuukausinäkymä"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Kuvaus sisältää"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Kommentti sisältää"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Sijainti sisältää"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Ei vastaavaa"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Virhe avattaessa kalenteria"
@@ -3847,211 +4333,133 @@ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Äänihälytyksen asetukset"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Viestin hälytyksen ominaisuudet"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Sähköpostin hälytysvaihtoehdot"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Ohjelmallisen hälytyksen asetukset"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Tuntemattoman hälytyksen asetukset"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Hälytyksen toisto"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Näytettävä viesti:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Lähetettävä viesti"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Soita ääni:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Toista hälytystä"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Suorita ohjelma:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Lähetä:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Näillä argumenteilla:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Hälytykset</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "ylimääräisiä kertoja joka"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Tehtävälistan vaihtoehdot</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "tuntia"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Yleistä</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Toimenpide/Liipasin"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Lisää kalenteri"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Lisää"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Kirjoita viesti"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Perusasiat"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Päiväys ja Aika:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Viestit"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Soita ääni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Ponnahdusikkuna hälytykselle"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Muistutukset"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Aja ohjelma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Lähetä:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Lähetä sähköpostia"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Kuvaus:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Osoite:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Vaihtoehdot...."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Suorita ohjelma:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Toista hälytystä"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Lähetä"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "jälkeen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "ennen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "päivä(ä)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "tapaamisen päätös"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "ylimääräisiä kertoja joka"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "tunti(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "tuntia"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuutti"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "tapaamisen alku"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Määrittele paikka, josta kalenteri haetaan."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Lähteen sijainti '%s' ei ole hyvinmuotoiltu."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Lähteen sijainti '%s' ei ole verkkokalenterin lähde."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Lähde nimellä '%s' on jo olemassa valitussa ryhmässä."
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "Ryhmä '%s' on etäryhmä. Määrittele sijainti, josta kalenteri haetaan."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Lisää kalenteri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Lisää tehtävälistaryhmä"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Väri:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Valitse väri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "Lisää kalenteri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Lisää ryhmä"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Virkistä:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tyyppi:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Toimenpide/Liipasin"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Lisää"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "viikkoa"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Hälytys %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4160,7 +4568,7 @@ msgid "Free/Busy Publishing"
 msgstr "Vapaa/varattu-tiedon julkaisu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Perjantai"
@@ -4174,7 +4582,7 @@ msgid "Minutes"
 msgstr "Minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Maanantai"
@@ -4184,7 +4592,7 @@ msgid "S_un"
 msgstr "_Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Lauantai"
@@ -4198,7 +4606,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunnuntai"
@@ -4212,7 +4620,7 @@ msgid "T_hu"
 msgstr "_To"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torstai"
@@ -4226,7 +4634,7 @@ msgid "Time format:"
 msgstr "Ajan muoto:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tiistai"
@@ -4236,7 +4644,7 @@ msgid "W_eek starts:"
 msgstr "Viikko _alkaa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Keskiviikko"
@@ -4269,7 +4677,8 @@ msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4319,6 +4728,72 @@ msgstr "_Ke"
 msgid "before every appointment"
 msgstr "_Ennen joka tapaamista"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Määrittele paikka, josta kalenteri haetaan."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Lähteen sijainti '%s' ei ole hyvinmuotoiltu."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Lähteen sijainti '%s' ei ole verkkokalenterin lähde."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Lähde nimellä '%s' on jo olemassa valitussa ryhmässä."
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "Ryhmä '%s' on etäryhmä. Määrittele sijainti, josta kalenteri haetaan."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Lisää kalenteri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Lisää tehtävälistaryhmä"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Väri:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Valitse väri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "Lisää kalenteri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Lisää ryhmä"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Virkistä:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tyyppi:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "viikkoa"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Tapahtuma on poistettu."
@@ -4363,79 +4838,73 @@ msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Tarkistusvirhe: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Valmis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(erääntyy "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Erääntyy "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Kohdetta ei voitu päivittää"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päiväkirjamerkintä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Tallenna nimellä..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Tarkistusvirhe: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Valmis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Valmis"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(erääntyy "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Erääntyy "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Lähdettä ei voitu avata"
@@ -4499,8 +4968,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Kohdetta ei voitu poistaa virheen takia"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Osoitekirja..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Yhteystiedot"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4510,132 +4980,193 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Muistutus"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Ajoitus"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Suunta"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Kokous"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Tapahtuma ilman alkupäivämäärää"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Tapahtuma ilman päättymispäivää"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Lopetuspäiväys on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Alkamisaika on väärin"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Lopetusaika on virheellinen"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kalenterin '%s' ei voitu avata"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "_Ennen joka tapaamista"
+msgstr[1] "_Ennen joka tapaamista"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "tapaamisen päätös"
+msgstr[1] "tapaamisen päätös"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "_Ennen joka tapaamista"
+msgstr[1] "_Ennen joka tapaamista"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Koko päivän kestävä tapahtuma"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "_Ennen joka tapaamista"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Varattu"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "_Ennen joka tapaamista"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ry_hmät..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "_Ennen joka tapaamista"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Tehtävälista</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Luokittelu"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Aika</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Luottamuksellinen"
+msgid "A_ll day event"
+msgstr "_Koko päivän kestävä tapahtuma"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Päiväys ja Aika"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Tallenna oma näkymä..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Vapaa"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ry_hmät..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Sijainti:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalenteri:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Y_ksityinen"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Luokittelu"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Ju_lkinen"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Luottamuksellinen"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Näytä aika muodossa"
+msgid "L_ocation:"
+msgstr "_Sijainti:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Henkilökohtainen"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Julkinen"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Näytä aika muodossa"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Tyhjennä"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Kuvaus:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Loppumisaika:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Alkamisaika:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4644,31 +5175,25 @@ msgstr "_Alkamisaika:"
 msgid "None"
 msgstr "Määrittelemätön"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Valitulla järjestäjällä ei enää ole käyttäjätiliä"
 
-#: calendar/gui/dialogs/meeting-page.c:428
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Järjestäjä vaaditaan."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Valtuuta..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Poista"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4714,28 +5239,39 @@ msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Lisää _osallistuja"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Hälytykset</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Lisää osanottajia osoitekirjasta."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Muuta</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Vaihda _järjestäjää"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisoija:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Yhteystiedot"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Vaihda _järjestäjää"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organisoija:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4802,147 +5338,138 @@ msgstr "Tätä ja tulevia kertoja"
 msgid "All Instances"
 msgstr "Kaikki tahot"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Tämä tapaaminen sisältää toistuvuuksia, joita Evolution ei voi muokata."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "ensimmäinen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekunti"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "kolmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "neljäs"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "viimeinen"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Toinen päiväys"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "päivä"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "  "
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "tapahtumiskerrat"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Päiväys/Aika"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Joka"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Poikkeukset"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Esikatselu"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Toistuvuuden sääntö"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Oma toistuvuus"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Muokkaa"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Esikatselu</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Ei toistuvuutta"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Toistuvuus"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Poista"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Joka"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Yksinkertainen toistuvuus"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "kertaa"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "ikuisesti"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "kuukautta"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "kunnes"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "viikkoa"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Valitse kohde"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Kohde"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Tehtävät"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Viestin kirjasimet</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "valmis (%)"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Hälytykset</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4956,8 +5483,8 @@ msgstr "Korkea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Työn alla"
@@ -4969,22 +5496,22 @@ msgid "Low"
 msgstr "Matala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ei aloitettu"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Edistyminen"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Valmis (%%): %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5007,36 +5534,42 @@ msgstr "_Tila:"
 msgid "_Web Page:"
 msgstr "_Kotisivun osoite:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tehtävä"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Luottamuksellinen"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Vaihtoehdot</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Poista viesti</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Kansio:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "_Alkamispäivä:"
@@ -5045,52 +5578,58 @@ msgstr "_Alkamispäivä:"
 msgid "_Due date:"
 msgstr "_Eräpäivä:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "HTTP-palvelimen tunnistautumistiedot"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Ryhmä"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Julkaistaviksi valitut kalenterit"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalenterin vaihtoehdot</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Päivittäin"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Julkaisutiheys"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Vapaa/Varattu-muokkain"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Vapaa/Varattu-tiedon julkaisusijainti"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Vapaa/Varattu-tiedon julkaisusijainti"
+msgid "Free/Busy Editor"
+msgstr "Vapaa/Varattu-muokkain"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Käyttäjätunnus:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Päivittäin"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Salasana:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Sähköposti"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Julkaisutiheys"
+#, fuzzy
+msgid "_Password:"
+msgstr "Salasana:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Muista salasana"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Käyttäjät_unnus:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Käyttäjä julkaisee"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Viikoittain"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5172,7 +5711,7 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Näpäytä avataksesi %s"
@@ -5181,6 +5720,11 @@ msgstr "Näpäytä avataksesi %s"
 msgid "Untitled"
 msgstr "Nimetön"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Kuvaus:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5204,20 +5748,93 @@ msgstr "Prioriteetti:"
 msgid "Web Page:"
 msgstr "WWW-sivu:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Julkinen"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Päättymispäivä"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Henkilökohtainen"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Aloituspäivä"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Luottamuksellinen"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Kuvaus"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Vapaa"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Varattu"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "P"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "L"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Maantieteellinen sijainti tulee syöttää muodossa:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Kyllä"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ei"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Toistuva"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Annettu tehtäväksi"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5263,15 +5880,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Vapaa"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "Varattu"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
@@ -5282,7 +5890,7 @@ msgstr "Päivitetään olioita"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -5292,7 +5900,7 @@ msgstr "_Avaa www-sivu"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
@@ -5315,7 +5923,7 @@ msgstr "L_eikkaa"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5346,10 +5954,25 @@ msgstr "_Merkitse valmiiksi"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merkitse valitut tehtävät valmiiksi"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Poista"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Poista valitut tehtävät"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Tallenna nimellä..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5381,11 +6004,6 @@ msgstr "Prioriteetti"
 msgid "Start date"
 msgstr "Aloituspäivä"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kuvaus"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
@@ -5462,95 +6080,13 @@ msgstr "Siirry _päivään..."
 msgid "_Settings..."
 msgstr "_Asetukset..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Päättymispäivä"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Aloituspäivä"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Toistuva"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Annettu tehtäväksi"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Kyllä"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ei"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "P"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "L"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Maantieteellinen sijainti tulee syöttää muodossa:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5567,43 +6103,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuutin välein"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuutin välein"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5736,7 +6265,7 @@ msgstr "Päivitä"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5953,52 +6482,36 @@ msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikä sitä voida päivittää\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Läsnäolon tilaa ei voitu päivittää virheellisen tilan takia\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "Virhe CORBA-järjestelmässä\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "Kohdetta ei löytynyt\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Sinulla ei ole kalenterin päivitykseen vaadittavia oikeuksia\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Osallistujan tilan päivitys epäonnistui!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voitu lähettää!\n"
 
@@ -6027,6 +6540,10 @@ msgstr "Ladataan kalenteria"
 msgid "Loading calendar..."
 msgstr "Ladataan kalenteria..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisoija:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Palvelinviesti:"
@@ -6097,7 +6614,7 @@ msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Alustava"
 
@@ -6110,100 +6627,81 @@ msgstr "Valtuutettu"
 msgid "In Process"
 msgstr "Työn alla"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ei tietoa"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "Lisää osanottajia osoitekirjasta"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "_Asetukset"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Asetukset"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Näytä vain _työtunnit"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automaattinen valinta"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "Kokouksen alkamisaika:"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "Kokouksen päättymisaika:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6222,9 +6720,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
@@ -6241,15 +6737,6 @@ msgstr "Valtuutetaan seuraavat tehtävät...."
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tehtävät"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Päivitetään kyselyä"
@@ -6273,55 +6760,6 @@ msgstr "Avataan %s"
 msgid "Purging"
 msgstr "Tyhjennetään"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionin kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenterin määrittely"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalenterin viestin skeduloinnin katselin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutionin kalenterin/tehtävien muokkain"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolutionin kalenterin komponentti"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolutionin tehtävien komponentti"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Kalenterit"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tehtävät"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -6668,10 +7106,6 @@ msgstr "Valittu kuukausi (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Valittu vuosi (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tehtävä"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6702,7 +7136,7 @@ msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6730,7 +7164,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tehtävä"
 msgstr[1] "%d tehtävää"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:508
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6752,35 +7186,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Valittu tehtävälista ei ole kirjoitettava, tapahtumia ei voida luoda.  "
-"Valitse kirjoitettavissa oleva kalenteri."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Uusi tehtäväryhmä"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Tehtäväryhmä"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Luo uusi tehtäväryhmä"
 
@@ -8543,41 +8970,6 @@ msgstr "Virheellisiä argumentteja (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Toiminto ei ole tuettu: lisää viesti: %s:lle"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s:lle"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Toiminto ei ole tuettu: hae UIDien perusteella: %s:lle"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Siirretään viestejä"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopioidaan viestejä"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Opitaan roskapostia"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Opitaan ei-roskapostia"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Suodatetaan uusia viestejä"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8621,6 +9013,41 @@ msgstr "(match-threads) vaatii kansion asettamisen"
 msgid "Performing query on unknown header: %s"
 msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Toiminto ei ole tuettu: lisää viesti: %s:lle"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s:lle"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Toiminto ei ole tuettu: hae UIDien perusteella: %s:lle"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Siirretään viestejä"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopioidaan viestejä"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Opitaan roskapostia"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Opitaan ei-roskapostia"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Suodatetaan uusia viestejä"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8739,6 +9166,26 @@ msgstr "Salattu sisältö"
 msgid "Unable to parse message content"
 msgstr "Viestin sisältöä ei voitu tulkita"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Lukitsevan apulaisen putkea ei voida luoda: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Lukitsevaa apulaista ei voida käynnistää: %s"
+
+#: 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' ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Lukitus epäonnistui: %s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8761,26 +9208,6 @@ msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Lukitseminen käyttäen flock(2) kutsua epäonnistui: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Lukitsevan apulaisen putkea ei voida luoda: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Lukitsevaa apulaista ei voida käynnistää: %s"
-
-#: 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' ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Lukitus epäonnistui: %s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9037,7 +9464,7 @@ msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
@@ -9124,55 +9551,55 @@ msgstr "POP ennen SMTP:tä käyttäen lähdettä, joka ei ole POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Säännöllisen lausekkeen käännös epäonnistui: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vaatii käyttäjätunnusosan"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vaatii palvelinosan"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vaatii polkuosan"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ratkaistaan: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Virhe etsittäessä nimeä :%s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Isäntänimeä ei löytynyt: säiettä ei voida luoda: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Palvelimen %s osoitteen haku epäonnistui: palvelinta ei löydy"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Palvelimen %s osoitteen haku epäonnistui: tuntematon syy"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Etsitään osoitetta"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Palvelimen osoitteen haku epäonnistui: palvelinta ei löydy"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Palvelimen osoitteen haku epäonnistui: tuntematon syy"
 
@@ -9244,7 +9671,7 @@ msgstr "Salausvarmennetta ei voida lisätä"
 msgid "Cannot add CMS SignerInfo"
 msgstr "CMS SignerInfo:a ei voida lisätä"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Kooderin kontekstia ei voida luoda"
 
@@ -9325,7 +9752,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Viesti on varmenne, varmenteet tuotu ja tarkistettu"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Allekirjoitusten tiivisteitä ei löydy"
 
 #: camel/camel-smime-context.c:651
@@ -9338,47 +9766,51 @@ msgid "Decoder failed"
 msgstr "Purkaja epäonnistui"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Varmennetta '%s':lle ei voida löytää"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Varmennetta '%s':lle ei löydy"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Yhteistä massasalausalgoritmia ei löydy"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Tilaa massasalausavaimelle ei voida varata"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "CMS-viestiä ei voida luoda"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "CMS EnvelopedData:a ei voida luoda"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "CMS EnvelopedData:a ei voida liittää"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "CMS tieto-oliota ei voida liittää"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "CMS RecipientInfo:a ei voida luoda"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "CMS RecipientInfo:a ei voida lisätä"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Kooderin kontekstia ei voida luoda"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Tiedon lisäys koodaajaan epäonnistui"
@@ -9424,7 +9856,8 @@ msgstr "Kansiota ei voida luoda: %s: kansio on olemassa"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
@@ -9433,8 +9866,8 @@ msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskapostia"
 
@@ -9671,7 +10104,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
@@ -9690,8 +10123,8 @@ msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Etsi uusia viestejä kaikista kansioista"
 
@@ -9722,8 +10155,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise-palvelinten käyttöä varten"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9741,340 +10174,28 @@ msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 msgid "Checklist"
 msgstr "Muistilista"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Komennon lähetys IMAP-palvelimelle %s epäonnistui: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Odottamaton vastaus IMAP-palvelimelta %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Odottamaton tervehdys IMAP-palvelimelta %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kansiota %s ei voida valita: virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kansiota '%s' ei voida valita: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Palvelin %s katkaisi yhteyden odottamatta: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Saatiin BYE vastaus"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kansion '%s' lipukkeita ei voida synkronisoida: tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Kansion '%s' lipukkeita ei voida synkronisoida: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr ""
-"Kansion '%s' poistettuja viestejä ei voida poistaa pysyvästi: tuntematon "
-"virhe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr ""
-"Kansion '%s' poistettuja viestejä ei voida poistaa pysyvästi: virheellinen "
-"komento"
-
-#: camel/providers/imap4/camel-imap4-folder.c:748
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Viestiä %s ei voida hakea kansiosta '%s': viestiä ei ole olemassa"
-
-#: camel/providers/imap4/camel-imap4-folder.c:753
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Viestiä %s ei voida hakea kansiosta '%s': virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-folder.c:878
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Viestiä ei voida lisätä kansioon: %s: tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:907
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Viestiä ei voida lisätä kansioon: %s: virheellinen käsky"
-
-#: camel/providers/imap4/camel-imap4-folder.c:986
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Viestejä ei voida siirtää kansiosta '%s' kansioon '%s': Tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:990
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Viestejä ei voida kopioida kansiosta '%s' kansioon '%s': Tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:998
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Viestejä ei voida siirtää kansiosta '%s' kansioon '%s': Virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1002
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Viestejä ei voida kopioida kansiosta '%s' kansioon '%s': Virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kansiot"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Näytä ainoastaan tilatut kansiot"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Ohita palvelimen tarkoama kansioiden nimiavaruus"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nimiavaruus"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Sähköpostien luku ja tallennus IMAPv4rev1-palvelimilta. KOKEELLINEN!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ota yhteys IMAPv4rev1-palvelimeen tekstimuotoista salasanaa käyttäen."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Imap-palvelin %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-palvelin %s:lle palvelimella %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Yhteyttä %s:ään (portti %d) ei voitu luoda: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL ei käytettävissä"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Yhteys peruutettu"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: "
-"Palvelin ei tue käskyä STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "Yhdistäminen POP-palvelimeen %s menetelmällä %s epäonnistui"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sSyötä IMAP-salasana käyttäjälle %s palvelimella %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Tunnistautuminen IMAP-palvelimelle %s epäonnistui menetelmällä %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kansiota '%s' ei voida hakea IMAP-palvelimelta %s: tuntematon virhe"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kansion luonti epäonnistui: '%s': virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kansiota '%s' ei voida luoda: Virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kansiota ei voida poistaa: %s: erikoiskansio"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kansiota ei voida poistaa: %s: virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kansiota ei voida poistaa: %s: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kansiota '%s' ei voida nimetä uudestaan nimelle '%s': erikoiskansio"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr ""
-"Kansiota %s ei voida nimetä uudestaan nmelle: %s: virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Kansiota %s ei voida uudelleennimetä nimelle %s: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Tietoa %s lausekkelle '%s' ei voida hakea IMAP-palvelimelta %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kansiota '%s' ei voida tilata: virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kansiota '%s' ei voida tilata: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kansion '%s' tilausta ei voida perua: virheellinen kansion nimi"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Kansion '%s' tilausta ei voida perua: virheellinen komento"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Odottamaton merkki IMAP-palvelimen %s vastauksessa:"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Ei tietoja"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP-palvelin %s katkaisi yhteyden odottamatta: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10143,7 +10264,7 @@ msgstr ""
 " %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10217,6 +10338,27 @@ msgstr "Käytä omaa komentoa palvelimeen yhdistämiseen"
 msgid "Command:"
 msgstr "Komento:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Kansiot"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Näytä ainoastaan tilatut kansiot"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Ohita palvelimen tarkoama kansioiden nimiavaruus"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Nimiavaruus"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10238,43 +10380,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Imap-palvelin %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-palvelin %s:lle palvelimella %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Yhteyttä %s:ään (portti %d) ei voitu luoda: %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL ei käytettävissä"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Yhteys peruutettu"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS laajennos ei ole käytettävissä"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL-kättely epäonnistui."
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Varmennusmenetelmä %s ei ole tuettu"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSyötä IMAP salasana käyttäjälle %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10285,30 +10477,272 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Komennon lähetys IMAP-palvelimelle %s epäonnistui: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Odottamaton vastaus IMAP-palvelimelta %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Odottamaton tervehdys IMAP-palvelimelta %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kansiota %s ei voida valita: virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida valita: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Palvelin %s katkaisi yhteyden odottamatta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Saatiin BYE vastaus"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kansion '%s' lipukkeita ei voida synkronisoida: tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kansion '%s' lipukkeita ei voida synkronisoida: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+"Kansion '%s' poistettuja viestejä ei voida poistaa pysyvästi: tuntematon "
+"virhe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr ""
+"Kansion '%s' poistettuja viestejä ei voida poistaa pysyvästi: virheellinen "
+"komento"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Viestiä %s ei voida hakea kansiosta '%s': viestiä ei ole olemassa"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Viestiä %s ei voida hakea kansiosta '%s': virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Viestiä ei voida lisätä kansioon: %s: tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Viestiä ei voida lisätä kansioon: %s: virheellinen käsky"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Viestejä ei voida siirtää kansiosta '%s' kansioon '%s': Tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Viestejä ei voida kopioida kansiosta '%s' kansioon '%s': Tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Viestejä ei voida siirtää kansiosta '%s' kansioon '%s': Virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Viestejä ei voida kopioida kansiosta '%s' kansioon '%s': Virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Sähköpostien luku ja tallennus IMAPv4rev1-palvelimilta. KOKEELLINEN!!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Ota yhteys IMAPv4rev1-palvelimeen tekstimuotoista salasanaa käyttäen."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: "
+"Palvelin ei tue käskyä STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "Yhdistäminen POP-palvelimeen %s menetelmällä %s epäonnistui"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSyötä IMAP-salasana käyttäjälle %s palvelimella %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Tunnistautuminen IMAP-palvelimelle %s epäonnistui menetelmällä %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kansiota '%s' ei voida hakea IMAP-palvelimelta %s: tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kansion luonti epäonnistui: '%s': virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida luoda: Virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kansiota ei voida poistaa: %s: erikoiskansio"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kansiota ei voida poistaa: %s: virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kansiota ei voida poistaa: %s: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kansiota '%s' ei voida nimetä uudestaan nimelle '%s': erikoiskansio"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr ""
+"Kansiota %s ei voida nimetä uudestaan nmelle: %s: virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kansiota %s ei voida uudelleennimetä nimelle %s: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Tietoa %s lausekkelle '%s' ei voida hakea IMAP-palvelimelta %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kansiota '%s' ei voida tilata: virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida tilata: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kansion '%s' tilausta ei voida perua: virheellinen kansion nimi"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kansion '%s' tilausta ei voida perua: virheellinen komento"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Odottamaton merkki IMAP-palvelimen %s vastauksessa:"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Ei tietoja"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP-palvelin %s katkaisi yhteyden odottamatta: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10479,18 +10913,26 @@ msgstr "Yhteenvedon tallennus epäonnistui %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Viestin lisäys yhteenvetoon epäonnistui: tuntematon syy"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir-kansiion lisäys keskeytettiin"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Viestiä ei voida lisätä maildir-kansioon: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10506,48 +10948,48 @@ msgstr ""
 "Viestin %s hakeminen kansiosta %s epäonnistui\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Virheellinen viestin sisältö"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kansiota '%s' ei voida hakea: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Kansiota `%s' ei voida hakea: kansiota ei ole olemassa."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "'Kansiota '%s' ei voida avata: se ei maildir-muotoinen hakemisto."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11134,20 +11576,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Yhdistäminen POP-palvelimeen %s (portti %d) epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Yhdistäminen POP-palvelimeen %s turvallisessa tilassa epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Yhdistäminen palvelimeen epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11156,28 +11603,28 @@ msgstr ""
 "Yhdistäminen POP-palvelimeen %s  epäonnistui: pyydettyä "
 "tunnistatumismenetelmää ei tueta."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL '%s' kirjautuminen POP-palvelimelle %s epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP-palvelimeen %s kirjautuminen epäonnistui: SASL protokollavirhe"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sSyötä POP-salasana käyttäjälle %s palvelimella %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11186,7 +11633,16 @@ msgstr ""
 "Yhdistäminen POP-palvelimeen epäonnistui: %s\n"
 "Virhe lähetettäessä salasanaa: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Yhdistäminen POP-palvelimeen epäonnistui: %s\n"
+"Virhe lähetettäessä salasanaa: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Kansiota '%s' ei ole olemassa."
@@ -11579,73 +12035,6 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ehdota liitteen automaattista näyttämistä"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
-"asetettu tälle tilille"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
-"tilille"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Tiedostoa ei voitu avata"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Viestiä ei voida hakea muokkaimelta"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Nimeämätön viesti"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Avaa tiedosto"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automaattisesti luotu"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Allekirjoitus:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> tiedosto liitetty"
-msgstr[1] "<b>%d</b> tiedostoa liitetty"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3208
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3100
-#: composer/e-msg-composer.c:3101
-msgid "Compose a message"
-msgstr "Kirjoita viesti"
-
-#: composer/e-msg-composer.c:4254
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>Muokkain sisältää viestin rungon, joka ei ole tekstiä ja jota ei voida "
-"muokata)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postituksen kohde"
@@ -11726,17 +12115,91 @@ msgstr "Valitse kansiot, joihin postituksia lähetetään, näpäyttämällä t�
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
+"asetettu tälle tilille"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu tälle "
+"tilille"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Tiedostoa ei voitu avata"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Viestiä ei voida hakea muokkaimelta"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Nimeämätön viesti"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Avaa tiedosto"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automaattisesti luotu"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Allekirjoitus:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> tiedosto liitetty"
+msgstr[1] "<b>%d</b> tiedostoa liitetty"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Kirjoita viesti"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Välitetty viesti - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Liitä alkuperäinen viesti"
+msgstr[1] "Liitä alkuperäinen viesti"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>Muokkain sisältää viestin rungon, joka ei ole tekstiä ja jota ei voida "
+"muokata)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Et voi lisätä tiedostoa '{0}' tähän viestiin."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11757,18 +12220,32 @@ msgstr ""
 "Jos haluat lisätä hakemiston sisällön, liitä joko jokainen tiedosto "
 "hakemistossa erikseen tai luo arkisto hakemistosta ja liitä arkisto."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Viestiä ei voitu luoda."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Syy: \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Viimeistelemätön viesti löytyi"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Haluatko palauttaa viimeistelemättömät viestit?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11776,38 +12253,38 @@ msgstr ""
 "Evolution suljettiin odottamatta, kun olit muokkamassa uutta viestiä. "
 "Viestin palautuksen avulla voit jatkaa siitä, mihin jäit."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Älä palauta"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Palauta"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Varmuuskopiotiedostoa \"{0}\" ei voitu tallentaa."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Automaattinen tallennus epäonnistui: \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Varoitus: Muutettu viesti"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Haluatko todella hylätä viestin otsikolla '{0}', vaikka muokkaat sitä?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11817,65 +12294,49 @@ msgstr ""
 "tallenna viesti luonnoskansioosi. Näin pystyt jatkamaan viestin kirjoitusta "
 "myöhemmin."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Hylkää muutokset"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Tallenna viesti"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Viestiä ei voitu luoda."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "\"{0} johtuen sinun täytyy ehkä valita eri sähköpostin asetukset."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Allekirjoitustiedostoa \"{0}\" ei voitu lukea."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Syy: \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Kaikki tilit on poistettu."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Viestin muokkausikkunaa ei voitu luoda."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Osoitteen valinnan ohjainta ei voitu aktivoida"
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12039,16 +12500,12 @@ msgstr "Synkronointiryhmät:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12100,31 +12557,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12201,10 +12650,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Valitse aika johon verrataan"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Suodatinsäännöt"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12221,7 +12666,6 @@ msgid "Missing file name."
 msgstr "Tiedostonimi puuttuu."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Tiedostonimi täytyy antaa."
@@ -12231,172 +12675,42 @@ msgstr "Tiedostonimi täytyy antaa."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Tiedostoa \"{0}\" ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Kansio puuttuu."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Kansio täytyy valita."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Virhe säännöllisessä lausekkeessa \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Säännöllistä lauseketta \"{1}\" ei voitu kääntää."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Nimi puuttuu."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Suodattimella täytyy olla nimi."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "vKansio täytyy nimetä"
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Nimi \"{0}\" on jo käytössä."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Valitse toinen nimi."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Lähteitä ei ole valittuna."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"Ainakin yksi lähdekansio täytyy olla valittuna.\n"
-"Valitse joko kansiot yksitellen, valitsemalla kaikki paikalliset\n"
-"tai etäkansiot, tai valitsemalla kaikki kansiot molemmat."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Valitse tiedosto"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Silloin</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Valitse kansio"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr " "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Suodatinsäännöt</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vKansioiden lähteet</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Vertaa arvoon"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Tulevat"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Viestin päiväystä verrataan määritellyn päivän\n"
-" keskipäivään (klo 12:00)"
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Viestin päiväystä verrataan suhteessa aikaan\n"
-"jolloin suodatus tapahtuu."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Viestin päiväystä verrataan aikaan, jolloin\n"
-"suodatus tapahtuu."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "Aika suhteessa tämänhetkiseen aikaan"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "sitten"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "kuukautta"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekuntia"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "vain määritellyt kansiot"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "tämänhetkinen aika"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "määrittelemäsi aika"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "kaikille aktiivisille etäkansioille"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "kaikille paikallisille ja aktiivisille etäkansioille"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "kaikille paikallisille kansioille"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "vuotta"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tärkeä"
 
@@ -12460,6 +12774,70 @@ msgstr "tulevat"
 msgid "outgoing"
 msgstr "lähtevät"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Suodatinsäännöt</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Vertaa arvoon"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Tulevat"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Viestin päiväystä verrataan määritellyn päivän\n"
+" keskipäivään (klo 12:00)"
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Viestin päiväystä verrataan suhteessa aikaan\n"
+"jolloin suodatus tapahtuu."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Viestin päiväystä verrataan aikaan, jolloin\n"
+"suodatus tapahtuu."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "Aika suhteessa tämänhetkiseen aikaan"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "sitten"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "kuukautta"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekuntia"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "tämänhetkinen aika"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "määrittelemäsi aika"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "vuotta"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Lisää sääntö"
@@ -12472,58 +12850,72 @@ msgstr "Muokkaa sääntöä"
 msgid "Rule name"
 msgstr "Säännön nimi"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Pisteytyksen säännöt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pistemäärä"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Muokkaimen asetukset"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Runko sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
+"näyttö"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Runko ei sisällä"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Runko tai otsikko sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Määrittele sähköpostitilisi tästä"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Viesti sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution sähköposti"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Vastaanottajakenttä sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionin sähköpostitilien asetukset"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Lähettäjäkenttä sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolutionin sähköpostikomponentti"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Otsikko sisältää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutionin sähköpostin muokkain"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Otsikko ei sisällä"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution sähköpostin muokkaimen asetukset"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtuaaliset _kansiot"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution sähköpostin asetukset"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Lisää"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Sähköposti"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "vKansion lähde"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Sähköpostitilit"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Sähköpostin asetukset"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Sähköposti"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12574,31 +12966,335 @@ msgstr ""
 "${AbbrevWeekdayName}, ${Year}-${Month}-${Day} kello ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} kirjoitti:"
 
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Suodatinsäännöt"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Valitse kansio"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Anna tehtäväksi"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Annettu tehtäväksi"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Liite"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belize"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Runko sisältää"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Kopioi kansioon"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Otettu vastaan"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Lähetetty\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Poista"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Runko ei sisällä"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "Tiedostoa %s ei ole olemassa"
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Tiedostoa %s ei ole olemassa"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Runko ei sisällä"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Runko ei sisällä"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "wombattia ei voitu käynnistää"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Päiväys"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Nimi alkaa"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "_Poistu"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Teksti"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Vanhenee"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Lähetä edelleen"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Lista"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "jälkeen"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "ennen"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Merkitty"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Lista"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Merkitty"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Kesäkuu"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Otsikko"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "%s postilista"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Lähetettävä viesti"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Lähetettävä viesti"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Viestit"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Merkitse _ei-roskapostiksi"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Siirrä kansioon"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Poistu ohjelmasta"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Soita ääni:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lue"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Vastaanottajakenttä sisältää"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Vastaukset"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "Poista vanhemmat tapahtumat kuin"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Suorita ohjelma:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pistemäärä"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Lähetä"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Tila"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Koko"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Lähdekirja"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "vain määritellyt kansiot"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Pysäytä lataaminen"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Aihe"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Yhdysvallat"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Silloin</b>"
+
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Luo virtuaalikansio alusta alkaen..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "kansion ominaisuudet"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Ominaisuudet"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Kansion nimi"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Viestejä kaikkiaan"
-
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Lukemattomia viestejä"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Viestejä kaikkiaan"
+msgstr[1] "Viestejä kaikkiaan"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Lukemattomia viestejä"
+msgstr[1] "Lukemattomia viestejä"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12608,8 +13304,8 @@ msgstr "<Valitse kansio näpäyttämällä tästä>"
 msgid "Create New Folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
-#: mail/mail-component.c:719
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
@@ -12621,445 +13317,276 @@ msgstr "Luo"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "vKansiot"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "EI VASTAAVAA"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Siirretään kansiota %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopioidaan kansiota %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kansioon %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kansioon %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Peruuta _raahaus"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "_Kopioi"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Luodaan kansiota %s"
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:719
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä '%s' uudelleen: "
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Näytä"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Siirrä..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Nimeä uudestaan..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Ominaisuudet..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "vKansiot"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "EI VASTAAVAA"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Ladataan..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:516
-#: mail/mail-component.c:569
-msgid "Mail"
-msgstr "Sähköposti"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Vastine...."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Merkitse _luetuksi"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Merkitse _roskapostiksi"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Merkitse _ei-roskapostiksi"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Otsikko"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "_Suodata roskapostit"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VKansio _aiheen perusteella"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VKansio _lähettäjän perusteella"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VKansio _vastaanottajien perusteella"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VKansio _listan perusteella"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Oletukset"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Näpäytä lähettääksesi %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Lähettäjä"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Vastausosoite:"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Kopiot:"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Piilokopiot"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Aihe"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Päiväys"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Uutisryhmät"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s liite"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Allekirjoituksen muoto ei ole tuettu"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Virhe tarkistettaessa allekirjoitusta"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Haetaan %s"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Allekirjoittamaton"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Hyväksytty allekirjoitus"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Hylätty allekirjoitus"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Salaamaton"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Heikosti salattu"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Salattu"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Salattu vahvalla algoritmilla"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Osoitin FTP-palvelimelle (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Osoitin paikalliseen tiedostoon (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-"Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Muotoillaan viestiä"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "Postittaja"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Allekirjoittamaton"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13067,7 +13594,11 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Hyväksytty allekirjoitus"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13075,7 +13606,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Hylätty allekirjoitus"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13083,11 +13618,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13095,7 +13630,11 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Salaamaton"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13103,7 +13642,11 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen matkatessa "
 "lähettäjältä Internetin läpi."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Heikosti salattu"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13113,7 +13656,11 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Salattu"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13121,7 +13668,11 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Salattu vahvalla algoritmilla"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13131,39 +13682,162 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Haetaan %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Osoitin FTP-palvelimelle (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Osoitin paikalliseen tiedostoon (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+"Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Muotoillaan viestiä"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Lähettäjä"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Vastausosoite:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Vastaanottaja"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Kopiot:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Piilokopiot"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Postittaja"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Päiväys"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Uutisryhmät"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s liite"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Allekirjoituksen muoto ei ole tuettu"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Virhe tarkistettaessa allekirjoitusta"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
@@ -13273,7 +13947,7 @@ msgstr "Lähetä _viesti..."
 msgid "_Add to Addressbook"
 msgstr "_Lisää osoitekirjaan"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
@@ -13320,11 +13994,23 @@ msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Viestit %s:ltä"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtuaaliset _kansiot"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Lisää"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "vKansion lähde"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "_Havaitse linkit automaattisesti"
@@ -13801,65 +14487,33 @@ msgstr "Portti, jossa käyttäjän spamd-palvelinta ajetaan"
 msgid "spamd port"
 msgstr "Spamd:n portti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Muokkaimen asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
-"näyttö"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Määrittele sähköpostitilisi tästä"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution sähköposti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutionin sähköpostitilien asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolutionin sähköpostikomponentti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-tuoja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolutionin sähköpostin muokkain"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutionin Netscape sähköpostin tuoja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution sähköpostin muokkaimen asetukset"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 tuoja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution sähköpostin asetukset"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-tuoja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Sähköpostitilit"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-tuoja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Sähköpostin asetukset"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Sähköposti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13917,34 +14571,6 @@ msgstr "Tuodaan '%s'"
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-tuoja"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutionin Netscape sähköpostin tuoja"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 tuoja"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-tuoja"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-tuoja"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14114,91 +14740,83 @@ msgstr "%s postilista"
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-component.c:469
+#: mail/mail-component.c:459
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d poistettu"
 msgstr[1] "%d poistettu"
 
-#: mail/mail-component.c:471
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d roskaposti"
 msgstr[1] "%d roskapostia"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:484
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d luonnos"
 msgstr[1] "%d luonnosta"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d sent"
-msgid_plural "%d send"
+msgid_plural "%d sent"
 msgstr[0] "%d lähetetty"
 msgstr[1] "%d lähetettyä"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d lähettämätön"
 msgstr[1] "%d lähettämätöntä"
 
-#: mail/mail-component.c:502
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d kaikkiaan"
 msgstr[1] "%d kaikkiaan"
 
-#: mail/mail-component.c:504
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
 msgid_plural ", %d unread"
 msgstr[0] "%d lukematon"
 msgstr[1] "%d lukematonta"
 
-#: mail/mail-component.c:671
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: mail/mail-component.c:672
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Lähetä viesti"
 
-#: mail/mail-component.c:673
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: mail/mail-component.c:679
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Uusi sähköpostikansio"
 
-#: mail/mail-component.c:680
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Sähköpostikansio"
 
-#: mail/mail-component.c:681
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Luo uusi sähköpostikansio"
 
-#: mail/mail-component.c:813
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Sähköpostin asetusten tai kansioiden päivitys epäonnistui."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Tarkistetaan palvelua"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Yhdistetään palvelimeen..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteetti"
@@ -14262,14 +14880,22 @@ msgstr ""
 "sähköpostitilille nimi alla olevaan kenttään. Tätä nimeäkäytetään ainoastaan "
 "ohjelman sisällä tilin näyttämiseen."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tarkistetaan palvelua"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Yhdistetään palvelimeen..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr " "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Esikatselu</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL ei ole tuettu tässä Evolutionin käännöksessä</b>"
@@ -14522,7 +15148,7 @@ msgstr "Älä lainaa alkuperäistä viestiä"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook yhteensopivuus)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
@@ -14862,6 +15488,122 @@ msgstr "väri "
 msgid "description"
 msgstr "kuvaus"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Lue tarkkaan allaoleva lisenssisopimus\n"
+"ohjelmalle %s\n"
+"ja ruksita laatikko, jos hyväksyt lisenssin\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vKansioiden lähteet</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digitaalinen allekirjoitus</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Salaus</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Hyväksytty"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Valmis"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Kirjainkoolla on merkitystä"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Hae viestistä"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Etsi:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Merkitse edelleenlähetettäväksi"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Kansioiden tilaukset"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Lisenssisopimus ohjelmalle %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ei mitään valittuna"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Palvelin: "
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Turvatiedot"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
+"Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Hyväksytyt lisenssit"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Erääntyy:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Merkki:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Tilaa"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Peru tilaus"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "vain määritellyt kansiot"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "kaikille aktiivisille etäkansioille"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "kaikille paikallisille ja aktiivisille etäkansioille"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "kaikille paikallisille kansioille"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14883,6 +15625,7 @@ msgstr "Kirjautumisesi palvelimelle  \"{0}\" käyttäjänä \"{0}\" epäonnistui
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14911,8 +15654,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Lähetä"
+msgstr "Lähetä"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14929,7 +15673,6 @@ msgstr ""
 "ymmärtämään, mistä viestissä on kyse."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
@@ -15011,7 +15754,6 @@ msgstr ""
 "\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Jos jatkat, et voi palauttaa näitä viestejä."
@@ -15040,6 +15782,7 @@ msgstr ""
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15085,21 +15828,6 @@ msgstr "Virhe suoritettessa toimenpidettä."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15116,8 +15844,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoon \"{0}\" ei voida tallentaa."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15154,7 +15880,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Järjestelmäkansiota \"{0}\" ei voida poistaa."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15188,13 +15913,11 @@ msgstr ""
 "sisältöineen pysyvästi."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" ei voida nimetä uudelleen nimelle \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kansio nimeltään \"{1}\" on jo olemassa. Valitse toinen nimi."
@@ -15205,25 +15928,21 @@ msgid "Because \"{2}\"."
 msgstr "Syy: \"{2\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota ei voida siirtää \"{0}\" kohtaan \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Lähdettä \"{2}\" ei voida avata."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Kohdetta \"{2}\" ei voida avata."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kansiota ei voida kopioida \"{0}\" kohtaan \"{1}\"."
@@ -15239,7 +15958,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Lähdettä \"{1}\" ei voida avata."
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Muutoksia tiliin ei voida tallentaa."
@@ -15261,8 +15979,11 @@ msgstr "Poista tili?"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tämän yhteystiedon?"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15270,8 +15991,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Jos jatkat, tilin tiedot poistetaan pysyvästi."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Älä poista"
+msgstr "_Palauta"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15300,6 +16022,7 @@ msgstr "Hylkää muutokset?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Haluatko tallentaa muutokset?"
 
@@ -15370,13 +16093,44 @@ msgstr ""
 "   \"{1}\"\n"
 "ja ne on päivitetty."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Kansio puuttuu."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Kansio täytyy valita."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "vKansio täytyy nimetä"
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Lähteitä ei ole valittuna."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"Ainakin yksi lähdekansio täytyy olla valittuna.\n"
+"Valitse joko kansiot yksitellen, valitsemalla kaikki paikalliset\n"
+"tai etäkansiot, tai valitsemalla kaikki kansiot molemmat."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Virhe siirrettäess vanhaa sähköpostikansiota \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15387,15 +16141,15 @@ msgstr ""
 "\n"
 "Voit ohittaa tämän kansion, kirjoittaa yli, lisätä kansioon tai poistua.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Älä välitä"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Ylikirjoita"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Lisää"
 
@@ -15580,30 +16334,6 @@ msgstr "Yhteyttä %s katkaistaan"
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Kirjainkoolla on merkitystä"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Hae viestistä"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Etsi:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitaalinen allekirjoitus</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Salaus</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Turvatiedot"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Peruutetaan..."
@@ -15711,15 +16441,15 @@ msgstr "Päivitetään vKansioita %s:%s"
 msgid "Updating vFolders for '%s'"
 msgstr "Päivitetään vKansioita %s"
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Uusi vKansio"
 
@@ -15839,10 +16569,6 @@ msgstr "Välitä"
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lue"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vastaa"
@@ -15855,49 +16581,49 @@ msgstr "Vastaa kaikille"
 msgid "Review"
 msgstr "Arvio"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Merkitse edelleenlähetettäväksi"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Runko sisältää"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Valmis"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Runko ei sisällä"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Viestit jotka olet valinnut lähetettäviksi edelleen on listattu alla.\n"
-"Valitse tehtävä uudelleenlähetys \"Merkki\" valikosta."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Runko tai otsikko sisältää"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Erääntyy:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Viesti sisältää"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Merkki:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Vastaanottajakenttä sisältää"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Kansioiden tilaukset"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Lähettäjäkenttä sisältää"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ei mitään valittuna"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Otsikko sisältää"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Palvelin: "
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Otsikko ei sisällä"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Tilaa"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-kuori"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Peru tilaus"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution testi"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolutionin testikomponentti"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15962,30 +16688,19 @@ msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 msgid "mail"
 msgstr "sähköposti"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Tuntematon järjestelmävirhe."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Virheelisiä argumentteja"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "OAF:ia ei voidaan rekisteröidä"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>Todennus</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Asetustietokantaa ei löytynyt"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Suorita toiminnot"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Yleinen virhe"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16170,27 +16885,6 @@ msgstr "Kansion nimi ei voi sisältää merkkiä \"#\""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' ovat varattuja kansion nimiä"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution on nyt yhteydellisessä tilassa. Paina tästä siirtyäksesi "
-"yhteydettömään tilaan."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution siirtyy yhteydettömään tilaan."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution on yhteydettömässä tilassa. Paina tästä siirtyäksesi "
-"yhteydelliseen tilaan."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Vaihda %s:aan"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Gnomen Pilot-työkalut eivät ole asennetuina tähän järjestelmään."
@@ -16224,10 +16918,92 @@ msgstr "_Yhteydetön tila"
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution on nyt yhteydellisessä tilassa. Paina tästä siirtyäksesi "
+"yhteydettömään tilaan."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution siirtyy yhteydettömään tilaan."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution on yhteydettömässä tilassa. Paina tästä siirtyäksesi "
+"yhteydelliseen tilaan."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Vaihda %s:aan"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Tuntematon järjestelmävirhe."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Virheelisiä argumentteja"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF:ia ei voidaan rekisteröidä"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Asetustietokantaa ei löytynyt"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Yleinen virhe"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Uusi"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolutionin tuoden asetukset"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "Tuo tiedosto"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "Aikavyöhyke: "
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uusi testi"
@@ -16240,18 +17016,6 @@ msgstr "_Testi"
 msgid "Create a new test item"
 msgstr "Luo uusi testijuttu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-kuori"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution testi"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolutionin testikomponentti"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Tuo tiedosto Evolutioniin näpäyttämällä nappia \"Tuo\"."
@@ -16311,7 +17075,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution voi tuoda tietoa seuraavista tiedostoista:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16346,7 +17110,7 @@ msgstr ""
 "Toivomme että nautit suuren työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitykseen!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16354,39 +17118,39 @@ msgstr ""
 "Kiitos\n"
 "Evolution-tiimi\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Älä kerro enää uudelleen"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uudelleentuo tiedot väkisin Evolution 1.4:stä"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16395,6 +17159,94 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Runko sisältää"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "wombat-palvelinta ei voitu käynnistää"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolutionin sähköpostitilien apulainen"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16639,6 +17491,11 @@ msgstr "Varmenteesi"
 msgid "_Edit CA Trust"
 msgstr "_Muokkaa CA:n luottamusta"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Varmenne on jo olemassa"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -16838,11 +17695,6 @@ msgstr "Kohteen yksilöllinen tunniste"
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Varmenne on jo olemassa"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS 12 tiedoston salasana"
@@ -16982,8 +17834,8 @@ msgstr "Katsele nykyistä yhteystietoa"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "T_oiminnot"
@@ -17458,16 +18310,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:5
-msgid "Close this window"
-msgstr "Sulje tämä ikkuna"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Sulje"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
@@ -17868,6 +18710,16 @@ msgstr "T_yökalut"
 msgid "_Undelete"
 msgstr "_Palauta"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Sulje tämä ikkuna"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Sulje"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Liitä"
@@ -17950,10 +18802,6 @@ msgstr "Tallenna tiedosto uudella nimellä"
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Lähetä"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18658,6 +19506,176 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmiina)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "HTTP-palvelimen tunnistautumistiedot"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Julkaistaviksi valitut kalenterit"
+
+#~ msgid "Login name:"
+#~ msgstr "Käyttäjätunnus:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Käyttäjä julkaisee"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Valittu kalenteri ei ole kirjoitettava, tapahtumia ei voida luoda. "
+#~ "Valitse kirjoitettava kalenteri."
+
+#~ msgid "C_alendar"
+#~ msgstr "_Kalenteri"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Äänihälytyksen asetukset"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Viestin hälytyksen ominaisuudet"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Sähköpostin hälytysvaihtoehdot"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Ohjelmallisen hälytyksen asetukset"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Tuntemattoman hälytyksen asetukset"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Hälytyksen toisto"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Näytettävä viesti:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Näillä argumenteilla:"
+
+#~ msgid "Basics"
+#~ msgstr "Perusasiat"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Päiväys ja Aika:"
+
+#~ msgid "Reminders"
+#~ msgstr "Muistutukset"
+
+#~ msgid "_Options..."
+#~ msgstr "_Vaihtoehdot...."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Osoitekirja..."
+
+#~ msgid "Reminder"
+#~ msgstr "Muistutus"
+
+#~ msgid "B_usy"
+#~ msgstr "_Varattu"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Luottamuksellinen"
+
+#~ msgid "Date & Time"
+#~ msgstr "Päiväys ja Aika"
+
+#~ msgid "F_ree"
+#~ msgstr "_Vapaa"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Y_ksityinen"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Ju_lkinen"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Lisää _osallistuja"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Lisää osanottajia osoitekirjasta."
+
+#~ msgid "Preview"
+#~ msgstr "Esikatselu"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Toistuvuuden sääntö"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Oma toistuvuus"
+
+#~ msgid "_Modify"
+#~ msgstr "_Muokkaa"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Ei toistuvuutta"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Yksinkertainen toistuvuus"
+
+#~ msgid "% _Complete"
+#~ msgstr "valmis (%)"
+
+#~ msgid "Progress"
+#~ msgstr "Edistyminen"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Luottamuksellinen"
+
+#~ msgid "Folder:"
+#~ msgstr "Kansio:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Virhe CORBA-järjestelmässä\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Kohdetta ei löytynyt\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Sinulla ei ole kalenterin päivitykseen vaadittavia oikeuksia\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Osallistujan tilan päivitys epäonnistui!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Lisää osanottajia osoitekirjasta"
+
+#~ msgid "_Options"
+#~ msgstr "_Asetukset"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Kokouksen alkamisaika:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Kokouksen päättymisaika:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Valittu tehtävälista ei ole kirjoitettava, tapahtumia ei voida luoda.  "
+#~ "Valitse kirjoitettavissa oleva kalenteri."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Varmennetta '%s':lle ei voida löytää"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "CMS-viestiä ei voida luoda"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kooderin kontekstia ei voida luoda"
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Pisteytyksen säännöt"
+
+#~ msgid "Properties"
+#~ msgstr "Ominaisuudet"
+
+#~ msgid "Folder Name"
+#~ msgstr "Kansion nimi"
+
 #~ msgid "Groupwise"
 #~ msgstr "Groupwise"
 
diff --git a/po/fr.po b/po/fr.po
index ee89bdbbcf..65bdbd21af 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.8\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-05-26 21:42+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -31,14 +31,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "carnet d'adresses d'Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "en-tête du contact : "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "mini-carte d'Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "dossier actuel du carnet d'adresses "
@@ -59,34 +51,250 @@ msgstr " cartes"
 msgid " card"
 msgstr " carte"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "en-tête du contact : "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "mini-carte d'Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Impossible d'envoyer l'élément !\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "L'authentification sur le serveur LDAP a échoué"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Le serveur a renvoyé des bases de recherche non supportées."
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+"Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Impossible d'obtenir l'article %s du serveur NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Le serveur a renvoyé des informations non valides relatives au schéma."
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Impossible de charger le carnet d'adresses"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Éditeur de catégorie non disponible."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Enregistrer dans le carnet d'adresses"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Erreur de chargement du carnet d'adresses par défaut."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Impossible de traiter le dossier spool."
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Abandonner"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "et un autre contact."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Impossible d'analyser le contenu du message"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Erreur lors de l'ajout du contact"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visualiseur d'adresses du carnet d'adresses d'Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Impossible de charger le carnet d'adresses"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Impossible de lire l'application Adresses du Pilot"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accès anonyme au serveur LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "L'authentification a échoué.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Complétion automatique"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "C_ontacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificats"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configurez la complétion automatique ici"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+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:10
+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:11
+msgid "Evolution Addressbook component"
+msgstr "Composant Carnet d'adresses d'Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Composant de gestion des certifications S/Mime d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+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:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Gérer votre certificats S/Mime ici"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -117,7 +325,8 @@ msgid "New Contacts Group"
 msgstr "Nouveau groupe de contacts"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Groupe de contacts"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -140,15 +349,15 @@ msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -157,19 +366,19 @@ msgid "Personal"
 msgstr "Personnel"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Serveurs LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Paramètres de complétion automatique"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,7 +390,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -193,7 +402,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -205,7 +414,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -217,38 +426,47 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Le carnet d'adresses « %s » va être supprimé. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Nouveau carnet d'adresses"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Supprimer"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accès anonyme au serveur LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "L'authentification a échoué.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -271,59 +489,6 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "L'URI du dossier utilisé en dernier dans le dialogue de sélection de noms"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Complétion automatique"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "C_ontacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificats"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configurez la complétion automatique ici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-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:10
-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:11
-msgid "Evolution Addressbook component"
-msgstr "Composant Carnet d'adresses d'Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Composant de gestion des certifications S/Mime d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-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:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Gérer votre certificats S/Mime ici"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -331,7 +496,7 @@ msgstr "Gérer votre certificats S/Mime ici"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -340,8 +505,7 @@ msgstr "Gérer votre certificats S/Mime ici"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -367,6 +531,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Authentification SMTP"
@@ -415,13 +580,11 @@ msgid "Anonymously"
 msgstr "Anonymement"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basique"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Détails"
 
@@ -693,33 +856,26 @@ msgid "cards"
 msgstr "cartes"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Sélectionnez les contacts dans le carnet d'adresses"
+#: 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:208
+msgid "Remove All"
+msgstr "Tout supprimer"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Supprimer"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Tout supprimer"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Afficher la liste des contacts"
@@ -734,7 +890,7 @@ msgid "Send HTML Mail?"
 msgstr "Envoyer le courrier en HTML ?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Ajouter aux contacts"
 
@@ -742,15 +898,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Source"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -772,6 +935,11 @@ msgstr "C_atégorie :"
 msgid "_Find"
 msgstr "_Rechercher"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Rechercher"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Message électronique</b>"
@@ -809,9 +977,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Travail</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -832,7 +999,6 @@ msgid "Birthday:"
 msgstr "Date de naissance :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendrier :"
 
@@ -845,15 +1011,15 @@ msgid "Company:"
 msgstr "Société :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
@@ -952,8 +1118,8 @@ msgstr "Page Web :"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -972,43 +1138,27 @@ msgid "_File under:"
 msgstr "_Classer sous :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Où :"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Êtes-vous sûr de vouloir \n"
-"supprimer ces contacts ?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Êtes-vous sûr de vouloir \n"
-"supprimer ce contact ?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Modifiable"
 
@@ -1980,132 +2130,124 @@ msgstr "Zambie"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Messagerie instantanée AOL"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Messagerie Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Emplacement"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Domicile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Autre"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Livre source"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Modifié"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories :"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Veuillez effectuer une sélection parmi les options suivantes."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "La date de la récurrence est non valide"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Abandonner"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Messagerie instantanée AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Messagerie Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Emplacement"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
@@ -2124,6 +2266,22 @@ msgstr "_Nom complet :"
 msgid "E-_mail:"
 msgstr "_Courrier électronique :"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Êtes-vous sûr de vouloir \n"
+"supprimer ces contacts ?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Êtes-vous sûr de vouloir \n"
+"supprimer ce contact ?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2 :"
@@ -2246,50 +2404,71 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Sélectionnez les contacts dans le carnet d'adresses"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membres"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Supprimer les éléments sélectionnés de la liste des pièces jointes"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Sélectionné"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Masquer les adresses lors de l'envoi d'un mail à _cette liste"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Nom de la liste :"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
 "dessous :"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Éditeur de liste de contacts"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Carnet"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Est une nouvelle liste"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Participants attendus"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Enregistrer la liste comme VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contact Modifié :"
@@ -2328,426 +2507,11 @@ msgstr ""
 "dans ce dossier. Voulez vous quand même l'ajouter ?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(carte)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "carte"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Membres de la liste"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Courrier électronique"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Vidéo conférence"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Téléphone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "travail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "Web"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Téléphone portable"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "personnel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Note"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Fonction"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Courrier électronique"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Site internet"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Succès"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Dépôt Hors ligne"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Le carnet d'adresses n'existe pas"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nouvelle liste de contacts"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permission refusée"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contact non trouvé"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "L'ID du contact existe déjà."
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocole non supporté"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Annulée"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Impossible d'ouvrir la source"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Échec de l'authentification"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Authentification requise"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS non disponible"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Aucun message correspondant"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Autre erreur"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier que le chemin "
-"existe et que vous avez la permission d'accès."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
-"ou le serveur LDAP n'est pas accessible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Le support LDAP n'a pas été intégré à cette version d'Evolution. Pour "
-"utiliser LDAP dans Evolution, vous devez compiler le programme à partir des "
-"sources CVS après avoir récupéré OpenLDAP à l'adresse indiquée ci-dessous."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
-"ou le serveur LDAP n'est pas accessible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Le nombre de cartes correspondant à cette requête dépasse la\n"
-"capacité de renvoi configurée pour le serveur ou la capacité\n"
-"d'affichage configurée pour Evolution. Veuillez affiner votre\n"
-"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/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Le temps nécessaire à l'exécution de la requête à dépassé le temps\n"
-"limite du serveur ou la limite que vous avez configurée pour ce carnet\n"
-"d'adresses. Veuillez affiner votre recherche ou augmenter la limite de\n"
-"temps dans les préférences du serveur d'annuaires de ce carnet \n"
-"d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-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/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Cette requête ne s'est pas terminée correctement."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Erreur lors de l'ajout de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Erreur lors de l'ajout du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Erreur lors de la modification de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Erreur lors de la modification du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Erreur lors de la suppression de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Erreur lors de la suppression du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres. \n"
-"Voulez-vous vraiment afficher tous ces contacts ?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s existe déjà.\n"
-"Voulez vous l'écraser ?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Écraser"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Déplacer le contact vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copier le contact vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Déplacer les contacts vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copier les contacts vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Sélectionnez la cible du carnet d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "VCards multiples"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard pour %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(aucun(e))"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Courrier électronique principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Courrier électronique 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Courrier électronique 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Sélectionner une action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Créer un nouveau contact « %s »"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Ajouter une adresse au contact existant « %s »"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Interrogation du carnet d'adresses..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Éditer les informations du contact"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Fusionner l'adresse électronique"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "et un autre contact."
-msgstr[1] "et %d autres contacts."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Afficher la VCard complètement"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Enregistrer la VCard en compact"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Enregistrer dans le carnet d'adresses"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Aucun contact"
@@ -2762,9 +2526,9 @@ msgstr[1] "%d contacts"
 #
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Requête"
 
@@ -2780,130 +2544,130 @@ msgstr "Modèle"
 msgid "Error modifying card"
 msgstr "Erreur lors de la modification de la carte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Le nom commence par"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "L'adresse commence par"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Tout champ contient"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avancée..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Enregistrer comme VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Nouveau contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nouvelle liste de contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Aller au Dossier..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Rechercher des contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Sources du carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Paramétrage du Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Faire suivre au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Envoyer un message au contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimer l'enveloppe"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copier dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Déplacer dans le carnet d'adresses..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Couper"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Vue courante"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Toute catégorie"
@@ -2937,6 +2701,8 @@ msgid "Car Phone"
 msgstr "Téléphone voiture"
 
 #: 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:3
 msgid "Categories"
 msgstr "Catégories"
 
@@ -2944,6 +2710,21 @@ msgstr "Catégories"
 msgid "Company Phone"
 msgstr "Téléphone société"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Courrier électronique"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Courrier électronique 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Courrier électronique 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nom de famille"
@@ -2980,14 +2761,29 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Directeur"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Téléphone portable"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Surnom"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Note"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Bureau"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisation"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax Autre"
@@ -3039,29 +2835,21 @@ msgstr "Unité"
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Largeur"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Hauteur"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "A le focus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Sélectionné"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "A le curseur"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Champ"
@@ -3078,7 +2866,11 @@ msgstr "Modèle de texte"
 msgid "Max field name length"
 msgstr "Longueur max. du nom du champ"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Largeur des colonnes"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3092,7 +2884,7 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour créer un nouveau contact."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3102,13 +2894,396 @@ msgstr ""
 "\n"
 "Il n'y a aucun élément à afficher dans cette vue."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptateur"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Largeur des colonnes"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Sélectionné"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "A le curseur"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(carte)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "carte"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Membres de la liste"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Courrier électronique"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Vidéo conférence"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Téléphone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "travail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "Web"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "personnel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Fonction"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Site internet"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Succès"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Dépôt Hors ligne"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Le carnet d'adresses n'existe pas"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nouvelle liste de contacts"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permission refusée"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contact non trouvé"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "L'ID du contact existe déjà."
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocole non supporté"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Annulée"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Impossible d'ouvrir la source"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Échec de l'authentification"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Authentification requise"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS non disponible"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Aucun message correspondant"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Autre erreur"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier que le chemin "
+"existe et que vous avez la permission d'accès."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
+"ou le serveur LDAP n'est pas accessible."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Le support LDAP n'a pas été intégré à cette version d'Evolution. Pour "
+"utiliser LDAP dans Evolution, vous devez compiler le programme à partir des "
+"sources CVS après avoir récupéré OpenLDAP à l'adresse indiquée ci-dessous."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
+"ou le serveur LDAP n'est pas accessible."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Le nombre de cartes correspondant à cette requête dépasse la\n"
+"capacité de renvoi configurée pour le serveur ou la capacité\n"
+"d'affichage configurée pour Evolution. Veuillez affiner votre\n"
+"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/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Le temps nécessaire à l'exécution de la requête à dépassé le temps\n"
+"limite du serveur ou la limite que vous avez configurée pour ce carnet\n"
+"d'adresses. Veuillez affiner votre recherche ou augmenter la limite de\n"
+"temps dans les préférences du serveur d'annuaires de ce carnet \n"
+"d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Cette requête ne s'est pas terminée correctement."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Erreur lors de l'ajout de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Erreur lors de l'ajout du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Erreur lors de la modification de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Erreur lors de la modification du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Erreur lors de la suppression de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Erreur lors de la suppression du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres. \n"
+"Voulez-vous vraiment afficher tous ces contacts ?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s existe déjà.\n"
+"Voulez vous l'écraser ?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Écraser"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Déplacer le contact vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copier le contact vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Déplacer les contacts vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copier les contacts vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Sélectionnez la cible du carnet d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "VCards multiples"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard pour %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(aucun(e))"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Courrier électronique principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Sélectionner une action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Créer un nouveau contact « %s »"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Ajouter une adresse au contact existant « %s »"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Interrogation du carnet d'adresses..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Éditer les informations du contact"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Fusionner l'adresse électronique"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "et un autre contact."
+msgstr[1] "et %d autres contacts."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Afficher la VCard complètement"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Enregistrer la VCard en compact"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Enregistrer dans le carnet d'adresses"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3152,6 +3327,11 @@ msgstr "Assistant d'importation VCard d'Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimer l'enveloppe"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
@@ -3161,11 +3341,6 @@ msgstr "Imprimer les contacts"
 msgid "Print contact"
 msgstr "Imprimer les contacts"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimer l'enveloppe"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3352,6 +3527,22 @@ msgstr "Test d'impression de contact"
 msgid "This should test the contact print code"
 msgstr "Ceci devrait tester le code d'impression des contacts"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Impossible de charger le carnet d'adresses"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Impossible d'ouvrir le carnet d'adresses."
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Spécifier un fichier de sortie au lieu de la sortie standard"
@@ -3410,22 +3601,6 @@ msgstr "En mode normal l'option de taille ne devrait pas être nécessaire."
 msgid "Impossible internal error."
 msgstr "Erreur interne impossible."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Impossible de charger le carnet d'adresses"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Impossible d'ouvrir le carnet d'adresses."
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erreur de chargement du carnet d'adresses par défaut."
@@ -3442,39 +3617,365 @@ msgstr "Aucun nom de fichier spécifié"
 msgid "Unnamed List"
 msgstr "Liste de contacts sans nom"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ne pas supprimer"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Envoyer à :"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Êtes-vous sûr de vouloir annuler et supprimer cette réunion ?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Êtes-vous sûr de vouloir supprimer %d tâche ?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Êtes-vous sûr de vouloir annuler et supprimer l'entrée de journal ?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Êtes-vous sûr de vouloir supprimer %d entrée de journal ?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Êtes-vous sûr de vouloir supprimer le rendez-vous « %s » ?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Êtes-vous sûr de vouloir supprimer %d rendez-vous ?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Êtes-vous sûr de vouloir supprimer la tâche « %s » ?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Êtes-vous sûr de vouloir supprimer l'entrée de journal « %s » ?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Êtes-vous sûr de vouloir supprimer le rendez-vous « %s » ?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Êtes-vous sûr de vouloir supprimer la tâche « %s » ?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Êtes-vous sûr de vouloir supprimer l'entrée de journal « %s » ?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Rendez-vous"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Vous avez fait des modifications. Oublier ces modifications et mettre à "
+"jour l'éditeur ?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Aban_donner les modifications"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Enregistrer le message..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Envoyer"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Assistant d'importation vCalendar d'Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Partager les événements sur plusieurs jours :"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Impossible de démarrer le serveur wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Impossible de démarrer wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossible de lire les données du block Calendrier du Pilot."
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Priorité par défaut :"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données du bloc « À faire » du Pilot."
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendrier et tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Calendriers"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendrier et tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Composant de configuration du calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+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:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Éditeur de calendrier/tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Composant Calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Composant Tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Calendriers"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Débute :"
@@ -3575,10 +4076,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
@@ -3727,9 +4224,29 @@ msgstr "Afficher l'heure en format 24h au lieu d'utiliser am/pm"
 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:50
+msgid "Summary contains"
+msgstr "Le résumé contient"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "La description contient"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Le commentaire contient"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "L'emplacement contient"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Différent"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3751,8 +4268,8 @@ msgid "Purge events older than"
 msgstr "Purger les événements plus vieux que"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "jours"
 
@@ -3763,7 +4280,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3817,62 +4334,52 @@ msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
 "réunions"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Calendriers"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Créer un nouveau rendez-vous"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Créer une nouvelle demande de réunion"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous sur une journée entière"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Créer un nouveau rendez-vous journée entière"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "C_alendrier"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendrier"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Créer un nouveau calendrier"
 
@@ -3902,26 +4409,6 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Le résumé contient"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "La description contient"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Le commentaire contient"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "L'emplacement contient"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Différent"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erreur lors de l'ouverture du calendrier"
@@ -3939,218 +4426,133 @@ msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
 msgid "open_client(): %s"
 msgstr "open_client() : %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Options d'alarme sonore"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Options message d'alarme"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Options d'alarme par courrier électronique"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Options d'alarme programme"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Options d'alarme inconnues"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Répétition de l'alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Affichage du message :"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Message à envoyer"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Jouer le son :"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Répéter l'alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Lancer le programme :"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Envoyer à :"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Avec ces arguments :"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Autre</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "toutes les"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Options de la liste de tâches</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "heures"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Alors</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Action/Activation"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Ajouter un calendrier"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_jouter"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Composer un message"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Basiques"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Date/Heure :"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Messages"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Jouer un son"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Rappels"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Lancer un programme"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Envoyer à :"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Envoyer un courrier électronique"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Résumé :"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Compte :"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Lancer le programme"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Répéter l'alarme"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Envoyer"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "après le"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "avant le"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "jour(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "Fin du rendez-vous"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "toutes les"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "heure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "heures"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minute(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-"Vous devez indiquer un emplacement auprès duquel récupérer le calendrier."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "L'emplacement source « %s » n'est pas bien formé."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "L'emplacement source « %s » n'est pas une source webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Une source avec le nom « %s » existe déjà dans le groupe sélectionné"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Le groupe « %s » est distant. Vous devez spécifier un emplacement à partir "
-"duquel recevoir le calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Ajouter un calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Ajouter un groupe de tâches"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_ouleur :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "A_jouter un calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "A_jouter un groupe"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Rafraîchir :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type :"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Action/Activation"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL :"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_jouter"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semaines"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarme du %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4266,7 +4668,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publication _libre-occupé"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vendredi"
@@ -4280,7 +4682,7 @@ msgid "Minutes"
 msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Lundi"
@@ -4290,7 +4692,7 @@ msgid "S_un"
 msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Samedi"
@@ -4304,7 +4706,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Dimanche"
@@ -4318,7 +4720,7 @@ msgid "T_hu"
 msgstr "_Jeu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Jeudi"
@@ -4332,7 +4734,7 @@ msgid "Time format:"
 msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Mardi"
@@ -4342,7 +4744,7 @@ msgid "W_eek starts:"
 msgstr "La s_emaine débute :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Mercredi"
@@ -4375,7 +4777,8 @@ msgstr "_Compresser les week-ends dans la vue mensuelle"
 msgid "_Day begins:"
 msgstr "Le _jour commence :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4427,6 +4830,75 @@ msgstr "M_er"
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+"Vous devez indiquer un emplacement auprès duquel récupérer le calendrier."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "L'emplacement source « %s » n'est pas bien formé."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "L'emplacement source « %s » n'est pas une source webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Une source avec le nom « %s » existe déjà dans le groupe sélectionné"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Le groupe « %s » est distant. Vous devez spécifier un emplacement à partir "
+"duquel recevoir le calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Ajouter un calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Ajouter un groupe de tâches"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_ouleur :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Choisissez une couleur"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "A_jouter un calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "A_jouter un groupe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Rafraîchir :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "semaines"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Cet événement a été supprimé."
@@ -4475,81 +4947,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification. Mettre à jour l'éditeur ?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Erreur de validation : %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " À "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Terminé "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Terminé "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Date d'échéance "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Date d'échéance "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet."
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Enregistrer sous..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version courante !"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Erreur de validation : %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " À "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Terminé "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Terminé "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Date d'échéance "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Date d'échéance "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Impossible d'ouvrir la source"
@@ -4617,8 +5083,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Impossible de supprimer l'élément à cause d'une erreur"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Carnet d'adresses..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contacts"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4628,161 +5095,222 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Rappel"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientation"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Réunion"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "La date d'échéance est avant la date de début !"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "La date de fin est erronée."
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "L'heure de début est erronée."
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "L'heure de fin est erronée."
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "avant chaque rendez-vous"
+msgstr[1] "avant chaque rendez-vous"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "Fin du rendez-vous"
+msgstr[1] "Fin du rendez-vous"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "avant chaque rendez-vous"
+msgstr[1] "avant chaque rendez-vous"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Toute la journée"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "avant chaque rendez-vous"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Occupé"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "avant chaque rendez-vous"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tégories..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "avant chaque rendez-vous"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Options de la liste de tâches</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classification"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Maison</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidentiel"
+msgid "A_ll day event"
+msgstr "_Toute la journée"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Date & Heure"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Enregistrer la vue personnalisée..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Libre"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tégories..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_ieu :"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendrier :"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vé"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classification"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidentiel"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Afficher l'heure comme"
+msgid "L_ocation:"
+msgstr "L_ieu :"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privé"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Public"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Afficher l'heure comme"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Résu_mé :"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Effacer"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Description :"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Heure de _fin :"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Heure de _début :"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 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:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Un organisateur est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Déléguer à..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Supprimer"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Enlever"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4821,35 +5349,45 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Ajouter un _participant"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Autre</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Ajouter l'expéditeur au _carnet d'adresses"
+msgid "<b>Organizer</b>"
+msgstr "<b>Autre</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Changer l'organisateur"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisateur :"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contacts"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Changer l'organisateur"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organisateur :"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4925,145 +5463,140 @@ msgstr "Cette instances et les instances futures"
 msgid "All Instances"
 msgstr "Toutes les occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ce rendez-vous contient des récurrences qu'Evolution ne peut éditer."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "La date de la récurrence est non valide"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "premier"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "seconde"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "troisième"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "quatrième"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "dernier"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Autre date"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "jour"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "le"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "occurrences"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Date/Heure"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Tou(te)s les"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Exceptions"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Aperçu"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Règle de récurrence"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Récurrence _personnalisée"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modifier"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Aucune récurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Récurrence"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Enlever"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Tou(te)s les"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Récurrence _simple"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "pour"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "pour toujours"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mois"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "jusqu'à"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semaine(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "année(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Sélectionnez la destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Liste de tâches"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "La date d'achèvement est erronée."
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>_Afficher les en-têtes des mails</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Fait"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Messages envoyés et brouillons"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Achevée"
 
@@ -5075,8 +5608,8 @@ msgstr "Haute"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En cours"
@@ -5088,22 +5621,22 @@ msgid "Low"
 msgstr "Basse"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Non démarrée"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "En cours"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Pourcentage effectué : %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5127,36 +5660,42 @@ msgstr "_État :"
 msgid "_Web Page:"
 msgstr "Page _Web :"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tâche"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidentiel"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Notification du courrier entrant"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Messages envoyés et brouillons"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description :"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Dossier :"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5167,52 +5706,58 @@ msgstr "Date de _début :"
 msgid "_Due date:"
 msgstr "Date d'_échéance :"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Paramètres d'identification pour le serveur HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Groupe :"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendriers sélectionnés pour la publication"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Options du calendrier</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Journalière"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Fréquence de publication"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Éditeur libre-occupé"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Emplacement de publication des informations de type libre/occupé"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Emplacement de publication des informations de type libre/occupé"
+msgid "Free/Busy Editor"
+msgstr "Éditeur libre-occupé"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Identifiant :"
+#, fuzzy
+msgid "_Daily"
+msgstr "Journalière"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Mot de passe :"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Courrier :"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Fréquence de publication"
+#, fuzzy
+msgid "_Password:"
+msgstr "Mot de passe :"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Mémoriser le mot de passe"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL :"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nom d'utilisateur :"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publication utilisateur"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Hebdomadaire"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5294,7 +5839,7 @@ msgstr "%s à %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Cliquez pour ouvrir %s"
@@ -5303,6 +5848,11 @@ msgstr "Cliquez pour ouvrir %s"
 msgid "Untitled"
 msgstr "Sans titre"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Résumé :"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5314,7 +5864,7 @@ msgstr "Date d'échéance :"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "État :"
 
@@ -5326,20 +5876,94 @@ msgstr "Priorité :"
 msgid "Web Page:"
 msgstr "Page Web :"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Heure de _fin :"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privé"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Date de début"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidentiel"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Résumé"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Occupé"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"La position géographique doit être entrée dans le format :\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Oui"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Non"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Récurrant"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Attribué"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5385,95 +6009,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Occupé"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Ouvrir le _site internet"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimer..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copier"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "C_oller"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Assigner une tâche"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Faire suivre comme iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Marquer comme terminé"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marquer les tâches sélectionnées comme terminées"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Supprimer"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Supprimer les tâches sélectionnées"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Enregistrer sous..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Cliquez ici pour ajouter une tâche"
 
@@ -5482,182 +6112,112 @@ msgstr "Cliquez ici pour ajouter une tâche"
 msgid "% Complete"
 msgstr "% Fait"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Terminé"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Date d'achèvement"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Date d'échéance"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Priorité"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Date de début"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Résumé"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Déplacement des messages"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Copie des messages"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Sélectionner par _fil de discussion"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Sélectionner..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "A_ller à la date..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Paramétres..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Heure de _fin :"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Date de début"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Récurrant"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Attribué"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Oui"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Non"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La position géographique doit être entrée dans le format :\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5681,36 +6241,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions par minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions par minute"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5777,37 +6337,35 @@ msgid ", ending on "
 msgstr ", finissant le"
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Débute :</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Finit :</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "État"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Terminé :</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Échéance :</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Date d'échéance "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5816,312 +6374,290 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Aucun</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Lieu :"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Valider"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Mettre à jour le statut de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 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:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 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:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet n'est pas valide et ne peut être mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-msgid "Object could not be found\n"
-msgstr "Impossible de trouver l'objet.\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Statut du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Impossible de mettre à jour le statut du participant !\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
@@ -6150,6 +6686,10 @@ msgstr "Chargement du calendrier"
 msgid "Loading calendar..."
 msgstr "Chargement du calendrier"
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisateur :"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Message du serveur :"
@@ -6166,11 +6706,6 @@ msgstr "date de début"
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Participants attendus"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participants optionnels"
@@ -6238,6 +6773,28 @@ msgstr "Délégué"
 msgid "In Process"
 msgstr "En cours"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Absent du bureau"
@@ -6246,98 +6803,64 @@ msgstr "Absent du bureau"
 msgid "No Information"
 msgstr "Aucune information"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Ajouter l'expéditeur au _carnet d'adresses"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Options"
+msgid "O_ptions"
+msgstr "Options"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Afficher _Zoomé arrière"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Choix automatique"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Heure de _début de la réunion :"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Heure de _fin de la réunion :"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6346,117 +6869,51 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Chargement des tâches"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Erreur d'ouverture de %s :\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Chargement des tâches"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tâches"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Mise à jour des objets"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Purger"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Calendrier et tâches"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendrier et tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Composant de configuration du calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-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:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Éditeur de calendrier/tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Composant Calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Composant Tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Calendriers"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tâches"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Avril"
@@ -6804,10 +7261,6 @@ msgstr "Mois sélectionné (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Année sélectionnée (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tâche"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6838,7 +7291,7 @@ msgid "Contacts: "
 msgstr "Contacts : "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Aperçu avant impression"
 
@@ -6868,7 +7321,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tâche"
 msgstr[1] "%d tâches"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6890,33 +7343,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Il n'y a pas de calendrier disponible pour créer des tâches"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Créer une nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Nouveau groupe de tâches"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Groupe de tâches"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Créer un nouveau groupe de tâches"
 
@@ -8597,69 +9045,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "La création du tube pour « %s » a échoué : %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "La création d'un processus fils « %s » a échoué : %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Flux de messages non valide en provenance de %s : %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Synchronisation des dossiers"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erreur d'analyse du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erreur d'exécution du filtre : %s : %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Impossible d'ouvrir le dossier spool."
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Impossible de traiter le dossier spool."
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Récupération du message %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Impossible d'ouvrir le message."
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Anomalie au message %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Synchronisation du dossier"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Récupération du message %d sur %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Anomalie au message %d sur %d"
@@ -8681,42 +9129,6 @@ msgstr "Arguments non valides (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Opération non supportée : ajout du message : pour %s"
-
-#: camel/camel-folder.c:1262
-#, 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:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "Déplacement des messages"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copie des messages"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Avertissement"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrage des nouveaux messages"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8762,7 +9174,43 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Opération non supportée : ajout du message : pour %s"
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Déplacement des messages"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copie des messages"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Avertissement"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrage des nouveaux messages"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8773,15 +9221,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "L'analyse de l'indication ID d'utilisateur du GPG a échoué."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "L'analyse de la requête de mot de passe du GPG a échoué."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8790,29 +9238,29 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour\n"
 "débloquer la clé de l'utilisateur : « %s »"
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Annulé."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Le déblocage de la clé secrète a échoué : 3 mauvais mots de passe saisis."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue de GnuPG : %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Le chiffrement a échoué : aucun destinataire valide spécifié."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8823,87 +9271,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s a échoué : %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossible de générer les données signées : %s."
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "L'exécution de GPG a échoué : %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "L'exécution de GPG a échoué."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Impossible de vérifier la signature de ce message : format de message "
 "incorrect"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossible de générer des données chiffrées : %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenu chiffré"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Impossible d'analyser le contenu du message"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Impossible de créer le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez de "
-"nouveau plus tard."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "L'obtention du verrou avec fcntl(2) a échoué : %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "L'obtention du verrou avec flock(2) a échoué : %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8926,6 +9352,28 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Impossble de verrouiller « %s »"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Impossible de créer le fichier de verrouillage pour %s : %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Échéance du délai pour obtenir le fichier de verrouillage sur %s. Essayez de "
+"nouveau plus tard."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "L'obtention du verrou avec fcntl(2) a échoué : %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "L'obtention du verrou avec flock(2) a échoué : %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9189,7 +9637,7 @@ msgstr "Les références ont expiré."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'authentification en provenance du serveur."
 
@@ -9275,55 +9723,55 @@ msgstr "POP avant authentification SMTP utilisant une source non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Échec de compilation d'expression régulière : %s : %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL « %s » nécessite un composant « nom d'utilisateur »."
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL « %s »  nécessite un composant  « Host »."
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL « %s » nécessite un composant chemin."
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Résolution de : %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Échec de la résolution du nom : %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Échec de la résolution de l'hôte : impossible de créer de thread : %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Échec de la résolution de l'hôte : %s : hôte non trouvé"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Échec de la résolution de l'hôte : %s : raison inconnue"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Résolution de l'adresse"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Échec de la résolution de l'hôte : hôte non trouvé"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Échec de la résolution de l'hôte : raison inconnue"
 
@@ -9399,7 +9847,7 @@ msgstr "Certi_ficat de chiffrage :"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Impossible de créer le verrou sur le dossier %s : %s."
@@ -9489,7 +9937,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Signature valide"
 
 #: camel/camel-smime-context.c:651
@@ -9504,48 +9952,47 @@ msgstr "Échec de la commande IMAP : %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Impossible de créer le dossier « %s » : %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Créer une _règle à partir du message"
+msgid "Cannot create CMS Message"
+msgstr "Impossible d'ouvrir le message."
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Impossible d'ouvrir le message."
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Impossible de joindre le fichier %s : %s."
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Impossible de joindre le fichier %s : %s."
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Impossible d'ouvrir le message."
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Impossible de créer le verrou sur le dossier %s : %s."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9592,7 +10039,8 @@ msgstr "Impossible de créer le dossier « %s » : le dossier existe"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : opération non valide"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : opération non valide"
@@ -9601,8 +10049,8 @@ msgstr "Impossible de renommer le dossier : %s : opération non valide"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -9723,7 +10171,7 @@ msgstr "L'utilisation de la clé ne permet pas la signature de certificat."
 msgid "Error in application verification"
 msgstr "Erreur de vérification de l'application"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9736,11 +10184,11 @@ msgstr ""
 "Empreinte :        %s\n"
 "Signature :        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "MAUVAIS"
 
@@ -9764,7 +10212,7 @@ msgstr ""
 "Désirez-vous l'accepter quand même ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9779,7 +10227,7 @@ msgstr ""
 "\n"
 "Désirez-vous accepter ?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9788,7 +10236,7 @@ msgstr ""
 "Problème de certificat : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9797,7 +10245,7 @@ msgstr ""
 "Mauvais domaine de certificat : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9806,7 +10254,7 @@ msgstr ""
 "Certificat expiré : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9815,7 +10263,7 @@ msgstr ""
 "Liste de révocations de certificat expirée : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Impossible d'analyser l'URL « %s »."
@@ -9840,7 +10288,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Impossible de renommer le dossier : %s : dossier inexistant"
@@ -9861,8 +10309,8 @@ msgid "Checking for new mail"
 msgstr "Recherche de nouveau courrier"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Vérifie les nouveaux messages dans tous les dossiers."
 
@@ -9896,8 +10344,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Pour accéder aux serveurs Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9918,325 +10366,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "liste"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Serveur déconnecté de manière inattendue : %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s."
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s."
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Impossible de joindre le message au dossier mh : %s : %s."
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s."
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Impossible d'obtenir le message : %s du dossier %s\n"
-"  %s."
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dossiers"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Afficher uniquement les dossiers abonnés"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espace de noms"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Cette option utilisera un mot de passe en clair pour se connecter au serveur "
-"IMAP."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Serveur IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Service IMAP pour %s sur %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Impossible de se connecter à %s (port %d) : %s."
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL non disponible"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connexion annulée"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Impossible de se connecter au serveur POP %s : aucun support pour le "
-"mécanisme d'authentification demandé."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-"Impossible de authentifier sur le serveur IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Le nom de dossier « %s » n'est pas valide car il contient le caractère « %c »"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"Impossible de authentifier sur le serveur IMAP.\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Commande :"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Impossible de créer le dossier « %s » : %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Aucune donnée fournie"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serveur déconnecté de manière inattendue : %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10305,7 +10456,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10377,6 +10528,27 @@ msgstr "Utiliser une commande personnalisée pour se connecteur au serveur"
 msgid "Command:"
 msgstr "Commande :"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Dossiers"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Afficher uniquement les dossiers abonnés"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Outrepasser l'espace de noms fourni par le serveur"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Espace de noms"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10401,44 +10573,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Serveur IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Service IMAP pour %s sur %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Impossible de se connecter à %s (port %d) : %s."
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL non disponible"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connexion annulée"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Les négociations SSL ont échoué"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossible de se connecter avec la commande « %s » : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mécanisme d'authetification de type %s."
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucun support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s."
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10449,30 +10670,284 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier de type « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"Le nom de dossier « %s » n'est pas valide car il contient le caractère « %c »"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers."
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Impossible de créer le dossier « %s » : le dossier existe."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnu : %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "L'authentification sur le serveur POP %s a échoué : %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Serveur déconnecté de manière inattendue : %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Impossible de joindre le message au dossier mh : %s : %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Cette option utilisera un mot de passe en clair pour se connecter au serveur "
+"IMAP."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Impossible de se connecter au serveur POP %s : aucun support pour le "
+"mécanisme d'authentification demandé."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+"Impossible de authentifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Impossible de authentifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Commande :"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Aucune donnée fournie"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serveur déconnecté de manière inattendue : %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10647,18 +11122,26 @@ msgstr "Impossible d'enregistrer le résumé : %s : %s."
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Impossible d'ajouter un message au résumé : raison inconnue."
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Ajout du message annulé"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossible de joindre le message au dossier maildir : %s : %s."
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10674,49 +11157,49 @@ msgstr ""
 "Impossible d'obtenir le message : %s du dossier %s\n"
 "  %s."
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Contenu de message non valide"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Impossible d'obtenir le dossier « %s » : %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Impossible d'obtenir le dossier « %s » : le dossier n'existe pas."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Impossible de créer le dossier « %s » : %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 "Impossible d'obtenir le dossier « %s » : n'est pas un répertoire maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Impossible de supprimer le dossier « %s » : %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "n'est pas un répertoire maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11325,20 +11808,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Impossible de se connecter au serveur POP %s (port %d) : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "L'authentification sur le serveur POP %s a échoué : %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "La connexion au serveur POP %s en mode sécurisé a échoué : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Impossible de se connecter au serveur POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11347,29 +11835,29 @@ msgstr ""
 "Impossible de se connecter au serveur POP %s : aucun support pour le "
 "mécanisme d'authentification demandé."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "L'identification SASL « %s » a échouée pour le serveur POP %s : %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Identification sur le serveur POP %s impossible : erreur de protocole SASL."
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "L'authentification sur le serveur POP %s a échoué : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sVeuillez saisir le mot de passe POP pour %s sur l'hôte %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11378,7 +11866,16 @@ msgstr ""
 "Impossible de se connecter au serveur POP %s.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Impossible de se connecter au serveur POP %s.\n"
+"Erreur lors de l'envoi du mot de passe : %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier de type « %s »."
@@ -11596,97 +12093,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Serveur SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Distribution du courrier SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Impossible d'envoyer le message : aucun destinataire n'est défini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Envoi du message"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Impossible d'envoyer le message : aucun destinataire n'est défini."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Impossible d'envoyer le message : un ou plusieurs destinataires non valides."
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Accueil SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "La commande HELO a échoué : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "La commande HELO a échoué"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Authentification SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Erreur lors de la création de l'objet authentification SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "La commande AUTH a échoué : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "La commande AUTH a échoué"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Mauvaise réponse d'authentification du serveur.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Demande MAIL FROM expirée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Demande RCPT TO expirée : %s : courrier non envoyé"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Échec de RCPT TO  <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Demande DATA expirée : %s : courrier non envoyé."
@@ -11694,28 +12191,28 @@ msgstr "Demande DATA expirée : %s : courrier non envoyé."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Échec de la commande IMAP : %s"
@@ -11780,104 +12277,6 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Impossible de signer le message sortant : pas de certificat de signature "
-"définit pour ce compte"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Impossible de chiffrer le message sortant : aucune certificat de chiffrement "
-"définit pour ce compte."
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Impossible de récupérer le message de l'éditeur."
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Message sans titre"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Ouvrir un fichier"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Généré automatiquement"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signature :"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> fichier attaché"
-msgstr[1] "<b>%d</b> fichiers attachés"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Masquer la barre des pièces _jointes (déposer les pièces jointes ici)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Afficher la barre des pièces _jointes (déposer les pièces jointes ici)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Composer un message"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Impossible de créer la fenêtre de composition :\n"
-"activation du composant « Éditeur HTML » impossible.\n"
-"Veuillez vous assurer que vous avez les bonnes\n"
-"versions de gtkhtml et libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Impossible de créer la fenêtre de composition :\n"
-"activation du composant « Éditeur HTML » impossible."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Le composeur contient un corps de message non textuel qui ne peut être "
-"édité.)<b>"
-
 #
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -11960,17 +12359,95 @@ msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Impossible de signer le message sortant : pas de certificat de signature "
+"définit pour ce compte"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Impossible de chiffrer le message sortant : aucune certificat de chiffrement "
+"définit pour ce compte."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Impossible de récupérer le message de l'éditeur."
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Message sans titre"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ouvrir un fichier"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Généré automatiquement"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature :"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> fichier attaché"
+msgstr[1] "<b>%d</b> fichiers attachés"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Masquer la barre des pièces _jointes (déposer les pièces jointes ici)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Afficher la barre des pièces _jointes (déposer les pièces jointes ici)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Composer un message"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Message transféré - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Joindre le message d'origine"
+msgstr[1] "Joindre le message d'origine"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Le composeur contient un corps de message non textuel qui ne peut être "
+"édité.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Joindre un fichier au message"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11988,53 +12465,67 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Impossible de créer le tube : %s."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Messages non lus"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Voulez-vous enregistrer les modifications ?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ne pas supprimer"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Supprimer"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier de signature : %s."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Avertissement : message modifié"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12042,57 +12533,74 @@ msgid ""
 msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Aban_donner les modifications"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Enregistrer le message..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Impossible de créer le tube : %s."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier de signature : %s."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Vous devez configurer un compte avant de pouvoir composer un message."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Impossible de créer le tube : %s."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Impossible de créer la fenêtre de composition :\n"
+"activation du composant de sélection d'adresses impossible."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Impossible de créer la fenêtre de composition :\n"
+"activation du composant « Éditeur HTML » impossible.\n"
+"Veuillez vous assurer que vous avez les bonnes\n"
+"versions de gtkhtml et libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "La suite de travail collaboratif Ximian Evolution"
@@ -12396,11 +12904,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Sélectionnez une heure pour la comparaison."
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Règles de filtrage"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12429,19 +12932,8 @@ msgstr "Vous devez indiquer un nom de fichier."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Le fichier « %s » n'existe pas ou n'est pas un fichier normal."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Déplacement du dossier %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Vous devez indiquer un dossier."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12449,157 +12941,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Tâche"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Vous devez attribuer un nom au filtre."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Vous devez nommer ce dossier virtuel."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Aucun serveur n'a été sélectionné."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Alors</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Sélectionnez un dossier"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Règles de filtrage"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Sources de dossier virtuel"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Comparer avec"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Entrant"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"La date du message sera comparée à la date\n"
-"spécifiée (12:00)"
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"La date du message sera comparée à une date\n"
-"relative au moment où le filtre est exécuté."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"La date du message sera comparée à la date\n"
-"actuellee au moment du filtrage."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "une date relative à la date actuelle"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "passé(e)s"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mois"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "secondes"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "dossiers spécifiques seulement"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "la date actuelle"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "une date que vous spécifiez"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "avec tous les dossiers actifs distants"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "avec tous les dossiers actifs locaux et distants"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "avec tous les dossiers locaux"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "années"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -12667,6 +13039,71 @@ msgstr "entrant"
 msgid "outgoing"
 msgstr "sortant"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Règles de filtrage"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparer avec"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Entrant"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"La date du message sera comparée à la date\n"
+"spécifiée (12:00)"
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"La date du message sera comparée à une date\n"
+"relative au moment où le filtre est exécuté."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"La date du message sera comparée à la date\n"
+"actuellee au moment du filtrage."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "une date relative à la date actuelle"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "passé(e)s"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mois"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "secondes"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "la date actuelle"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "une date que vous spécifiez"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "années"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Ajouter une règle"
@@ -12679,60 +13116,74 @@ msgstr "Éditer la règle"
 msgid "Rule name"
 msgstr "Nom de la règle"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Règles des scores"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Préférences du composeur"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Le corps contient"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+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."
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Le corps ne contient pas"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+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."
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Le corps ou l'objet contient"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configurez ici vos comptes de messagerie."
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Le message contient"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Messagerie d'Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Les destinataires contiennent"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Composant de configuration des comptes de messagerie d'Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "L'expéditeur contient"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Composant Messagerie d'Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "L'objet contient"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Composeur de courrier d'Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "L'objet ne contient pas"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Composant de configuration du composeur de courrier d'Evolution"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Dossiers Virtuels"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Préférences de la messagerie d'Evolution"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "A_jouter"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Courrier"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Source du dossier virtuel"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Préférences du courrier"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Courrier :"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12765,45 +13216,310 @@ msgstr "A_jouter une signature"
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Règles de filtrage"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Sélectionnez un dossier"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajuster le score"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Assigner une couleur"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Assigner un score"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Pièces jointes"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Bip"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contient"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copier vers le dossier"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Date de réception"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Date d'envoi"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Supprimé"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ne contient pas"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ne finit pas par"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "n'existe pas"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ne retourne pas"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne ressemble pas à"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ne commence pas par"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "N'existe pas"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Brouillon"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "finit par"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existe"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expression"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Donner suite"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "est"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "est après"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "est avant"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "est marqué"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "est supérieur à"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "est inférieur à"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "n'est pas"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "n'est pas marqué"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Test spam"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Étiquette"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Liste de diffusion"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Corps du message"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "En-tête du message"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Le message est un spam"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Le message n'est pas un spam"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Déplacer vers le dossier"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Quitte le programme"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Jouer le son"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lu"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinataires"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regex correspond"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Répondu à"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "retourne"
+
+#
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "est supérieur à"
+
+#
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "est inférieur à"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Lancer le programme"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Expéditeur"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Définir l'état"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Taille (ko)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "ressemble à"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Compte source"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "En-tête spécifique"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "Débute par"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Arrêter le traitement"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Objet"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Statut non défini"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Alors</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Propriétés du dossier"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propriétés"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nom du dossier"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Total des messages"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Total des messages"
+msgstr[1] "Total des messages"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Messages non lus"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Messages non lus"
+msgstr[1] "Messages non lus"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12813,459 +13529,298 @@ msgstr "<cliquez ici pour sélectionner un dossier>"
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Précisez où créer le dossier >"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Dossiers virtuels"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "CORRESPONDPAS"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de déposer le ou les messages dans le stockage de haut niveau"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copier vers le dossier"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Déplacer"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Annuler la tâche"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Copier"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copier"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Déplacer"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renommer"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriétés..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Dossiers virtuels"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "CORRESPONDPAS"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Chargement..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Courrier"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Éditer comme nouveau  message..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marquer comme _lu"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme non im_portant"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marquer comme _spam"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marquer comme non _spam"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Étiquette"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Règles de filtrage"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur l'_objet"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur l'_objet"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Défaut"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Répondre à"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "À"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Objet"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "pièce jointe %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Type de chiffrement non supporté pour multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Impossible d'analyser le message MIME. Afficher comme source"
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Format de signature non supporté"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Erreur inconnue de la vérification de signature"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Erreur inconnue de la vérification de signature"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Récupération de « %s »"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Non signé"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Signature valide"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Signature non valide"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Signature valide, impossible de vérifier l'expéditeur"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Non chiffré"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Chiffré, faiblement"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Chiffré"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Chiffré, fortement"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Partie corps externe mal formée"
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointeur sur le site FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointeur sur le fichier local (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointeur sur des données distantes (%s)"
-
-#: mail/em-format-html.c:895
-#, 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:1137
-msgid "Formatting message"
-msgstr "Formatage des messages"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Logiciel de messagerie"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Non signé"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13273,7 +13828,11 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Signature valide"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13281,7 +13840,11 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Signature non valide"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13289,11 +13852,11 @@ msgstr ""
 "La signature de ce message ne peut être vérifiée, il se peut qu'il ait été "
 "altéré durant la transmission."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Signature valide, impossible de vérifier l'expéditeur"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13301,7 +13864,11 @@ msgstr ""
 "Ce message est signé avec une signature valide mais l'expéditeur du message "
 "ne peut être vérifié."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Non chiffré"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13310,7 +13877,11 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être vu lors de son passage "
 "sur internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Chiffré, faiblement"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13320,7 +13891,11 @@ msgstr ""
 "difficile, mais pas impossible pour un extérieur de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Chiffré"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13328,7 +13903,11 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour un extérieur de voir le "
 "contenu de ce message."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Chiffré, fortement"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13338,39 +13917,163 @@ msgstr ""
 "vraiment difficile, pour un extérieur, de voir le contenu de ce message dans "
 "une période de temps raisonnable."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Complété le %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "par %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Récupération de « %s »"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Signature valide, impossible de vérifier l'expéditeur"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Partie corps externe mal formée"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointeur sur le site FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointeur sur le fichier local (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointeur sur des données distantes (%s)"
+
+#: mail/em-format-html.c:895
+#, 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:1137
+msgid "Formatting message"
+msgstr "Formatage des messages"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Répondre à"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "À"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Logiciel de messagerie"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "pièce jointe %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Type de chiffrement non supporté pour multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Impossible d'analyser le message MIME. Afficher comme source"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Format de signature non supporté"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Erreur inconnue de la vérification de signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Erreur inconnue de la vérification de signature"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (intégré)"
@@ -13484,7 +14187,7 @@ msgstr "Envoyer un _message à..."
 msgid "_Add to Addressbook"
 msgstr "A_jouter dans le carnet d'adresses"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
@@ -13498,7 +14201,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Dossier"
 
@@ -13532,11 +14235,24 @@ msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Dossiers Virtuels"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "A_jouter"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Source du dossier virtuel"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Reconnaître automatiquement les liens"
@@ -14037,67 +14753,33 @@ msgstr "Port sur lequel démarrer spamd"
 msgid "spamd port"
 msgstr "Port pour spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Préférences du composeur"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Configurez ici vos comptes de messagerie."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Composant de configuration des comptes de messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Composant Messagerie d'Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Assistant d'importation Elm d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Composeur de courrier d'Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Assistant d'importation de courrier Netscape d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Composant de configuration du composeur de courrier d'Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Assistant d'importation Outlook Express 4 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/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Assistant d'importation Pine d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Comptes de messagerie"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Assistant d'importation mbox d'Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Préférences du courrier"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Courrier :"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14156,34 +14838,6 @@ msgstr "Importation de « %s »"
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Assistant d'importation Elm d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Assistant d'importation de courrier Netscape d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Assistant d'importation Outlook Express 4 d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Assistant d'importation Pine d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Assistant d'importation mbox d'Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14349,80 +15003,86 @@ msgstr "Liste de diffusion %s"
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d supprimé"
+msgid_plural "%d deleted"
+msgstr[0] "%d supprimé"
+msgstr[1] "%d supprimé"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d jour"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d jour"
+msgstr[1] "%d jour"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d seconde"
+msgid_plural "%d sent"
+msgstr[0] "%d seconde"
+msgstr[1] "%d seconde"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d seconde"
+msgid_plural "%d unsent"
+msgstr[0] "%d seconde"
+msgstr[1] "%d seconde"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "%d contact"
+msgid_plural "%d total"
+msgstr[0] "%d contact"
+msgstr[1] "%d contact"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Composer un nouveau message"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Filtres de courrier"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Créer un nouveau calendrier"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Service de vérification"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Connexion au serveur"
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identité"
@@ -14488,16 +15148,23 @@ 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:895
+msgid "Checking Service"
+msgstr "Service de vérification"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connexion au serveur"
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Vérifier les types supportés"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Aperçu"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14772,7 +15439,7 @@ msgstr "Ne pas citer le message d'origine"
 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:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fait"
 
@@ -15128,6 +15795,119 @@ msgstr "couleur"
 msgid "description"
 msgstr "description"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Sources de dossier virtuel"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepté"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Achevée"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Sensible à la casse"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Rechercher dans le message"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Rechercher :"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Marquer à donner suite"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Gérer les abonnements"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Accord de clé"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Aucun sélectionné"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erveur"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informations de sécurité"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Les messages sélectionnés pour suivi sont listés ci-après.\n"
+"Veuillez sélectionner une action de suivi dans le menu « Marqueur »."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Liste de comptes"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Date d'échéance :"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Marqueur :"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_S'abonner"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Se _désabonner"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "dossiers spécifiques seulement"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "avec tous les dossiers actifs distants"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "avec tous les dossiers actifs locaux et distants"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "avec tous les dossiers locaux"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15177,8 +15957,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Envoyer"
+msgstr "Envoyer"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15342,14 +16123,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15449,8 +16222,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Impossible de créer le dossier : %s : %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15466,8 +16240,9 @@ msgstr ""
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Impossible de supprimer le dossier local « %s »."
 
 #. mail:no-move-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
@@ -15483,8 +16258,9 @@ msgstr "Impossible d'ouvrir le message."
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Impossible de créer le dossier : %s : %s"
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
@@ -15500,8 +16276,9 @@ msgstr "Impossible d'ouvrir la source"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "et un autre contact."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15530,8 +16307,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ne pas supprimer"
+msgstr "_Récupérer"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15595,8 +16373,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "Impossible de supprimer le dossier local « %s »."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15638,13 +16417,44 @@ msgstr ""
 "        « %s »\n"
 "et ont été mis à jour."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Déplacement du dossier %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Vous devez indiquer un dossier."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Vous devez nommer ce dossier virtuel."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Aucun serveur n'a été sélectionné."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15652,16 +16462,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Écraser"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Envoyer"
@@ -15823,7 +16633,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15832,45 +16642,21 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Sensible à la casse"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Rechercher dans le message"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Rechercher :"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informations de sécurité"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Annulation..."
@@ -15907,24 +16693,24 @@ msgstr "Mise à jour..."
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Mémoriser ce mot de passe"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Mémoriser ce mot de passe jusqu'à la fin de la session"
 
@@ -15979,15 +16765,15 @@ msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
@@ -16051,7 +16837,7 @@ msgstr "%d %b %H:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
@@ -16108,10 +16894,6 @@ msgstr "Faire suivre"
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lu"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Répondre"
@@ -16124,50 +16906,49 @@ msgstr "Répondre à tous"
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Marquer à donner suite"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Le corps contient"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Achevée"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Le corps ne contient pas"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Les messages sélectionnés pour suivi sont listés ci-après.\n"
-"Veuillez sélectionner une action de suivi dans le menu « Marqueur »."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Le corps ou l'objet contient"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Date d'échéance :"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Le message contient"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Marqueur :"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Les destinataires contiennent"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Gérer les abonnements"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "L'expéditeur contient"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Aucun sélectionné"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "L'objet contient"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erveur"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "L'objet ne contient pas"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_S'abonner"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Shell d'Evolution."
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Se _désabonner"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Test d'Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Composant de Test d'Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16235,31 +17016,18 @@ msgstr "S'il faut sauter les dialogues d'avertissement de développement"
 msgid "mail"
 msgstr "courrier électronique"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Erreur inconnue"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Arguments non valides"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Impossible d'enregistrer dans OAF."
+msgid "<b>Active Connections</b>"
+msgstr "Connexions actives"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Base de données de configuration non trouvée"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Connexions actives"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Erreur générique"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16445,30 +17213,6 @@ msgstr "Un nom de dossier ne peut pas contenir le caractère « # »"
 msgid "'.' and '..' are reserved folder names."
 msgstr " « . » et  « .. » sont réservés aux noms de dossiers."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution est en train de passer hors ligne."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Courrier à %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Les outils du Gnome-Pilot ne semblent pas installés sur ce système."
@@ -16486,110 +17230,94 @@ msgstr "Bug buddy n'est pas installé."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut être exécuté."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Travail _en ligne"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Travail _hors ligne"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Case à cocher"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nouveau"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Nouveau test"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Test"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Créer une nouveau élément de test"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "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/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Connexions actives"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution est en train de passer hors ligne."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Connexions actives"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Courrier à %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "C_alendrier :"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Contacts : "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Courrier :"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tâches :"
+msgid "Uknown system error."
+msgstr "Erreur inconnue"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Type de dossier :"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Arguments non valides"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Ouvrir un dossier d'un autre utilisateur"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Impossible d'enregistrer dans OAF."
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Compte :"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Base de données de configuration non trouvée"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nom du _Dossier :"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Erreur générique"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Utilisateur :"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nouveau"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de configuration d'Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importation des fichiers"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuseau horaire :"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16603,7 +17331,7 @@ msgstr ""
 "\n"
 "Veuillez cliquer sur le bouton « Suivant » pour continuer."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16615,17 +17343,17 @@ msgstr ""
 "\n"
 "Veuillez cliquer le bouton « Appliquer » pour enregistrer vos paramètres."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell d'Evolution."
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Nouveau test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Test d'Evolution"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Composant de Test d'Evolution"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Créer une nouveau élément de test"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16686,7 +17414,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution peut importer des données depuis les fichiers suivants :"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16723,7 +17451,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16732,39 +17460,39 @@ msgstr ""
 "Merci\n"
 "L'équipe Evolution de Ximian\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ne plus me le dire"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution."
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcer la remigration depuis Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16839,6 +17567,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -17090,6 +17840,11 @@ msgstr "Vos certificats"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificat déjà existant"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17291,11 +18046,6 @@ msgstr "ID unique de l'objet"
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Certificat déjà existant"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Fichier de mots de passe PKCS12"
@@ -17437,8 +18187,8 @@ msgstr "Voir le contact actif"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
@@ -17917,16 +18667,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:5
-msgid "Close this window"
-msgstr "Ferme cette fenetre"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fermer"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_jouter l'expéditeur dans le carnet d'adresses"
@@ -18332,6 +19072,16 @@ msgstr "_Outils"
 msgid "_Undelete"
 msgstr "_Récupérer"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Ferme cette fenetre"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Fermer"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
@@ -18414,10 +19164,6 @@ msgstr "Enregistrer le fichier courant avec un nom différent"
 msgid "Save the message in a specified folder"
 msgstr "Enregistrer le message dans un dossier spécifié"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Envoyer"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18989,7 +19735,7 @@ msgid "Evolution Query"
 msgstr "Test d'Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19150,6 +19896,251 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectué)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Paramètres d'identification pour le serveur HTTP"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendriers sélectionnés pour la publication"
+
+#~ msgid "Login name:"
+#~ msgstr "Identifiant :"
+
+#~ msgid "URL:"
+#~ msgstr "URL :"
+
+#~ msgid "User Publishes"
+#~ msgstr "Publication utilisateur"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Éditeur de liste de contacts"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Enregistrer la liste comme VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Impossible de démarrer wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "C_alendrier"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Options d'alarme sonore"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Options message d'alarme"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Options d'alarme par courrier électronique"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Options d'alarme programme"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Options d'alarme inconnues"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Répétition de l'alarme"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Affichage du message :"
+
+#~ msgid "Message to Send"
+#~ msgstr "Message à envoyer"
+
+#~ msgid "Play sound:"
+#~ msgstr "Jouer le son :"
+
+#~ msgid "Run program:"
+#~ msgstr "Lancer le programme :"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Avec ces arguments :"
+
+#~ msgid "Basics"
+#~ msgstr "Basiques"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Date/Heure :"
+
+#~ msgid "Reminders"
+#~ msgstr "Rappels"
+
+#~ msgid "_Options..."
+#~ msgstr "_Options..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Carnet d'adresses..."
+
+#~ msgid "Reminder"
+#~ msgstr "Rappel"
+
+#~ msgid "B_usy"
+#~ msgstr "_Occupé"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidentiel"
+
+#~ msgid "Date & Time"
+#~ msgstr "Date & Heure"
+
+#~ msgid "F_ree"
+#~ msgstr "_Libre"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vé"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Ajouter un _participant"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Ajouter l'expéditeur au _carnet d'adresses"
+
+#~ msgid "Preview"
+#~ msgstr "Aperçu"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Règle de récurrence"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Récurrence _personnalisée"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modifier"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Aucune récurrence"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Récurrence _simple"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Fait"
+
+#~ msgid "Progress"
+#~ msgstr "En cours"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidentiel"
+
+#~ msgid "Folder:"
+#~ msgstr "Dossier :"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Débute :</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Finit :</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Terminé :</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Échéance :</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Aucun</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Il y a eu une erreur dans le système CORBA.\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Impossible de trouver l'objet.\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Impossible de mettre à jour le statut du participant !\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Ajouter l'expéditeur au _carnet d'adresses"
+
+#~ msgid "_Options"
+#~ msgstr "_Options"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Heure de _début de la réunion :"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Heure de _fin de la réunion :"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erreur d'ouverture de %s :\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Impossible de créer le dossier « %s » : %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Créer une _règle à partir du message"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Impossible de créer le verrou sur le dossier %s : %s."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Impossible de créer la fenêtre de composition :\n"
+#~ "activation du composant « Éditeur HTML » impossible."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Règles des scores"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nom du dossier"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propriétés..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Case à cocher"
+
+#~ msgid "C_alendar:"
+#~ msgstr "C_alendrier :"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Contacts : "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Courrier :"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Tâches :"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Type de dossier :"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Ouvrir un dossier d'un autre utilisateur"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Nom du _Dossier :"
+
+#~ msgid "_User:"
+#~ msgstr "_Utilisateur :"
+
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  Affic_her les bases dupportées"
 
@@ -19240,9 +20231,6 @@ msgstr "%s (%d%% effectué)"
 #~ msgid "_Invite Others..."
 #~ msgstr "_Inviter d'autres personnes..."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Impossible d'obtenir l'article %s du serveur NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Les publications ne sont pas autorisées par le serveur de nouvelles"
 
@@ -19300,32 +20288,15 @@ msgstr "%s (%d%% effectué)"
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "La connexion au serveur LDAP a échoué"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "L'authentification sur le serveur LDAP a échoué"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Impossible d'effectuer la requête sur la racine DES."
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Le serveur a renvoyé des bases de recherche non supportées."
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr ""
-#~ "Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Erreur lors de la récupération des informations relatives au schéma"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr ""
-#~ "Le serveur a renvoyé des informations non valides relatives au schéma."
-
 #~ msgid "Job title:"
 #~ msgstr "Fonction :"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Éditeur de catégorie non disponible."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19361,9 +20332,6 @@ msgstr "%s (%d%% effectué)"
 #~ "L'événement faisant l'objet d'une suppression est une réunion. Voulez-"
 #~ "vous envoyer une note d'annulation ?"
 
-#~ 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 ?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19381,43 +20349,16 @@ msgstr "%s (%d%% effectué)"
 #~ "L'entrée du journal faisant l'objet d'une suppression est publiée. Voulez-"
 #~ "vous envoyer une note d'annulation ?"
 
-#~ 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 ?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Êtes-vous sûr de vouloir supprimer le rendez-vous « %s » ?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Êtes-vous sûr de vouloir supprimer la tâche « %s » ?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Êtes-vous sûr de vouloir supprimer cette tâche sans titre ?"
 
-#~ 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 » ?"
-
 #~ 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 ?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Êtes-vous sûr de vouloir supprimer %d rendez-vous ?"
-#~ msgstr[1] "Êtes-vous sûr de vouloir supprimer %d rendez-vous ?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Êtes-vous sûr de vouloir supprimer %d tâche ?"
-#~ msgstr[1] "Êtes-vous sûr de vouloir supprimer %d tâches ?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Êtes-vous sûr de vouloir supprimer %d entrée de journal ?"
-#~ msgstr[1] "Êtes-vous sûr de vouloir supprimer %d entrées de journal ?"
-
 #~ msgid ""
 #~ "This event has been changed, but has not been saved.\n"
 #~ "\n"
@@ -19462,178 +20403,6 @@ msgstr "%s (%d%% effectué)"
 #~ "%s\n"
 #~ "est tombé en panne."
 
-#~ msgid "Adjust Score"
-#~ msgstr "Ajuster le score"
-
-#~ msgid "Assign Color"
-#~ msgstr "Assigner une couleur"
-
-#~ msgid "Assign Score"
-#~ msgstr "Assigner un score"
-
-#~ msgid "Attachments"
-#~ msgstr "Pièces jointes"
-
-#~ msgid "Beep"
-#~ msgstr "Bip"
-
-#~ msgid "contains"
-#~ msgstr "contient"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copier vers le dossier"
-
-#~ msgid "Date received"
-#~ msgstr "Date de réception"
-
-#~ msgid "Date sent"
-#~ msgstr "Date d'envoi"
-
-#~ msgid "Deleted"
-#~ msgstr "Supprimé"
-
-#~ msgid "does not contain"
-#~ msgstr "ne contient pas"
-
-#~ msgid "does not end with"
-#~ msgstr "ne finit pas par"
-
-#~ msgid "does not exist"
-#~ msgstr "n'existe pas"
-
-#~ msgid "does not return"
-#~ msgstr "ne retourne pas"
-
-#~ msgid "does not sound like"
-#~ msgstr "ne ressemble pas à"
-
-#~ msgid "does not start with"
-#~ msgstr "ne commence pas par"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "N'existe pas"
-
-#~ msgid "Draft"
-#~ msgstr "Brouillon"
-
-#~ msgid "ends with"
-#~ msgstr "finit par"
-
-#~ msgid "Exist"
-#~ msgstr "Existe"
-
-#~ msgid "exists"
-#~ msgstr "existe"
-
-#~ msgid "Expression"
-#~ msgstr "Expression"
-
-#~ msgid "Follow Up"
-#~ msgstr "Donner suite"
-
-#~ msgid "is"
-#~ msgstr "est"
-
-#~ msgid "is after"
-#~ msgstr "est après"
-
-#~ msgid "is before"
-#~ msgstr "est avant"
-
-#~ msgid "is Flagged"
-#~ msgstr "est marqué"
-
-#~ msgid "is greater than"
-#~ msgstr "est supérieur à"
-
-#~ msgid "is less than"
-#~ msgstr "est inférieur à"
-
-#~ msgid "is not"
-#~ msgstr "n'est pas"
-
-#~ msgid "is not Flagged"
-#~ msgstr "n'est pas marqué"
-
-#~ msgid "Junk Test"
-#~ msgstr "Test spam"
-
-#~ msgid "Mailing list"
-#~ msgstr "Liste de diffusion"
-
-#~ msgid "Message Body"
-#~ msgstr "Corps du message"
-
-#~ msgid "Message Header"
-#~ msgstr "En-tête du message"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Le message est un spam"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Le message n'est pas un spam"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Déplacer vers le dossier"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Quitte le programme"
-
-#~ msgid "Play Sound"
-#~ msgstr "Jouer le son"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinataires"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regex correspond"
-
-#~ msgid "Replied to"
-#~ msgstr "Répondu à"
-
-#~ msgid "returns"
-#~ msgstr "retourne"
-
-#
-#~ msgid "returns greater than"
-#~ msgstr "est supérieur à"
-
-#
-#~ msgid "returns less than"
-#~ msgstr "est inférieur à"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Lancer le programme"
-
-#~ msgid "Sender"
-#~ msgstr "Expéditeur"
-
-#~ msgid "Set Status"
-#~ msgstr "Définir l'état"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Taille (ko)"
-
-#~ msgid "sounds like"
-#~ msgstr "ressemble à"
-
-#~ msgid "Source Account"
-#~ msgstr "Compte source"
-
-#~ msgid "Specific header"
-#~ msgstr "En-tête spécifique"
-
-#~ msgid "starts with"
-#~ msgstr "Débute par"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Arrêter le traitement"
-
-#~ msgid "Unset Status"
-#~ msgstr "Statut non défini"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "_Vérifier le courrier entrant"
 
@@ -19845,9 +20614,6 @@ msgstr "%s (%d%% effectué)"
 #~ msgid "Finished"
 #~ msgstr "Terminé"
 
-#~ msgid "Group:"
-#~ msgstr "Groupe :"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
diff --git a/po/ga.po b/po/ga.po
index 62031ca29c..020a0f0612 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-21 21:56+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -23,16 +23,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Leabhar Sheoladh Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Tadhallaí: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Coimriú Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -57,34 +47,244 @@ msgstr "cartaí"
 msgid " card"
 msgstr "1 carta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Tadhallaí: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Coimriú Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Leabhar Sheoladh Evolution"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Sábháil san leabhar seoladh"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Earraidh ag lódáil leabharsheoladh loicead."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Caith uait"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "agus aon carta eile."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Roghnaigh gach tadhallaí"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Earraidh ag suimigh tadhall"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Leabhar Sheoladh Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Seoladh Shionc. Loicthe:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Tadhallaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Teastasaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Tadhallaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+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 "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -117,7 +317,7 @@ msgstr "Tadhall Nua"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Tadhallaí"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -141,15 +341,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -158,19 +358,19 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -178,58 +378,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Leabhar Seoladh Nua"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Álbachtaí..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Tadhallaí"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -249,59 +458,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Tadhallaí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Teastasaí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Leabhar Sheoladh Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-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 "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -309,7 +465,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -318,8 +474,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -345,6 +500,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Údarú"
@@ -399,13 +555,11 @@ msgid "Anonymously"
 msgstr "Gan ainm"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Gnáth"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Sonraí"
 
@@ -621,33 +775,26 @@ msgid "cards"
 msgstr "cartaí"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "noimeaíd"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
+#: 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:208
+msgid "Remove All"
+msgstr "Scríos Gach Rud"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Scríos"
 
-#: 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 "Ainm"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Scríos Gach Rud"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Feach Líosta Tadhall"
@@ -662,7 +809,7 @@ msgid "Send HTML Mail?"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr ""
 
@@ -670,16 +817,23 @@ 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 "Ainm"
+
 # Avoid; either use KR or KP
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Foinse"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -701,6 +855,11 @@ msgstr ""
 msgid "_Find"
 msgstr "_Faigh"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "C_uardaigh"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -746,9 +905,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Seachtain Oibre</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -772,7 +930,6 @@ msgid "Birthday:"
 msgstr "Brei_thlá:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Féilire:"
 
@@ -787,15 +944,15 @@ msgid "Company:"
 msgstr "Teoranta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Tadhall"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr ""
 
@@ -904,8 +1061,8 @@ msgstr "Leathanach _Lín:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -930,40 +1087,28 @@ msgid "_File under:"
 msgstr "Ainm chomhaid:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Freastalaí:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr ""
 
@@ -2148,135 +2293,127 @@ msgstr "An tSaimbia"
 msgid "Zimbabwe"
 msgstr "An tSiombáib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
-msgid "Jabber"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#, fuzzy
-msgid "GroupWise"
-msgstr "Grupa"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Seirbhís"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Áit"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Ainm Úsaideoir"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Baile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Eile"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupa"
+
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Dealaigh na tadhallaí roghnaithe"
 
 # NE
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "An Nígir"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d Tadhallaí"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Caith uait"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Seirbhís"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Áit"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Ainm Úsaideoir"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2294,6 +2431,18 @@ msgstr "Ainm _Fhada:"
 msgid "E-_mail:"
 msgstr "R-_phost:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Seoladh _2:"
@@ -2419,48 +2568,68 @@ msgid "\n"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Members"
+msgid "Add an email to the List"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
+msgid "Members"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "_Roghnaigh..."
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Ainm _Líosta:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Leabhar"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Is Líosta Nua"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Eagarthôir Líosta Tadhall"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Sábháil Lîosta mar VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr ""
@@ -2495,409 +2664,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Cuardach Ardmód"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "R-phost"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Eagrú"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "sonraí"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Fón Char"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#, fuzzy
-msgid "Fax"
-msgstr "Facs Ghnó"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Obair"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-# PE
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Fón Phóca"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Leagan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Tideal Post"
-
-# ta
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Rpost"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Leathanach Baile"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Roghnachais na Leabhar Sheoladh"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Líosta Tadhall Nua"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Ceangailte"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Teip ag oscailt '%s': %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Níl aon fillteán: %s"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Earraidh Eile"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Earraidh ag suimigh tadhall"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "carta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "líosta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Bog tadhall go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Cóip tadhall go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Bog tadhallaí go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Cóip tadhallaî go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard do %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(gan ainm)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "R-phost Tosaíocht"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Rphost 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Rphost 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Cruthaigh an tadhall nua \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Leabhar Seoladh..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Eagar na hEolais Thadall"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "agus aon carta eile."
-msgstr[1] "agus aon carta eile."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sábháil san leabhar seoladh"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Gan Tadhallaí"
@@ -2912,9 +2683,9 @@ msgstr[1] "%d Tadhallaí"
 # DE
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Ceist"
 
@@ -2930,135 +2701,135 @@ msgstr "Samhail"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Ardmód..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Saghas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sábháil mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Téigh go dtí Fillteán..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Albachtaí 'Pilot'..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Priontáil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Cóip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Amharc Reatha"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -3092,6 +2863,8 @@ msgid "Car Phone"
 msgstr "Fón Char"
 
 #: 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:3
 msgid "Categories"
 msgstr ""
 
@@ -3099,6 +2872,22 @@ msgstr ""
 msgid "Company Phone"
 msgstr "Fón Ghnó"
 
+# ta
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Rpost"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Rphost 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Rphost 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Ainm Chlainn"
@@ -3136,14 +2925,29 @@ msgstr ""
 msgid "Manager"
 msgstr "Bainisteoir"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Fón Phóca"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Leasainm"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oifig"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Eagrú"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Facs Eile"
@@ -3195,29 +2999,21 @@ msgstr "Aonad"
 msgid "Web Site"
 msgstr "Idirlíon"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Leitheid"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Airde"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 # FI
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -3235,7 +3031,12 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+# CO
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3244,22 +3045,385 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptar"
 
-# CO
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "R-phost"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "sonraí"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Fón Char"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#, fuzzy
+msgid "Fax"
+msgstr "Facs Ghnó"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Obair"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+# PE
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Leagan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Tideal Post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Leathanach Baile"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Roghnachais na Leabhar Sheoladh"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Líosta Tadhall Nua"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Ceangailte"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Teip ag oscailt '%s': %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Níl aon fillteán: %s"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Earraidh Eile"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Earraidh ag suimigh tadhall"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr ""
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "carta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "líosta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Bog tadhall go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Cóip tadhall go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Bog tadhallaí go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Cóip tadhallaî go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard do %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(gan ainm)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "R-phost Tosaíocht"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Cruthaigh an tadhall nua \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Leabhar Seoladh..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Eagar na hEolais Thadall"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "agus aon carta eile."
+msgstr[1] "agus aon carta eile."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sábháil san leabhar seoladh"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Amharc Carta"
@@ -3305,6 +3469,11 @@ msgstr "Amharcóir Féilire Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Priontáil an tadhallaí seo"
@@ -3314,11 +3483,6 @@ msgstr "Priontáil an tadhallaí seo"
 msgid "Print contact"
 msgstr "Priontáil an tadhall seo"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma 10 pt."
@@ -3503,6 +3667,21 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3557,21 +3736,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Leabhar Sheoladh Evolution"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Earraidh ag lódáil leabharsheoladh loicead."
@@ -3588,39 +3752,350 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Líosta gan ainm"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+msgid "Don't Send"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+msgid "Send Notice"
+msgstr ""
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Coinne Nua"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Caith uait"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Sábháil Scéal...."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Post"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Amharcóir Féilire Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Pasfhocal, le do thoil"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Tosaíocht Loicthe:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Féilirí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Eagarthóir Féilire/Tasc Evolution"
+
+#: 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 "Comhpháirt Tascanna Evolution"
+
+# tg
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tascanna"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Féilirí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tascanna"
+
+#: 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:213
 msgid "Starting:"
 msgstr "Ag Tosaíocht:"
@@ -3709,10 +4184,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr ""
@@ -3853,9 +4324,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Áit"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3873,8 +4365,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "lae"
 
@@ -3885,7 +4377,7 @@ msgstr "%A, %e %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3934,62 +4426,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Féilirí"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "Fé_ilire"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Féilire"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
@@ -4019,27 +4501,6 @@ msgstr "Amharc Seachtain"
 msgid "Month View"
 msgstr "Amharc Mí"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Áit"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -4057,224 +4518,139 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Am</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Tuarascail</b>"
 
-# xh
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "uair"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Am</b> "
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Suimigh Féilire Nua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Suimigh"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "scéal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Dáta/Am:"
+# as 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Scéalaí"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Rith roghchlár"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Post ríomhphost"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Coimriú:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Cuntas:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Rith roghchlár"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Roghanna..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Post"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "tar éis"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "roimh"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "la(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "deireadh an coinne"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+# xh
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "uair"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Suimigh Féilire Nua"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa na Líosta Tasc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Dathanna"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Roghnaigh dath"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Suimigh Féilire Nua"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Cuir Grúpa Leis..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr ""
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Suimigh"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+# ##
+# ## Languages (ISO 639 code in brackets)
+# ## 	The 'msgid' names and spellings for languages are those listed
+# ##     in iso-639.def from glibc
+# aa 
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_Type:"
-msgstr "Saghas:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
-
-# el 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "seachtanna"
+msgid "Alarms"
+msgstr "Alairm on %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4389,7 +4765,7 @@ msgid "Free/Busy Publishing"
 msgstr "Eolas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Aoine"
@@ -4403,7 +4779,7 @@ msgid "Minutes"
 msgstr "Noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luain"
@@ -4413,7 +4789,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sathairn"
@@ -4427,7 +4803,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domhnaigh"
@@ -4441,7 +4817,7 @@ msgid "T_hu"
 msgstr "D_ea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Deardaoin"
@@ -4455,7 +4831,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Mairt"
@@ -4465,7 +4841,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Ceádaoin"
@@ -4498,7 +4874,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4548,6 +4925,79 @@ msgstr "_Cea"
 msgid "before every appointment"
 msgstr "roimh gach coinne"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Suimigh Féilire Nua"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa na Líosta Tasc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Dathanna"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Roghnaigh dath"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Suimigh Féilire Nua"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Cuir Grúpa Leis..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Saghas:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+# el 
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "seachtanna"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4592,79 +5042,73 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Críochnaithe "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Críochnaithe "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Sábháil mar..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Críochnaithe "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Críochnaithe "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4728,8 +5172,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Leabhar Seoladh..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Tadhallaí..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4739,165 +5184,223 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Eolas"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "roimh gach coinne"
+msgstr[1] "roimh gach coinne"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "deireadh an coinne"
+msgstr[1] "deireadh an coinne"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "roimh gach coinne"
+msgstr[1] "roimh gach coinne"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr ""
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "roimh gach coinne"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr ""
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "roimh gach coinne"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr ""
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "roimh gach coinne"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Líosta Tasc</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr ""
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Data &amp; Am</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
+msgid "A_ll day event"
 msgstr ""
 
-#
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Dáta/Am:"
+msgid "C_ustomize..."
+msgstr "Sábháil Amharc Féindheanamh..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Saor"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Áit:"
+msgid "Cale_ndar:"
+msgstr "Féilire:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Príobhádach"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Áit:"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Taispeáin"
+msgid "L_ocation:"
+msgstr "Áit:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Priobhdach"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Taispeáin"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Coimriú:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Bunaigh"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Tuarascail:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ar Bith"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Dealaigh"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Scríos"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4936,35 +5439,44 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stádas"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Am</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "_Suim do Leabhar Seoladh"
+msgid "<b>Organizer</b>"
+msgstr "<b>Am</b> "
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "Change Or_ganizer"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Tadhallaí..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "_Buidheann"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -5031,151 +5543,141 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "céad"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "dara"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "deireadh"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Dáta Eile"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "lá"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
 #
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Dáta/Am:"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Tuarascail</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Reamhthaispeáintas</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "<b>Am</b> "
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Gach"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid "Exceptions"
-msgstr "Roghanna"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-#, fuzzy
-msgid "Preview"
-msgstr "Réamhthaispeántais:"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
+msgid "This appointment rec_urs"
+msgstr "Dún an coinne seo"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Scríos"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mí"
 
 # rn
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "Seachta(i)n"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "blia(i)n"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Ag socraigh ffilteán: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Líosta Tasc"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Rinneadh"
+msgid "<span weight=\"bold\">Status</span>"
+msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Críochnaithe"
 
@@ -5187,8 +5689,8 @@ msgstr "Ard"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
@@ -5200,23 +5702,22 @@ msgid "Low"
 msgstr "Bun"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Gnáth"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Dearbhú"
+msgid "P_ercent complete:"
+msgstr "Crí_ochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5240,36 +5741,41 @@ msgstr "_Stádas:"
 msgid "_Web Page:"
 msgstr "Leathanach _Lín:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+# tg
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tasc"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Tuarascail:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Fillteán:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5280,58 +5786,58 @@ msgstr "Dáta Breithe"
 msgid "_Due date:"
 msgstr "Dáta:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Roghnachais Féilire</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Lá"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Eolas"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Eolas"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Ainm _Líosta:"
+msgid "_Daily"
+msgstr "Lá"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Pasfhocal:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Post"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Pasfhocal:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Pasfhocal, le do thoil"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Ainm _Úsaideoir:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Seachtain"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5413,7 +5919,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5422,6 +5928,11 @@ msgstr ""
 msgid "Untitled"
 msgstr "Gan Tidéal"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Coimriú:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5435,7 +5946,7 @@ msgstr "Dáta:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stádas:"
 
@@ -5448,19 +5959,90 @@ msgstr "Tosaíocht:"
 msgid "Web Page:"
 msgstr "Leathanach _Lín:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Dáta"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Priobhdach"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Coimriú"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Saor"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "T"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Tá"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Níl"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Gan fhois"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
@@ -5507,97 +6089,103 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Saor"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Oscail"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Oscail Leathanach _Lín"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Priontáil..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Cóip"
 
 # PS
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Greamaigh"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
 # ln
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Dealaigh"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Sábháil mar..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5606,179 +6194,112 @@ msgstr ""
 msgid "% Complete"
 msgstr "% Rinneadh"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Críochnaithe."
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Dáta"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Tosaíocht"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Dáta Breithe"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Coimriú"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Ag bogadh scéaltaí"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Tasc Nua"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Roghnaigh fillteán"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Roghnaigh..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Cóip do Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Bog go Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Álbachtaí..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Dáta"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Gan fhois"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Tá"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Níl"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "T"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5799,36 +6320,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "rn"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "in"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "rn"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "in"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5895,342 +6416,320 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Ag Críochnú:</b> "
-
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Críochnaithe:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Stádas"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Ran."
+
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Féilire"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ar bith</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Áit:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Diúltaigh Dó"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
 # FR
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Eolas Thasc"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Droch Scéal Tasc"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6260,6 +6759,10 @@ msgstr "Ag Lódáil Féilire"
 msgid "Loading calendar..."
 msgstr "Ag Lódáil féilire..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -6277,11 +6780,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr "Cathlaoirlaigh"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6351,6 +6849,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "As an Oifig"
@@ -6359,92 +6879,58 @@ msgstr "As an Oifig"
 msgid "No Information"
 msgstr "Gan Eolas"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "_Suim do Leabhar Seoladh"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Roghanna"
+msgid "O_ptions"
+msgstr "Roghanna"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Taispeáin aon mhí"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Uathpioc"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6453,119 +6939,52 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Ag oscailt tascanna as %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-" Earráid le %s:\n"
-"  %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Ag oscailt tascanna as %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-# tg
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tascanna"
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
 # tr
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Eagarthóir Féilire/Tasc Evolution"
-
-#: 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 "Comhpháirt Tascanna Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Féilirí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tascanna"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aibreáin"
@@ -6912,11 +7331,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-# tg
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tasc"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6947,7 +7361,7 @@ msgid "Contacts: "
 msgstr "Tadhallaí: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Priontáil Reamhtaispeántais"
 
@@ -6975,7 +7389,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Gan Tascanna"
 msgstr[1] "Gan Tascanna"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6996,35 +7410,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Grupa na Líosta Tasc"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Cruthaigh tasc nua"
@@ -8717,69 +9125,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Ag Ssioncronaich fillteán"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8801,42 +9209,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Ag bogadh scéaltaí"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr ""
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Rabhadh"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr ""
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8876,7 +9248,43 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Ag bogadh scéaltaí"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Rabhadh"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8884,43 +9292,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8931,100 +9339,100 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Teip ar GPG: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
+msgid "Could not lock '%s'"
+msgstr "Níorbh fhéidir '%s' a glasáil"
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Níorbh fhéidir '%s' a glasáil"
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
 #: camel/camel-movemail.c:107
 #, c-format
@@ -9258,7 +9666,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9337,55 +9745,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9459,7 +9867,7 @@ msgstr "Teip ag cruthaigh fillteán %s: %s"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
@@ -9551,7 +9959,7 @@ msgstr ""
 # SG
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Siniú Bhailithe."
 
 #: camel/camel-smime-context.c:651
@@ -9566,47 +9974,47 @@ msgstr "Teip oraithe NNTP: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Níl an scéal %s ar fáil: %s"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Níl an scéal %s ar fáil: %s"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ní féidir an comhad %s a cheangail: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ní féidir an comhad %s a cheangail: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Níl an scéal %s ar fáil: %s"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Cruthaigh tadhall nua"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
@@ -9651,7 +10059,8 @@ msgstr "Teip ag cruthaigh fillteán %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
@@ -9661,8 +10070,8 @@ msgid "Trash"
 msgstr "Bruscar"
 
 # GN
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Bruscar"
 
@@ -9782,7 +10191,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9791,11 +10200,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "OLC"
 
@@ -9812,7 +10221,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9822,35 +10231,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9874,7 +10283,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9893,8 +10302,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9925,8 +10334,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9945,305 +10354,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "líosta"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Níl eolaire maildir '%s' ann."
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Níl an scéal %s ar fáil: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Níl aon Eolaire `%s' ann."
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Fillteáin"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Freastalaí IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Seirbhís IMAP do %s as %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 ""
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Earraidh gan fhois"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPasfhocali POP do %s@%s, le do thoil"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Níl eolaire maildir '%s' ann."
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Ordú:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Níl eolaire maildir '%s' ann."
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Gan Tascanna"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Earraidh gan fhois"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10308,7 +10440,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10380,6 +10512,27 @@ msgstr ""
 msgid "Command:"
 msgstr "Ordú:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Fillteáin"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr ""
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10401,43 +10554,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Freastalaí IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Seirbhís IMAP do %s as %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 ""
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10445,30 +10647,264 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Níl an scéal %s ar fáil: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Níl aon Eolaire `%s' ann."
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPasfhocali POP do %s@%s, le do thoil"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Ordú:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Gan Tascanna"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10629,18 +11065,26 @@ msgstr "Teip ag sábháil coimriú: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Imbosca"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10654,48 +11098,48 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Níl eolaire maildir '%s' ann."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "níl eolaire maildir ann"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11265,55 +11709,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPasfhocali POP do %s@%s, le do thoil"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Níl aon eolaire `%s' ann."
@@ -11521,95 +11977,95 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP freastalaí %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Teip oraithe NNTP: %s"
@@ -11617,28 +12073,28 @@ msgstr "Teip oraithe NNTP: %s"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Teip oraithe NNTP: %s"
@@ -11703,90 +12159,6 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Scéal gan tideál)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Oscail Comhad"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Uathcruthach"
-
-# SG
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Siniú:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11867,17 +12239,89 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Scéal gan tideál)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Oscail Comhad"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Uathcruthach"
+
+# SG
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Siniú:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Ni raibh scéal sinn: %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "(Scéal gan tideál)"
+msgstr[1] "(Scéal gan tideál)"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Ceangal comhad ar an scéal"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11895,76 +12339,87 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "(Scéal gan tideál)"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Scríos"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Teip ag sábháil comhad siniú: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Caith uait"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Sábháil Scéal...."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr ""
@@ -11972,33 +12427,49 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Teip ag sábháil comhad siniú: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -12286,11 +12757,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Sábháil Mar"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12316,168 +12782,44 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Ag dealaigh fillteán %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Coinne"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr ""
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Roghnaigh comhad"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Am</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Roghnaigh Fillteán"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Méarloirg</b>"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Foinse FFillteáin"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr ""
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr ""
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr ""
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr ""
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "soicind"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr ""
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr ""
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr ""
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "bliana"
-
 # IR
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
@@ -12546,6 +12888,65 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Méarloirg</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr ""
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr ""
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr ""
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "soicind"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "bliana"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12559,60 +12960,69 @@ msgstr ""
 msgid "Rule name"
 msgstr ""
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-# Avoid; either use KR or KP
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Scór"
-
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Post Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Comhphairt Post Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "_Fillteán"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Post"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Suimigh"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuntasaí Phoist"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Foinse FFillteáin"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Roghnachais Phoist"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Post"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12645,47 +13055,345 @@ msgstr "Suimigh Siniú"
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Dé %a, %Y-%m-%d ag %H:%M %%+05d, scríobh %%s:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Sábháil Mar"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Roghnaigh Fillteán"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr ""
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Coinne"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Ceangaltáin"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr ""
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Áit"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Cóip go Fillteán"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Crí_ochnaithe"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Roinn"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Scrioste"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "agus aon carta eile."
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Roghnachais na Leabhar Sheoladh"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr ""
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Dáta"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Fán le do thoil"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "_Ealu"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Teacs"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "_Dearbhú:"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "i"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "tar éis"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "roimh"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr ""
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Liosta"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr ""
+
+# GN
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Meitheamh"
+
+# PE
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Lipéid"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "líosta ríomhphost %s"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Clófhoireanna Scéal"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Scríobhóir Scéal"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Taispeántas Scéal"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Scéal ó %s"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Bog go Fillteán"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Éirigh as an ríomhchlár"
+
+# PL
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "An Pholainn"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Freagraí do %s"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Freagraí do %s"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Rith roghchlár"
+
+# Avoid; either use KR or KP
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Scór"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Stádas"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Méid (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Cuntáis foinse"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr ""
+
+#: mail/em-filter-i18n.h:61
+#, fuzzy
+msgid "starts with"
+msgstr "Líosta tasc nua"
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "_Dearbhú:"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Ábhar"
+
+# US
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Stáit Aontaithe Mheiriceá"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Am</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Álbachtaí Fillteáin"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Álbactaí"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Ainm Fillteán"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Ag bogadh scéaltaí"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Ag bogadh scéaltaí"
+msgstr[1] "Ag bogadh scéaltaí"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "(Scéal gan tideál)"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "(Scéal gan tideál)"
+msgstr[1] "(Scéal gan tideál)"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12695,405 +13403,418 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "FFilteáin"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Ag Lódáil..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Cóip go Fillteán"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Bog go Fillteán"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Bog"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cealaigh Tasc"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Cóip"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Feach"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Cóip..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Bog..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Roghanna..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "FFilteáin"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Imbosca"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Ag Lódáil..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Post"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Álbactaí"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-# PE
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Lipéid"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Ó"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Freagrair-Do"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Gan Siniú"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Do"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+# SG
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Siniú Bhailithe."
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Ábhar"
+# SG
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Siniú neambhailí."
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dáta"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:651
+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.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Sábháil siniú"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr ""
 
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Gan Siniú"
+#: mail/em-format-html-display.c:653
+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 ""
 
-# SG
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Siniú Bhailithe."
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Feach Teastas"
 
-# SG
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Siniú neambhailí."
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "mar %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "mar %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Leathanach %d as %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13129,9 +13850,35 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Ó"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Freagrair-Do"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Do"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr ""
 
@@ -13145,100 +13892,45 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dáta"
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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."
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "_Feach Teastas"
-
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "mar %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr ""
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "mar %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr ""
+msgid "Error verifying signature"
+msgstr "Sábháil siniú"
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Leathanach %d as %d"
-
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
@@ -13354,7 +14046,7 @@ msgstr ""
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
@@ -13368,7 +14060,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Fillteán"
 
@@ -13402,11 +14094,24 @@ msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Scéal ó %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "_Fillteán"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Suimigh"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Foinse FFillteáin"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13861,62 +14566,33 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Post Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Comhphairt Post Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuntasaí Phoist"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Roghnachais Phoist"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13975,34 +14651,6 @@ msgstr ""
 msgid "Importing mailbox"
 msgstr "Comhad Inchur"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14146,81 +14794,87 @@ msgstr "líosta ríomhphost %s"
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Scrioste"
+msgid_plural "%d deleted"
+msgstr[0] "Scrioste"
+msgstr[1] "Scrioste"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d nua"
+msgid_plural "%d junk"
+msgstr[0] "%d nua"
+msgstr[1] "%d nua"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d la(e)"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d la(e)"
+msgstr[1] "%d la(e)"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d soicínd"
+msgid_plural "%d sent"
+msgstr[0] "%d soicínd"
+msgstr[1] "%d soicínd"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d nua"
+msgid_plural "%d unsent"
+msgstr[0] "%d nua"
+msgstr[1] "%d nua"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d íomlán"
+msgid_plural "%d total"
+msgstr[0] "%d íomlán"
+msgstr[1] "%d íomlán"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -14270,14 +14924,22 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Reamhthaispeáintas</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14531,7 +15193,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Críochnaithe"
 
@@ -14872,6 +15534,115 @@ msgstr "dath"
 msgid "description"
 msgstr "sonraí"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Foinse FFillteáin"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Líosta do cuntasaí"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Crí_ochnaithe"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Cuardaigh:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Freastalaí:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Eolas Slándáil"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Líosta do cuntasaí"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bratach:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15058,14 +15829,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15169,8 +15932,11 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
+"Teip ag scŕios fillteán:\n"
+"%s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15198,8 +15964,9 @@ msgstr "Teip ag oscailt '%s': %s"
 
 #. mail:no-move-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
 msgid "Cannot open target \"{2}\"."
-msgstr ""
+msgstr "Teip ag oscailt '%s': %s"
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
@@ -15221,8 +15988,9 @@ msgstr "Teip ag oscailt '%s': %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "agus aon carta eile."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15251,8 +16019,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "_Athdealaigh"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15278,8 +16047,9 @@ msgstr ""
 
 #. mail:ask-signature-changed title
 #: mail/mail-errors.xml.h:179
+#, fuzzy
 msgid "Discard changed?"
-msgstr ""
+msgstr "_Caith uait"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
@@ -15292,8 +16062,9 @@ msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Caith uait"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -15310,8 +16081,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Teip ag dealaigh fillteán:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15343,13 +16117,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Ag dealaigh fillteán %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Scrioste"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15357,15 +16161,15 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr ""
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Post"
@@ -15525,7 +16329,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15534,45 +16338,21 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Cuardaigh:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Eolas Slándáil"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Ag Cealaigh..."
@@ -15608,24 +16388,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15683,15 +16463,15 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
@@ -15755,7 +16535,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15812,10 +16592,6 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Freagrair"
@@ -15828,48 +16604,52 @@ msgstr "Freagrair do gach rud"
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Crí_ochnaithe"
-
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bratach:"
-
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Freastalaí:"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Blaosc Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Comhpháirt Tascanna Evolution"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15932,30 +16712,17 @@ msgstr ""
 msgid "mail"
 msgstr "post"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Earraidh gan fhois"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr ""
+msgid "<b>Active Connections</b>"
+msgstr "<b>Tadhallaî</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -16123,23 +16890,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Post do %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16157,115 +16907,87 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nua"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr ""
 
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Tasc Nua"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
 
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Iarthair"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Post do %s"
 
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Cruthaigh tasc nua"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "<b>Tadhallaî</b>"
+msgid "Uknown system error."
+msgstr "Earraidh gan fhois"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "Fé_ilire:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Tadhallaí: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Post:"
-
-# tg
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tascanna:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Saghas fillteán:"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "Roghnaigh Fillteán Tascanna"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Cuntas:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Ainm _Fillteán:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Úsaideoir:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nua"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Am Críos "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Fáilte"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16274,7 +16996,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16282,19 +17004,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Blaosc Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Tasc Nua"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Iarthair"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Comhpháirt Tascanna Evolution"
+msgid "Create a new test item"
+msgstr "Cruthaigh tasc nua"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16357,7 +17080,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16377,7 +17100,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16386,39 +17109,39 @@ msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16457,8 +17180,9 @@ msgid ""
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
+#, fuzzy
 msgid "Continue"
-msgstr ""
+msgstr "Áit"
 
 #. shell:noshell title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
@@ -16492,6 +17216,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16732,6 +17478,11 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16936,11 +17687,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17082,8 +17828,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Gníomhartha"
@@ -17560,16 +18306,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Dún an fhuinneog seo"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Dún"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17977,6 +18713,16 @@ msgstr "Uir_lisí"
 msgid "_Undelete"
 msgstr "_Athdealaigh"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Dún an fhuinneog seo"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Dún"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ceangal"
@@ -18059,10 +18805,6 @@ msgstr ""
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Post"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18637,7 +19379,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18793,6 +19535,134 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Ainm _Líosta:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Sábháil Lîosta mar VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Grupa"
+
+#~ msgid "C_alendar"
+#~ msgstr "Fé_ilire"
+
+#
+#~ msgid "Date/Time:"
+#~ msgstr "Dáta/Am:"
+
+#~ msgid "_Options..."
+#~ msgstr "_Roghanna..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Leabhar Seoladh..."
+
+#
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Dáta/Am:"
+
+#~ msgid "F_ree"
+#~ msgstr "_Saor"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Príobhádach"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "_Suim do Leabhar Seoladh"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Roghanna"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Réamhthaispeántais:"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Rinneadh"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Dearbhú"
+
+#~ msgid "Folder:"
+#~ msgstr "Fillteán:"
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Ag Críochnú:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Críochnaithe:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ar bith</i>"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "_Suim do Leabhar Seoladh"
+
+#~ msgid "_Options"
+#~ msgstr "_Roghanna"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ " Earráid le %s:\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Cruthaigh tadhall nua"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Dé %a, %Y-%m-%d ag %H:%M %%+05d, scríobh %%s:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Ainm Fillteán"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Roghanna..."
+
+#~ msgid "C_alendar:"
+#~ msgstr "Fé_ilire:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Tadhallaí: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Post:"
+
+# tg
+#~ msgid "_Tasks:"
+#~ msgstr "_Tascanna:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Saghas fillteán:"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Roghnaigh Fillteán Tascanna"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Ainm _Fillteán:"
+
+#~ msgid "_User:"
+#~ msgstr "_Úsaideoir:"
+
 #~ msgid "1:00"
 #~ msgstr "1:00"
 
@@ -18859,26 +19729,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Could not get messages: unspecified error"
 #~ msgstr "Níl an scéal %s ar fáil: %s"
 
-#~ msgid "Attachments"
-#~ msgstr "Ceangaltáin"
-
-#~ msgid "Deleted"
-#~ msgstr "Scrioste"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Éirigh as an ríomhchlár"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Rith roghchlár"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Méid (kB)"
-
-#~ msgid "Source Account"
-#~ msgstr "Cuntáis foinse"
-
 #~ msgid "Working"
 #~ msgstr "Ag Obair"
 
@@ -18912,9 +19762,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Blog:"
 #~ msgstr "Blog"
 
-#~ msgid "Evolution Calendar viewer"
-#~ msgstr "Amharcóir Féilire Evolution"
-
 #~ msgid "Evolution Tasks viewer"
 #~ msgstr "Amharcóir Tascanna Evolution"
 
@@ -18935,10 +19782,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "calendar"
 #~ msgstr "Féilire"
 
-#, fuzzy
-#~ msgid "task list"
-#~ msgstr "Líosta tasc nua"
-
 #~ msgid "Evolution Mail folder viewer"
 #~ msgstr "Amharcóir fillteáin phost Evolution"
 
@@ -18949,9 +19792,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Finished"
 #~ msgstr "Críochnaithe"
 
-#~ msgid "Group:"
-#~ msgstr "Grupa:"
-
 #~ msgid " B_usiness:"
 #~ msgstr " _Gnó:"
 
@@ -19178,12 +20018,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Loading Images"
 #~ msgstr "Ag Lódáil íomhanna"
 
-#~ msgid "Message Display"
-#~ msgstr "Taispeántas Scéal"
-
-#~ msgid "Message Fonts"
-#~ msgstr "Clófhoireanna Scéal"
-
 #~ msgid "Printed Fonts"
 #~ msgstr "Priontáil an tadhallaí seo"
 
@@ -19300,12 +20134,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Yugoslavia"
 #~ msgstr "An Iúglaiv"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Data &amp; Am</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Tuarascail</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Coimriú</b>"
 
@@ -19363,12 +20191,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Url"
 #~ msgstr "Url"
 
-#~ msgid "Department"
-#~ msgstr "Roinn"
-
-#~ msgid "Dep"
-#~ msgstr "Ran."
-
 #~ msgid "Off"
 #~ msgstr "Oif."
 
@@ -19702,21 +20524,12 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Open this folder in an other window"
 #~ msgstr "Post an sceál seo"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Cóip..."
-
 #~ msgid "_Folder..."
 #~ msgstr "_Fillteán..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Bog..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Fillteán _Nua"
 
-#~ msgid "Information"
-#~ msgstr "Eolas"
-
 #~ msgid "Error"
 #~ msgstr "Earraidh"
 
@@ -19754,18 +20567,12 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Cruthaigh Fillteán _Nua..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Tadhallaí..."
-
 #~ msgid "1234"
 #~ msgstr "1234"
 
 #~ msgid "<- _Remove"
 #~ msgstr "<- _Scríos"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "_Tadhallaí..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Saghais Guthán"
 
@@ -19874,9 +20681,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "(unknown host)"
 #~ msgstr "(óst gan fhois)"
 
-#~ msgid "No such message: %s"
-#~ msgstr "Ni raibh scéal sinn: %s"
-
 #~ msgid " Edit "
 #~ msgstr "Eagar "
 
@@ -19910,9 +20714,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "News"
 #~ msgstr "Nuacht"
 
-#~ msgid "_Organization:"
-#~ msgstr "_Buidheann"
-
 #~ msgid "_Server type: "
 #~ msgstr "Saghas _Freastalaí: "
 
@@ -19928,9 +20729,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Create a _New Meeting"
 #~ msgstr "Cruthaigh Cruinniú _Nua"
 
-#~ msgid "New Appointment"
-#~ msgstr "Coinne Nua"
-
 #~ msgid "_Appointment..."
 #~ msgstr "_Coinne..."
 
@@ -20091,9 +20889,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "h"
 #~ msgstr "h"
 
-#~ msgid "i"
-#~ msgstr "i"
-
 #~ msgid "j"
 #~ msgstr "j"
 
@@ -20160,12 +20955,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Address _Book... (FIXME)"
 #~ msgstr "Leabhair Sheolaidh"
 
-#~ msgid "C_lear"
-#~ msgstr "_Bunaigh"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Dún an coinne seo"
-
 #~ msgid "Pre_vious"
 #~ msgstr "_Riomh"
 
diff --git a/po/gl.po b/po/gl.po
index a3f70aa8e3..47bc18cf34 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -28,16 +28,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Editar o Libro de Enderezos"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Co_ntactos:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Fiestra de Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -63,40 +53,269 @@ msgstr "Sen tarxetas"
 msgid " card"
 msgstr "1 tarxeta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Co_ntactos:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Fiestra de Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Non foi posible cargar o cursor\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "A resposta do servidor IMAP non contiña información sobre %s"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+"Información de traza opaca non válida:\n"
+"%s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "A resposta do servidor IMAP non contiña información sobre %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Non foi posible cargar %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Non hai unha descrición dispoñible."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Gardar no libro de enderezos"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Erro ao cargar o ficheiro: %s"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Erro ao elimina-la tarxeta"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "¿Quere gardar os cambios?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#, fuzzy
+msgid "_Discard"
+msgstr "Imprimir tarxeta"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "non contén"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Non foi posible recibir a mensaxe do editor"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Erro ao engadi-la tarxeta"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Non foi posible cargar %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 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.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
+msgid "Autocompletion"
+msgstr "Data na que se completa"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Introduza o seu contrasinal para %s"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, 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:9
+#, 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:10
+#, 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:11
+#, 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: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
+#, 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:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -133,7 +352,7 @@ msgstr "Novo Contacto:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "Co_ntactos:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -158,15 +377,15 @@ msgid "Migrating `%s':"
 msgstr "Examinando %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -175,22 +394,22 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data na que se completa"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -198,58 +417,71 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contactos"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Introduza o seu contrasinal para %s"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -269,69 +501,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Data na que se completa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "ID do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, 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:9
-#, 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:10
-#, 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:11
-#, 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: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
-#, 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:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -339,7 +508,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -348,8 +517,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
@@ -375,6 +543,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autenticación"
@@ -428,13 +597,11 @@ msgid "Anonymously"
 msgstr "Anónimo"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
@@ -662,34 +829,27 @@ msgid "cards"
 msgstr "Sen tarxetas"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Seleccionar Contactos do Libro de Enderezos"
+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:208
+msgid "Remove All"
+msgstr "Eliminar Todos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eliminar Todos"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -706,7 +866,7 @@ msgid "Send HTML Mail?"
 msgstr "¿Enviar Correo HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Engadir a Contactos"
 
@@ -714,16 +874,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
+msgid "Select Contacts from Address Book"
+msgstr "Seleccionar Contactos do Libro de Enderezos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -750,6 +917,11 @@ msgstr "_Categoría:"
 msgid "_Find"
 msgstr "Buscar:"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Buscar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -796,9 +968,8 @@ msgid "<b>Work</b>"
 msgstr "Semana Laboral"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -823,7 +994,6 @@ msgid "Birthday:"
 msgstr "_Aniversario:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Axenda"
@@ -839,8 +1009,8 @@ msgid "Company:"
 msgstr "Compañía"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 #, fuzzy
@@ -848,7 +1018,7 @@ msgid "Contact"
 msgstr "Contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -959,8 +1129,8 @@ msgstr "Enderezo da páxina _Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 #, fuzzy
@@ -985,46 +1155,29 @@ msgid "_File under:"
 msgstr "Nome do ficheiro:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 #, fuzzy
 msgid "Editable"
 msgstr "Activado"
@@ -2011,146 +2164,137 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Anterior Mensaxe"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "India"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Grupo"
+msgid "Service"
+msgstr "Engadir Servicio"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nome de _Usuario:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "India"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Escolla unha das seguintes opcións"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "As seguintes conexións están activas nestes intres:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Argumentos non válidos"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-#, fuzzy
-msgid "_Discard"
-msgstr "Imprimir tarxeta"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Anterior Mensaxe"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Engadir Servicio"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr ""
-"\n"
-"Localización Xeográfica: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nome de _Usuario:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
@@ -2173,6 +2317,23 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Enderezo _2:"
@@ -2303,54 +2464,76 @@ msgid "\n"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#, fuzzy
+msgid "Add an email to the List"
+msgstr "Enviar unha mensaxe a %s"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Seleccionar Contactos do Libro de Enderezos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Eliminar os elementos seleccionados da lista de anexos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionar Todo"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Agochar enderezos cando se envíe correo a esta lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Escriba un enderezo de correo ou arraste un contacto á lista de abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "editor-de-contactos"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+#, fuzzy
+msgid "dialog1"
+msgstr "Amosar un diálogo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 #, fuzzy
 msgid "Book"
 msgstr "Corpo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 #, fuzzy
 msgid "Is New List"
 msgstr "Nova Lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Participantes Requiridos"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-#, fuzzy
-msgid "Save List as VCard"
-msgstr "Gardar como VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contacto Cambiado:"
@@ -2389,443 +2572,11 @@ msgstr ""
 "cartafol.  ¿Gostaríalle engadilo de todas maneiras?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "Membros"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organización"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Estonia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Nada"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Traballando"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-#, fuzzy
-msgid "Blog"
-msgstr "para sempre"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Teléfono Móbil"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Xeral"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "_Posto de traballo:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "Fax Particular"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Éxito"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "O cartafol `%s' non existe."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova Lista de Contactos"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "Tarxeta non atopada"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "O ID da Tarxeta xa existe"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocolo non soportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "A autenticación fallou."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Autenticación requirida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Non existe a mensaxe"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Outro erro"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Esta versión de Evolution non ten soporte LDAP\n"
-"compilado nela. Se quere usar LDAP en Evolution\n"
-"debe compilar o programa desde as fontes do CVS\n"
-"logo de obter OpenLDAP desde o enlace de abaixo.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Erro ao engadi-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Erro ao engadi-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Erro ao modifica-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Erro ao modifica-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Erro ao elimina-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Erro ao elimina-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s xa existe\n"
-"¿Quere sobrescribilo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-#, fuzzy
-msgid "Overwrite"
-msgstr "¿Sobrescribir ficheiro?"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-#, fuzzy
-msgid "list"
-msgstr "Brétema"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Seleccionar Contactos do Libro de Enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Varias VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard de %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(ningún)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Correo Electrónico Principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Escolla unha Acción"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear un novo contacto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Engadir un enderezo a un contacto existente \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Buscando no Libro de Enderezos..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar Información de Contacto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Mestura-lo Enderezo de Correo"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "non contén"
-msgstr[1] "non contén"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Amosa-las _Cabeceiras Completas"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Gardar como VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gardar no libro de enderezos"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2840,9 +2591,9 @@ msgstr[1] "Contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 #, fuzzy
 msgid "Query"
 msgstr "Alemaña"
@@ -2861,143 +2612,143 @@ msgstr "Móbil"
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Calquera Categoría"
@@ -3031,6 +2782,8 @@ msgid "Car Phone"
 msgstr "Teléfono do Automóbil"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorías"
 
@@ -3038,6 +2791,21 @@ msgstr "Categorías"
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Correo Electrónico 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 #, fuzzy
 msgid "Family Name"
@@ -3078,14 +2846,29 @@ msgstr "Xordania"
 msgid "Manager"
 msgstr "Xestor"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Teléfono Móbil"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcume"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organización"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
@@ -3139,33 +2922,23 @@ msgstr "Non vista"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 #, fuzzy
 msgid "Width"
 msgstr "Largura:"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 #, fuzzy
 msgid "Height"
 msgstr "Altura:"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Eliminada"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Ordeamento das tarefas"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3184,7 +2957,12 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Colombia"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 #, fuzzy
 msgid ""
 "\n"
@@ -3199,7 +2977,7 @@ msgstr ""
 "\n"
 "Faga dobre clic aquí para crear un novo Contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 #, fuzzy
 msgid ""
 "\n"
@@ -3212,15 +2990,415 @@ msgstr ""
 "\n"
 "Faga dobre clic aquí para crear un novo Contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 #, fuzzy
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: addressbook/gui/widgets/e-minicard.c:160
 #, fuzzy
-msgid "Column Width"
-msgstr "Colombia"
+msgid "Selected"
+msgstr "Eliminada"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Ordeamento das tarefas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Membros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Estonia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Nada"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Traballando"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+#, fuzzy
+msgid "Blog"
+msgstr "para sempre"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Xeral"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "_Posto de traballo:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Fax Particular"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Éxito"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "O cartafol `%s' non existe."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova Lista de Contactos"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "Tarxeta non atopada"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "O ID da Tarxeta xa existe"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocolo non soportado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "A autenticación fallou."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticación requirida"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Non existe a mensaxe"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Outro erro"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
+"fóra de servicio"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Esta versión de Evolution non ten soporte LDAP\n"
+"compilado nela. Se quere usar LDAP en Evolution\n"
+"debe compilar o programa desde as fontes do CVS\n"
+"logo de obter OpenLDAP desde o enlace de abaixo.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
+"fóra de servicio"
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Erro ao engadi-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Erro ao engadi-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Erro ao modifica-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Erro ao modifica-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Erro ao elimina-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Erro ao elimina-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s xa existe\n"
+"¿Quere sobrescribilo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+#, fuzzy
+msgid "Overwrite"
+msgstr "¿Sobrescribir ficheiro?"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+#, fuzzy
+msgid "list"
+msgstr "Brétema"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Seleccionar Contactos do Libro de Enderezos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Varias VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard de %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(ningún)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Correo Electrónico Principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Escolla unha Acción"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Engadir un enderezo a un contacto existente \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Buscando no Libro de Enderezos..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Editar Información de Contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Mestura-lo Enderezo de Correo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "non contén"
+msgstr[1] "non contén"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Amosa-las _Cabeceiras Completas"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Gardar como VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gardar no libro de enderezos"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3269,6 +3447,11 @@ msgstr "Compositor de correo de Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3280,11 +3463,6 @@ msgstr "Imprimi-los contactos seleccionados"
 msgid "Print contact"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
@@ -3471,6 +3649,23 @@ msgstr "Lista de _Contactos"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Non foi posible cargar %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Non se pode abrir o libro de enderezos"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3529,23 +3724,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Outro erro"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Non foi posible cargar %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Non se pode abrir o libro de enderezos"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -3566,41 +3744,374 @@ msgstr "Non se especificou un nome de cartafol"
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Non borrar"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Enviar máis _tarde"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "¿Está seguro de que quere borrar %d tarefas?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "¿Está seguro de que quere cancelar e borrar esta entrada de diario?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "¿Está seguro de que quere borrar %d entradas de diario?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "¿Está seguro de que quere borrar a cita `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "¿Está seguro de que quere borrar %d citas?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "¿Está seguro de que quere borrar a cita `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Cita"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "¿Quere gardar os cambios?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Imprimir tarxeta"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Gardar Mensaxe Como..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Compoñente do resumo executivo da axenda de Evolution."
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Contrasinal"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Non foi posible iniciar wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Non foi posible ler o bloque de aplicación da Axenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 #, fuzzy
 msgid "Default Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, 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:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
+
+#: 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:213
 #, fuzzy
 msgid "Starting:"
@@ -3690,11 +4201,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
@@ -3845,9 +4351,30 @@ msgstr ""
 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:50
+msgid "Summary contains"
+msgstr "O resumo contén"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "O comentario contén"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Non concorda"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3871,8 +4398,8 @@ msgid "Purge events older than"
 msgstr "é menor que"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "días"
 
@@ -3883,7 +4410,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3933,73 +4460,61 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
+msgid "Cale_ndar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
@@ -4029,27 +4544,6 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "O resumo contén"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "O comentario contén"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Non concorda"
-
 #: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4069,231 +4563,134 @@ msgstr "Permiso denegado"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opcións das Alarmas Sonoras"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opcións das Alarmas de Mensaxes"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Opcións das Alarmas de Correo"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opcións de Alarma do Programa"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opcións de Alarma Descoñecidas"
+msgid "<b>Alarm</b>\t"
+msgstr "información de axenda"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Repetición da Alarma"
+msgid "<b>Options</b>"
+msgstr "Descrición:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Visualización das _Mensaxes"
+msgid "<b>Repeat</b>"
+msgstr "Recordatorios"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "Corpo da Mensaxe"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Tocar un son:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repetir a alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Executar un programa:"
+msgid "Add Alarm"
+msgstr "Alarmas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "Enviar como:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Con estes argumentos:"
+msgid "Custom _message"
+msgstr "Compoñer unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
 #, fuzzy
-msgid "dialog1"
-msgstr "Amosar un diálogo"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "veces cada"
+msgid "Custom alarm sound"
+msgstr "Personaliza-las barras de tarefas"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "horas"
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Enga_dir"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Básico"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Hora:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Mensaxes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Tocar un son"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Recordatorio"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executar un programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Enviar como:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar unha mensaxe"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resumo:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Conta"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcións..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Executar un programa:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repetir a alarma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Sur"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "despois"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "día(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "fin da cita"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "veces cada"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutos"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Nome do estilo:"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "O método requirido para cargar `%s' non está soportado"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "P_echar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Novo Grupo..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Actualizar Lista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Enga_dir"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmas"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4411,7 +4808,7 @@ msgid "Free/Busy Publishing"
 msgstr "Petición de Libre/Ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Venres"
@@ -4425,7 +4822,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luns"
@@ -4436,7 +4833,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
@@ -4450,7 +4847,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
@@ -4465,7 +4862,7 @@ msgid "T_hu"
 msgstr "_Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Xoves"
@@ -4479,7 +4876,7 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Martes"
@@ -4489,7 +4886,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Mércores"
@@ -4524,7 +4921,8 @@ msgstr "_Comprimi-las fins de semana na vista mensual"
 msgid "_Day begins:"
 msgstr "_Amosar estacións:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4579,6 +4977,81 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Nome do estilo:"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "O método requirido para cargar `%s' non está soportado"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "P_echar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Escoller unha cor"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Novo Grupo..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Actualizar Lista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "semanas"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
@@ -4623,81 +5096,75 @@ msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Erro descoñecido: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Pendente "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Pendente "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Gardar como..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Pendente "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Pendente "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4766,8 +5233,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Libro de Enderezos..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Contactos..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4777,170 +5245,228 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 #, 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Información"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Hora de _comezo:"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Permiso denegado"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "antes da fin da cita"
+msgstr[1] "antes da fin da cita"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "fin da cita"
+msgstr[1] "fin da cita"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "antes da fin da cita"
+msgstr[1] "antes da fin da cita"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Evento de día comp_leto"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "antes da fin da cita"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Oc_upado"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "antes da fin da cita"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorías..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "antes da fin da cita"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "información de axenda"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Clasificación"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Data e Hora"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Confidencial"
+msgid "A_ll day event"
+msgstr "Evento de día comp_leto"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Data/Hora:"
+msgid "C_ustomize..."
+msgstr "Personalizar"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Lib_re"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorías..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
+msgid "Cale_ndar:"
+msgstr "Axenda"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Clasificación"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
+#, fuzzy
 msgid "L_ocation:"
 msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vado"
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privado"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pú_blico"
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Público"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:16
 #, fuzzy
-msgid "Show Time As"
+msgid "Show time as _busy"
 msgstr "Amosa-lo Tempo Coma"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmas"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descrición:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Hora de _finalización:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nada"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Debe estabrecerse un organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Borrar"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Elimina_r"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4979,36 +5505,45 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Tódolos Asistentes"
+msgid "<b>Attendees</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Engadir o Autor ao Libro de Enderezos"
+msgid "<b>Organizer</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Cambiar Organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "C_ontactos..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Cambiar Organizador"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizador:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5087,158 +5622,150 @@ msgstr "Illas Wallis e Futuna"
 msgid "All Instances"
 msgstr "Avanzado"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita contén recorrencias que Evolution non pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "o"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 #, fuzzy
 msgid "first"
 msgstr "Brétema"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "third"
 msgstr "Outro"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "fourth"
 msgstr "Norte"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 #, fuzzy
 msgid "last"
 msgstr "Brétema"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 #, fuzzy
 msgid "Other Date"
 msgstr "Outro Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "día"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "ocorrencias"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Hora:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Cada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Excepcións"
+msgid "<b>Exceptions</b>"
+msgstr "Descrición:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Previsualización:"
+msgid "<b>Preview</b>"
+msgstr "Previsualizar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Regra de Recorrencia"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Recorrencia _Personalizada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modificar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Se_n recorrencia"
+msgid "<b>Recurrence</b>"
+msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Elimina_r"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Recorrencia _simple"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Pechar esta cita"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "para"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "para sempre"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "ata"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Borrar este cartafol"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Completada "
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Mensaxe a Amosar"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% Completo"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Mensaxe a Amosar"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Completada"
 
@@ -5250,8 +5777,8 @@ msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "En Progreso"
@@ -5263,23 +5790,22 @@ msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Non Iniciada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "En Progreso"
+msgid "P_ercent complete:"
+msgstr "Porcentaxe completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5304,37 +5830,43 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Enderezo da páxina _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#, fuzzy
+msgid "Task"
+msgstr "_Tarefa"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Mensaxe a Amosar"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Mensaxe a Amosar"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrición:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Carta_fol:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5345,59 +5877,58 @@ msgstr "Data de _Inicio:"
 msgid "_Due date:"
 msgstr "_Data Límite"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Mala resposta de autenticación do servidor."
+msgid "_Group:"
+msgstr "Grupo"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Información de Libre/Ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Día"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Información de Libre/Ocupado"
+msgid "<b>Publishing _Location</b>"
+msgstr "Petición de Libre/Ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Petición de Libre/Ocupado"
+msgid "Free/Busy Editor"
+msgstr "Información de Libre/Ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Nome da lista:"
+msgid "_Daily"
+msgstr "Día"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Contrasinal:"
+#, fuzzy
+msgid "_Manual"
+msgstr "Xestor"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Contrasinal:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Lembrar este contrasinal"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome de _Usuario:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Semana"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5480,7 +6011,7 @@ msgstr "Servidor %s %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Prema para engadir unha tarefa"
@@ -5489,6 +6020,11 @@ msgstr "Prema para engadir unha tarefa"
 msgid "Untitled"
 msgstr "Sen título"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resumo:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5502,7 +6038,7 @@ msgstr "_Data Límite"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
@@ -5517,20 +6053,93 @@ msgstr "_Prioridade:"
 msgid "Web Page:"
 msgstr "Enderezo da páxina _Web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Público"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data Final"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privado"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Resumo"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A posición xeográfica ten que se introducir no formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Si"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Non"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recorrendo"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Asignada"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5577,100 +6186,106 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Asignar Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marca-las Tarefas como Completas"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Borrar"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Borra-las Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Gardar como..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Prema para engadir unha tarefa"
 
@@ -5679,185 +6294,116 @@ msgstr "Prema para engadir unha tarefa"
 msgid "% Complete"
 msgstr "% Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Completo"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Data Límite"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumo"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Movendo"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Copiando"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Seleccionar _Fío"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Eliminar..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_Copiar a un Cartafol..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover ó Cartafol.."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data Final"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Data de _Inicio:"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Recorrendo"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Asignada"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Si"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Non"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posición xeográfica ten que se introducir no formato: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5881,36 +6427,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisións de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisións de minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 #, fuzzy
@@ -5979,43 +6525,39 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
 #, fuzzy
-msgid "<b>Ends:</b> "
-msgstr "Hora do _final da reunión:"
+msgid "Starts"
+msgstr "Estado"
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:699
 #, fuzzy
-msgid "<b>Completed:</b> "
-msgstr "Completada "
+msgid "Ends"
+msgstr "2"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy
-msgid "<b>Due:</b> "
-msgstr "<b>Descrición:</b> %s"
+msgid "Due"
+msgstr "Pendente "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6023,323 +6565,299 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ningunha</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 #, fuzzy
 msgid "Location:"
 msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 #, 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:1465
+#: calendar/gui/e-itip-control.c:1478
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-#, 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:1852
-#, fuzzy
-msgid "Object could not be found\n"
-msgstr "¡Non se puido envia-lo elemento!\n"
-
-#: calendar/gui/e-itip-control.c:1855
-#, 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:1858
+#: calendar/gui/e-itip-control.c:1842
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1861
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "Enderezo do asistente"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -6368,6 +6886,10 @@ msgstr "Cargando Axenda"
 msgid "Loading calendar..."
 msgstr "Cargando axenda..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensaxe do Servidor:"
@@ -6384,11 +6906,6 @@ msgstr "data-comezo"
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Participantes Requiridos"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
@@ -6457,6 +6974,28 @@ msgstr "Delegado"
 msgid "In Process"
 msgstr "En Progreso"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
@@ -6465,225 +7004,120 @@ msgstr "Fóra da Oficina"
 msgid "No Information"
 msgstr "Sen Información"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Engadir o Autor ao Libro de Enderezos"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opcións"
+msgid "O_ptions"
+msgstr "Opcións"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Amosar _Só as Horas de Traballo"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Amozar sen _Zoom"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoescoller"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Tódalas Persoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Tódalas _Persoas e Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Persoas _Requiridas"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Hora do _inicio da reunión:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Hora do _final da reunión:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Abrindo armacenamento %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr "Erro ao iniciar %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Abrindo armacenamento %s"
+
+#: calendar/gui/e-tasks.c:962
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Actualizando..."
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, 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:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Tarefa"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -7031,11 +7465,6 @@ msgstr "Mes seleccionado (%b de %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2297
-#, fuzzy
-msgid "Task"
-msgstr "_Tarefa"
-
 #: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Status: %s"
@@ -7069,7 +7498,7 @@ msgid "Contacts: "
 msgstr "Co_ntactos:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
@@ -7098,7 +7527,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Non hai tarefas"
 msgstr[1] "Non hai tarefas"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7119,36 +7548,30 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crear unha nova tarefa"
@@ -8947,69 +9370,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sincronizando cartafoles"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analizar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir o cartafol spool"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sincronizando cartafol"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
@@ -9034,49 +9457,6 @@ msgstr "Argumentos non válidos"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, 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:1302
-#, 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:1416
-#, fuzzy
-msgid "Moving messages"
-msgstr "Copiando as mensaxes"
-
-#: camel/camel-folder.c:1416
-#, fuzzy
-msgid "Copying messages"
-msgstr "Copiando as mensaxes a %s"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Advertencia"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Recibindo %d mensaxe(s)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -9122,7 +9502,50 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, 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:1416
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiando as mensaxes"
+
+#: camel/camel-folder.c:1416
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiando as mensaxes a %s"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Advertencia"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Recibindo %d mensaxe(s)"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9130,44 +9553,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 #, 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:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9175,65 +9598,85 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mensaxe cifrada"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode lanza-lo axudante ao bloqueo: %s"
+
+#: 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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Non se puido bloquear '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9256,26 +9699,6 @@ msgstr "Non se puido obter un bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Non se pode lanza-lo axudante ao bloqueo: %s"
-
-#: 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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Non se puido bloquear '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9523,7 +9946,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -9607,57 +10030,57 @@ msgstr "Autorización POP antes de SMTP usando unha fonte non-pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Fallo na compilación da expresión regular: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de máquina"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte coa ruta"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fallo na búsqueda do nome: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Fallo na busca do servidor: %s: motivo descoñecido"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo descoñecido"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Fallo na busca do servidor: %s: servidor non atopado"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Fallo na busca do servidor: %s: motivo descoñecido"
@@ -9734,7 +10157,7 @@ msgstr "ID do certificado:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Non foi posible crear un contexto de descodificación S/MIME."
@@ -9835,7 +10258,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Engadir criterio"
 
 #: camel/camel-smime-context.c:651
@@ -9850,49 +10273,48 @@ msgstr "O comando IMAP fallou: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Non se puido atopa-lo certificado de \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Non se puido atopar un algoritmo bulk común."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Crear Reg_ra Dende Mensaxe"
+msgid "Cannot create CMS Message"
+msgstr "Non se pode abrir a mensaxe"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Non se pode abrir a mensaxe"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Non se pode abrir a mensaxe"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Non foi posible crear un contexto de descodificación S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9943,7 +10365,8 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
@@ -9952,8 +10375,8 @@ msgstr "Non foi posible renomear o cartafol: %s"
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "xuño"
@@ -10085,7 +10508,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10094,11 +10517,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -10120,7 +10543,7 @@ msgstr ""
 "¿Desexa aceptar de todas maneiras?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10135,35 +10558,35 @@ msgstr ""
 "\n"
 "¿Desexa aceptar de todas maneiras?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
@@ -10190,7 +10613,7 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -10211,8 +10634,8 @@ msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
@@ -10245,8 +10668,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10266,336 +10689,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Brétema espesa"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Resposta inesperada do servidor IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "O servidor desconectou inesperadamente"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Cartafoles"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Amosar só os cartafoles subscritos"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espacio de nomes"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Para ler e almacenar correo en servidores IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Servidor de SMTP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Servicio %s para %s en %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Non foi posible conectarse a %s (porto %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Erro enviando o nome de usuario: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Erro enviando o nome de usuario: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Non hai soporte para o mecanismo de autenticación solicitado."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Non foi posible autenticarse co servidor KPOP: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome do cartafol non pode conter o carácter Return."
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "_Compañía:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Non foi posible renomear o cartafol: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Non é posible obter o cartafol: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Resposta inesperada do servidor IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Non hai tarefas"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "O servidor desconectou inesperadamente"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10662,7 +10777,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10740,6 +10855,27 @@ msgstr ""
 msgid "Command:"
 msgstr "_Compañía:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Cartafoles"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Amosar só os cartafoles subscritos"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Espacio de nomes"
+
 #: 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"
@@ -10762,45 +10898,96 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Servidor de SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio %s para %s en %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Non foi posible conectarse a %s (porto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operación non soportada"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "A autenticación fallou."
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Non foi posible conectarse ó servidor: %s."
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticación %s solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10811,30 +10998,295 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "O nome do cartafol non pode conter o carácter Return."
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Para ler e almacenar correo en servidores IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Non hai soporte para o mecanismo de autenticación solicitado."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "_Compañía:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Non hai tarefas"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "O servidor desconectou inesperadamente"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -11004,19 +11456,27 @@ msgstr "Non foi posible carga-lo resumo de %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de engadir a mensaxe ao resumo: motivo descoñecido"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Entrada"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Fallo na mensaxe %d"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -11032,48 +11492,48 @@ msgstr ""
 "Non é posible obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non válido"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "O cartafol `%s' non existe."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Non foi posible borrar o cartafol `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11678,22 +12138,27 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Non foi posible conectarse ó servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11702,28 +12167,28 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Non hai soporte para o mecanismo de autenticación solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11732,7 +12197,16 @@ msgstr ""
 "Non foi posible conectarse ó servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o contrasinal: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
@@ -11959,98 +12433,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vía %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Non se pode enviar a mensaxe: enderezo do autor non definido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Saúdo SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao crear o obxecto de autenticación SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Mala resposta de autenticación do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "A petición MAIL FROM expirou: %s: correo non enviado"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Erro na resposta RCPT TO: %s: correo non enviado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Erro na resposta DATA: %s: correo non enviado"
@@ -12058,28 +12532,28 @@ msgstr "Erro na resposta DATA: %s: correo non enviado"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "O comando IMAP fallou: %s"
@@ -12144,98 +12618,6 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Non foi posible recibir a mensaxe do editor"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mensaxe Sen Título)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-#, fuzzy
-msgid "Signature:"
-msgstr "Gravar sinatura"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Compoñer unha mensaxe"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Non foi posible crear a fiestra do compositor, porque aínda\n"
-"non configurou ningunha identidade no compoñente de correo."
-
-#: composer/e-msg-composer.c:3279
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -12321,17 +12703,91 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mensaxe Sen Título)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Gravar sinatura"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Compoñer unha mensaxe"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mensaxe remitida - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Anexar un ficheiro á mensaxe"
+msgstr[1] "Anexar un ficheiro á mensaxe"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Anexar un ficheiro á mensaxe"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12349,37 +12805,51 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Seguinte Mensaxe Sen Ler"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "¿Quere gardar os cambios?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Non eliminar"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Eliminar"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
@@ -12387,19 +12857,19 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Erro ao gardar os atallos."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mensaxe Remitida"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12407,63 +12877,74 @@ msgid ""
 msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Imprimir tarxeta"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Gardar Mensaxe Como..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Non foi posible crear unha canalización: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 #, fuzzy
 msgid "All accounts have been removed."
 msgstr "Cada conta ten que ter un nome diferente."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
+msgstr "Non foi posible crear a fiestra do compositor."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Non foi posible crear a fiestra do compositor, porque aínda\n"
+"non configurou ningunha identidade no compoñente de correo."
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12773,11 +13254,6 @@ msgstr "%a %d %b %Y"
 msgid "Select a time to compare against"
 msgstr "Seleccionar un Fuso Horario"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Regras de Filtrado"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12808,20 +13284,8 @@ msgstr "Nome do estilo:"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Resumindo cartafol"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "Nome do estilo:"
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12829,165 +13293,39 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Asignación"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Cambiar o nome deste cartafol"
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Non se seleccionou ningún servidor"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 #, fuzzy
 msgid "Choose a file"
 msgstr "Escolla unha Acción"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Descrición:</b> %s"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Seleccionar Cartafol"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Regras de Filtrado"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Fontes de CartafolV"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Comparar con"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Entrante"
-
-#: filter/filter.glade.h:6
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"A data da mensaxe hase comparar co momento\n"
-"que especifique aquí."
-
-#: filter/filter.glade.h:8
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"A data da mensaxe hase comparar cun momento\n"
-"relativo a cando se execute o filtro;\n"
-"\"hai unha semana\" por exemplo."
-
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"A data da mensaxe hase comparar co momento\n"
-"que especifique aquí."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "unha hora relativa á hora actual"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "atrás"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meses"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "cartafoles específicos namais"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "a hora actual"
-
-#: filter/filter.glade.h:22
-#, fuzzy
-msgid "the time you specify"
-msgstr "unha hora que especifique"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "con todos os cartafoles remotos activos"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "con todos os cartafoles locais e cos remotos activos"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "con todos os cartafoles locais"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "anos"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
@@ -13060,6 +13398,76 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saínte"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Regras de Filtrado"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparar con"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Entrante"
+
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensaxe hase comparar co momento\n"
+"que especifique aquí."
+
+#: filter/filter.glade.h:6
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensaxe hase comparar cun momento\n"
+"relativo a cando se execute o filtro;\n"
+"\"hai unha semana\" por exemplo."
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensaxe hase comparar co momento\n"
+"que especifique aquí."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "unha hora relativa á hora actual"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "atrás"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundos"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "a hora actual"
+
+#: filter/filter.glade.h:19
+#, fuzzy
+msgid "the time you specify"
+msgstr "unha hora que especifique"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "anos"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Engadir Regra"
@@ -13073,61 +13481,79 @@ msgstr "Editar Regra"
 msgid "Rule name"
 msgstr "Nome da regra: "
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Regras de Puntuación"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "O corpo contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "O corpo non contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "O corpo ou o asunto contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "A mensaxe contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Os destinatarios conteñen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "O autor contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Compositor de correo de Evolution."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "O asunto contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Compositor de correo de Evolution."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "O asunto non contén"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Cartafoles Virtuais"
+msgid "Evolution Mail preferences control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Engadir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Correo"
 
-#: filter/vfolder-rule.c:573
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "VFolder source"
-msgstr "Fontes de CartafolV"
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Correo"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -13166,52 +13592,326 @@ msgstr "Borrar todo agás a sinatura"
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Regras de Filtrado"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Seleccionar Cartafol"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Asignar Puntuación"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Asignar Cor"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Asignar Puntuación"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Belice"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contén"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copiar ó Cartafol"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Data de recepción"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Data de envío"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Eliminada"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "non contén"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "non remata en"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "non existe"
+
+#: mail/em-filter-i18n.h:16
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
+msgid "does not return"
+msgstr "non existe"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "non soa como"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "non comeza por"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Non Existe"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Borrador"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "remata en"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existe"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expresión"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "é"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "foi posterior a"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "foi anterior a"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcada"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "é maior que"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "é menor que"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "non é"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcada"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "xuño"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Lista de Correo"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Cabeceira da Mensaxe"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Enviouse a mensaxe"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Mensaxe %s non atopada."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Mover a un Cartafol"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Saír do programa"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Tocar un son:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Ler"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinatarios"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Busca por Expresión Regular"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Respondido a"
+
+#: mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "returns"
+msgstr "Ocupado"
+
+#: mail/em-filter-i18n.h:51
+#, fuzzy
+msgid "returns greater than"
+msgstr "é maior que"
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "é menor que"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Executar un programa:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuación"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Autor"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Establecer Estado"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamaño (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "soa como"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Conta Fonte"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Cabeceira específica"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "comeza por"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Parar o Procesamento"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Asunto"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Establecer Estado"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: mail/em-folder-browser.c:129
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
-msgstr "Propiedades"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+msgid "Folder Properties"
 msgstr "Propiedades"
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "Nome do cartafol:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Mensaxe de axuda"
+msgstr[1] "Mensaxe de axuda"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Mensaxe de axuda"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Seguinte Mensaxe Sen Ler"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Seguinte Mensaxe Sen Ler"
+msgstr[1] "Seguinte Mensaxe Sen Ler"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -13222,432 +13922,453 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Previsualizar"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "CartafolesV"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+#, fuzzy
+msgid "Loading..."
+msgstr "Agardando..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cancelar Tarefa"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vista"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Copiar..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Mover..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Renomear"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propiedades..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "CartafolesV"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Entrada"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Renomear..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 #, fuzzy
-msgid "Loading..."
-msgstr "Agardando..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Correo"
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marcar como _Lida"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regras de Filtrado"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Aparicións:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Responder-A"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignada"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
+#: mail/em-format-html-display.c:642
 #, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Asunto"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexo"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+msgid "Unencrypted"
+msgstr "Indefinida"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
-
-#: mail/em-format.c:1298
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "O usuario cancelou a operación."
+msgid "Encrypted, weak"
+msgstr "Mensaxe cifrada"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Recibindo a mensaxe %s"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
 #, fuzzy
-msgid "Unsigned"
-msgstr "Asignada"
+msgid "Encrypted, strong"
+msgstr "Mensaxe cifrada"
+
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Valid signature"
-msgstr "Engadir criterio"
+msgid "_View Certificate"
+msgstr "ID do certificado:"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Engadir criterio"
+msgid "This certificate is not viewable"
+msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1012
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Indefinida"
+msgid "Overdue:"
+msgstr "Tarefas _retrasadas:"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Encrypted, weak"
-msgstr "Mensaxe cifrada"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1085
 #, fuzzy
-msgid "Encrypted"
-msgstr "Cifrar con PGP"
+msgid "_View Inline"
+msgstr "Ver Inline"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Mensaxe cifrada"
+msgid "_Hide"
+msgstr "Agochar"
+
+#: mail/em-format-html-print.c:130
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Recibindo a mensaxe %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
@@ -13683,9 +14404,36 @@ msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Responder-A"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Bcc"
+msgstr "Bcc:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13702,111 +14450,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Aparicións:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "ID do certificado:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s anexo"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Esta mensaxe non está dispoñible actualmente."
+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:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:1015
-#, fuzzy
-msgid "Overdue:"
-msgstr "Tarefas _retrasadas:"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+msgid "Unsupported signature format"
+msgstr "O usuario cancelou a operación."
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Ver Inline"
+msgid "Error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Agochar"
-
-#: mail/em-format-html-print.c:126
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
+msgid "Unknown error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13924,7 +14608,7 @@ msgstr "Enviar unha _mensaxe á lista..."
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -13939,7 +14623,7 @@ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Cartafol"
 
@@ -13976,11 +14660,25 @@ msgid "Add address"
 msgstr "_Enderezo:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mensaxe de %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Cartafoles Virtuais"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Engadir"
+
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "Fontes de CartafolV"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14474,72 +15172,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferencias da Axenda"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
+msgid "Evolution Pine importer"
+msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Contas"
+msgid "Evolution mbox importer"
+msgstr "Compositor de correo de Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferencias da Axenda"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Correo"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14601,38 +15264,6 @@ msgstr "Importando"
 msgid "Importing mailbox"
 msgstr "Importando"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14784,81 +15415,87 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d seleccionada(s)"
+msgid_plural "%d deleted"
+msgstr[0] "%d seleccionada(s)"
+msgstr[1] "%d seleccionada(s)"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d sen enviar"
+msgid_plural "%d junk"
+msgstr[0] "%d sen enviar"
+msgstr[1] "%d sen enviar"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Borrador"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Borrador"
+msgstr[1] "Borrador"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d sen enviar"
+msgid_plural "%d sent"
+msgstr[0] "%d sen enviar"
+msgstr[1] "%d sen enviar"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d sen enviar"
+msgid_plural "%d unsent"
+msgstr[0] "%d sen enviar"
+msgstr[1] "%d sen enviar"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d sen enviar"
+msgid_plural ", %d unread"
+msgstr[0] "%d sen enviar"
+msgstr[1] "%d sen enviar"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Comprobando Servicio"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
@@ -14930,16 +15567,23 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Comprobando Servicio"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Previsualizar"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -15219,7 +15863,7 @@ msgstr "Non se pode abrir a mensaxe"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Feito"
 
@@ -15599,6 +16243,122 @@ msgstr " cor"
 msgid "description"
 msgstr "descrición"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Fontes de CartafolV"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Aceptado"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Completada"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Distinguir Maiúsculas"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Buscar na Mensaxe"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Buscar:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Xestionar Subscripcións"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Eliminada"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "Nome do _Servidor:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Información da Fonte"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Contas"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Pendente "
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nome do ficheiro:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscribir"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Desubscribir"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "cartafoles específicos namais"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "con todos os cartafoles remotos activos"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "con todos os cartafoles locais e cos remotos activos"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "con todos os cartafoles locais"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15804,14 +16564,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15918,8 +16670,11 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15971,8 +16726,9 @@ msgstr "Non foi posible renomear o cartafol: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "non contén"
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -16001,8 +16757,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Non borrar"
+msgstr "_Recuperar"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -16030,8 +16787,9 @@ msgstr ""
 
 #. mail:ask-signature-changed title
 #: mail/mail-errors.xml.h:179
+#, fuzzy
 msgid "Discard changed?"
-msgstr ""
+msgstr "Imprimir tarxeta"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
@@ -16049,8 +16807,9 @@ msgstr ""
 "¿Desexa gardar os cambios?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "Imprimir tarxeta"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -16067,8 +16826,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -16102,13 +16864,45 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Resumindo cartafol"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "Nome do estilo:"
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Cambiar o nome deste cartafol"
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Non se seleccionou ningún servidor"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -16116,16 +16910,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Abrir"
@@ -16285,7 +17079,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16294,46 +17088,21 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Distinguir Maiúsculas"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Buscar na Mensaxe"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Buscar:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Información da Fonte"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelando..."
@@ -16371,25 +17140,25 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16448,17 +17217,17 @@ msgstr "Examinando os cartafoles en \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
@@ -16522,7 +17291,7 @@ msgstr "O %d de %B ás %k:%M"
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -16584,10 +17353,6 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Ler"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -16601,53 +17366,52 @@ msgstr "Responder a Todos"
 msgid "Review"
 msgstr "Previsualizar"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "O corpo contén"
 
-#: mail/message-tags.glade.h:2
-#, fuzzy
-msgid "C_ompleted"
-msgstr "Completada"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "O corpo non contén"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "O corpo ou o asunto contén"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Pendente "
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "A mensaxe contén"
 
-#: mail/message-tags.glade.h:7
-#, fuzzy
-msgid "_Flag:"
-msgstr "Nome do ficheiro:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Os destinatarios conteñen"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Xestionar Subscripcións"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "O autor contén"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Eliminada"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "O asunto contén"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "O asunto non contén"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "Nome do _Servidor:"
+msgid "Evolution Shell"
+msgstr "O shell de Evolution."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscribir"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Desubscribir"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Compositor de correo de Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16716,31 +17480,19 @@ msgstr ""
 msgid "mail"
 msgstr "Correo Electrónico"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d de %b"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Erro descoñecido"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentos non válidos"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Non se pode rexistrar en OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Conexións activas"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Non se atopou a Base de Datos de configuracións"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Conexións activas"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Erro xenérico"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16926,26 +17678,6 @@ msgstr "O nome do cartafol non pode conter o carácter Return."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolucion está conectado. Prema neste botón para desconectar."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution está desconectándose"
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado. Prema neste botón para conectar."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mensaxe para %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16964,126 +17696,93 @@ msgstr "Non foi posible executar o Bug buddy."
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupo"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chile"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novo"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Nova Tarefa"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Proba"
-
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Crear unha nova tarefa"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Conexións activas"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolucion está conectado. Prema neste botón para desconectar."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Active Connections"
-msgstr "Conexións activas"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está desconectándose"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "C_alendar:"
-msgstr "Axenda"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution está desconectado. Prema neste botón para conectar."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Co_ntactos:"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mensaxe para %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "_Correo"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d de %b"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Tasks:"
-msgstr "Tarefas"
+msgid "Uknown system error."
+msgstr "Erro descoñecido"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "Tipo do cartafol:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentos non válidos"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "Crear un _Novo Cartafol..."
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Non se pode rexistrar en OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "Conta"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "Nome do cartafol:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Erro xenérico"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "Nome de _Usuario:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de Importación de Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Importando"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuso horario "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -17092,7 +17791,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -17100,20 +17799,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "O shell de Evolution."
+msgid "New Test"
+msgstr "Nova Tarefa"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Compositor de correo de Evolution."
+msgid "Create a new test item"
+msgstr "Crear unha nova tarefa"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -17181,7 +17880,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17213,7 +17912,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17222,42 +17921,42 @@ msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:500
+#: shell/main.c:465
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17330,6 +18029,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17599,6 +18320,12 @@ msgstr "ID do certificado:"
 msgid "_Edit CA Trust"
 msgstr "Editar Tarefa"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "O ID da Tarxeta xa existe"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17831,12 +18558,6 @@ msgstr "O asunto é %s"
 msgid "Certificate Signature Value"
 msgstr "Ficheiro de sinatura:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "O ID da Tarxeta xa existe"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17988,8 +18709,8 @@ msgstr "a hora actual"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Accións"
@@ -18494,16 +19215,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:5
-msgid "Close this window"
-msgstr "Pechar esta fiestra"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Pechar"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18941,6 +19652,16 @@ msgstr "_Ferramentas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Pechar esta fiestra"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Pechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -19025,10 +19746,6 @@ msgstr "Gardar o ficheiro actual cun nome diferente"
 msgid "Save the message in a specified folder"
 msgstr "Gardar a mensaxe nun cartafol específico"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Enviar"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19639,7 +20356,7 @@ msgid "Evolution Query"
 msgstr "Compositor de correo de Evolution."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19810,34 +20527,295 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
 #, fuzzy
-#~ msgid "Failed to connect to LDAP server"
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Mala resposta de autenticación do servidor."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Nome da lista:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "editor-de-contactos"
+
+#, fuzzy
+#~ msgid "Save List as VCard"
+#~ msgstr "Gardar como VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Grupo"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Non foi posible iniciar wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Axenda"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opcións das Alarmas Sonoras"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opcións das Alarmas de Mensaxes"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opcións das Alarmas de Correo"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opcións de Alarma do Programa"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opcións de Alarma Descoñecidas"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetición da Alarma"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Visualización das _Mensaxes"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "Corpo da Mensaxe"
+
+#~ msgid "Play sound:"
+#~ msgstr "Tocar un son:"
+
+#~ msgid "Run program:"
+#~ msgstr "Executar un programa:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Con estes argumentos:"
+
+#~ msgid "Basics"
+#~ msgstr "Básico"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Hora:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Recordatorio"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opcións..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Libro de Enderezos..."
+
+#~ msgid "Reminder"
+#~ msgstr "Recordatorio"
+
+#~ msgid "B_usy"
+#~ msgstr "Oc_upado"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Confidencial"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Data/Hora:"
+
+#~ msgid "F_ree"
+#~ msgstr "Lib_re"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vado"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pú_blico"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Tódolos Asistentes"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Engadir o Autor ao Libro de Enderezos"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Excepcións"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Previsualización:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regra de Recorrencia"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Recorrencia _Personalizada"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modificar"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Se_n recorrencia"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Recorrencia _simple"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% Completo"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "En Progreso"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidencial"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Carta_fol:"
+
+#, fuzzy
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "Hora do _final da reunión:"
+
+#, fuzzy
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "Completada "
+
+#, fuzzy
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Descrición:</b> %s"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ningunha</i>"
+
+#, fuzzy
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Houbo un erro ao descarga-la fonte de novas"
+
+#, fuzzy
+#~ msgid "Object could not be found\n"
+#~ msgstr "¡Non se puido envia-lo elemento!\n"
+
+#, fuzzy
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Non foi posible abrir o cartafol en `%s'"
+
+#, fuzzy
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Enderezo do asistente"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Engadir o Autor ao Libro de Enderezos"
+
+#~ msgid "_Options"
+#~ msgstr "_Opcións"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Hora do _inicio da reunión:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Hora do _final da reunión:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr "Erro ao iniciar %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Non se puido atopa-lo certificado de \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Crear Reg_ra Dende Mensaxe"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Non foi posible crear un contexto de descodificación S/MIME."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
 #~ msgstr ""
-#~ "Non foi posible autenticarse co servidor IMAP.\n"
-#~ "%s\n"
-#~ "\n"
+#~ "Non foi posible crear a fiestra do compositor, porque aínda\n"
+#~ "non configurou ningunha identidade no compoñente de correo."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Regras de Puntuación"
 
 #, fuzzy
-#~ msgid "Failed to authenticate with LDAP server"
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Nome do cartafol:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Renomear"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propiedades..."
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "C_alendar:"
+#~ msgstr "Axenda"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Co_ntactos:"
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "_Correo"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "Tarefas"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Tipo do cartafol:"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Crear un _Novo Cartafol..."
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "Nome do cartafol:"
+
+#, fuzzy
+#~ msgid "_User:"
+#~ msgstr "Nome de _Usuario:"
+
+#, fuzzy
+#~ msgid "Failed to connect to LDAP server"
 #~ msgstr ""
 #~ "Non foi posible autenticarse co servidor IMAP.\n"
 #~ "%s\n"
 #~ "\n"
 
 #, fuzzy
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
-
-#, fuzzy
 #~ msgid "Error retrieving schema information"
 #~ msgstr ""
 #~ "Erro ao cargar a información do filtro:\n"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
-
-#, fuzzy
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "Dete_ctar tipos soportados "
 
@@ -19910,10 +20888,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Webcam:"
 #~ msgstr "Páxina"
 
-#, fuzzy
-#~ msgid "Category editor not available."
-#~ msgstr "Non hai unha descrición dispoñible."
-
 #~ msgid "Could not find widget for a field: `%s'"
 #~ msgstr "Non se puido atopa-lo control dun campo: `%s'"
 
@@ -19948,51 +20922,18 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Source URL:"
 #~ msgstr "URI da Fonte POP"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
-
 #~ msgid "Are you sure you want to cancel and delete this task?"
 #~ msgstr "¿Está seguro de que quere cancelar e borrar esta tarefa?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "¿Está seguro de que quere borrar a cita `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "¿Está seguro de que quere borrar %d citas?"
-#~ msgstr[1] "¿Está seguro de que quere borrar %d citas?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "¿Está seguro de que quere borrar %d tarefas?"
-#~ msgstr[1] "¿Está seguro de que quere borrar %d tarefas?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "¿Está seguro de que quere borrar %d entradas de diario?"
-#~ msgstr[1] "¿Está seguro de que quere borrar %d entradas de diario?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Convidar Outros..."
 
@@ -20056,188 +20997,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Erro descoñecido: %s"
 
-#, fuzzy
-#~ msgid "Adjust Score"
-#~ msgstr "Asignar Puntuación"
-
-#~ msgid "Assign Color"
-#~ msgstr "Asignar Cor"
-
-#~ msgid "Assign Score"
-#~ msgstr "Asignar Puntuación"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#, fuzzy
-#~ msgid "Beep"
-#~ msgstr "Belice"
-
-#~ msgid "contains"
-#~ msgstr "contén"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copiar ó Cartafol"
-
-#~ msgid "Date received"
-#~ msgstr "Data de recepción"
-
-#~ msgid "Date sent"
-#~ msgstr "Data de envío"
-
-#~ msgid "Deleted"
-#~ msgstr "Eliminada"
-
-#~ msgid "does not contain"
-#~ msgstr "non contén"
-
-#~ msgid "does not end with"
-#~ msgstr "non remata en"
-
-#~ msgid "does not exist"
-#~ msgstr "non existe"
-
-#, fuzzy
-#~ msgid "does not return"
-#~ msgstr "non existe"
-
-#~ msgid "does not sound like"
-#~ msgstr "non soa como"
-
-#~ msgid "does not start with"
-#~ msgstr "non comeza por"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Non Existe"
-
-#~ msgid "Draft"
-#~ msgstr "Borrador"
-
-#~ msgid "ends with"
-#~ msgstr "remata en"
-
-#~ msgid "Exist"
-#~ msgstr "Existe"
-
-#~ msgid "exists"
-#~ msgstr "existe"
-
-#~ msgid "Expression"
-#~ msgstr "Expresión"
-
-#~ msgid "is"
-#~ msgstr "é"
-
-#, fuzzy
-#~ msgid "is after"
-#~ msgstr "foi posterior a"
-
-#, fuzzy
-#~ msgid "is before"
-#~ msgstr "foi anterior a"
-
-#, fuzzy
-#~ msgid "is Flagged"
-#~ msgstr "Marcada"
-
-#~ msgid "is greater than"
-#~ msgstr "é maior que"
-
-#~ msgid "is less than"
-#~ msgstr "é menor que"
-
-#~ msgid "is not"
-#~ msgstr "non é"
-
-#, fuzzy
-#~ msgid "is not Flagged"
-#~ msgstr "Marcada"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "xuño"
-
-#~ msgid "Mailing list"
-#~ msgstr "Lista de Correo"
-
-#~ msgid "Message Body"
-#~ msgstr "Corpo da Mensaxe"
-
-#~ msgid "Message Header"
-#~ msgstr "Cabeceira da Mensaxe"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Enviouse a mensaxe"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Mensaxe %s non atopada."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Mover a un Cartafol"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Saír do programa"
-
-#, fuzzy
-#~ msgid "Play Sound"
-#~ msgstr "Tocar un son:"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinatarios"
-
-#~ msgid "Regex Match"
-#~ msgstr "Busca por Expresión Regular"
-
-#~ msgid "Replied to"
-#~ msgstr "Respondido a"
-
-#, fuzzy
-#~ msgid "returns"
-#~ msgstr "Ocupado"
-
-#, fuzzy
-#~ msgid "returns greater than"
-#~ msgstr "é maior que"
-
-#, fuzzy
-#~ msgid "returns less than"
-#~ msgstr "é menor que"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Executar un programa:"
-
-#~ msgid "Sender"
-#~ msgstr "Autor"
-
-#~ msgid "Set Status"
-#~ msgstr "Establecer Estado"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamaño (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "soa como"
-
-#~ msgid "Source Account"
-#~ msgstr "Conta Fonte"
-
-#~ msgid "Specific header"
-#~ msgstr "Cabeceira específica"
-
-#~ msgid "starts with"
-#~ msgstr "comeza por"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Parar o Procesamento"
-
-#, fuzzy
-#~ msgid "Unset Status"
-#~ msgstr "Establecer Estado"
-
 #~ msgid "Working"
 #~ msgstr "Traballando"
 
@@ -20417,10 +21176,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "B_uscar"
 
 #, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Grupo"
-
-#, fuzzy
 #~ msgid "Step 3: Connecting to Server"
 #~ msgstr "Conectando ao servidor..."
 
@@ -20812,9 +21567,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "component"
 #~ msgstr "Cita"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmas"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Posición Xeográfica"
 
@@ -21424,10 +22176,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Non foi posible crear o directorio %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Seleccionar Contactos do Libro de Enderezos"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "_Aniversario:"
 
@@ -21472,22 +22220,10 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "información de axenda"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificación"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Data e Hora"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Descrición:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Resumo:</b> %s<br><br>"
 
@@ -21920,10 +22656,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Eliminando as tarxetas..."
 
 #, fuzzy
-#~ msgid "Error performing search"
-#~ msgstr "Erro ao elimina-la tarxeta"
-
-#, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Repositorio desconectado"
 
@@ -22060,10 +22792,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Compoñente do resumo executivo da axenda de Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
@@ -22160,9 +22888,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Use Score"
 #~ msgstr "Puntuación"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Non foi posible cargar o cursor\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Cartafol que contén información de contacto"
 
@@ -24645,10 +25370,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Malta"
 
 #, fuzzy
-#~ msgid "Managua"
-#~ msgstr "Xestor"
-
-#, fuzzy
 #~ msgid "Manassas"
 #~ msgstr "Malaisia"
 
@@ -26165,10 +26886,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Sureste"
 
 #, fuzzy
-#~ msgid "Southend"
-#~ msgstr "Sur"
-
-#, fuzzy
 #~ msgid "South Marsh Island"
 #~ msgstr "Illas Marshall"
 
@@ -27779,9 +28496,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "View the selected folder"
 #~ msgstr "Ver o cartafol seleccionado"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Copiar..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Barra de _Cartafoles"
 
@@ -27792,9 +28506,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Ir ó Cartafol..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Mover..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Novo Cartafol"
 
@@ -27802,9 +28513,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Crear un _Novo Cartafol..."
 
-#~ msgid "_Rename..."
-#~ msgstr "_Renomear..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Barra de _Atallos"
 
@@ -27812,9 +28520,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Shortcut..."
 #~ msgstr "_Atallo"
 
-#~ msgid "Information"
-#~ msgstr "Información"
-
 #~ msgid "Error"
 #~ msgstr "Erro"
 
@@ -27912,9 +28617,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Crear un _Novo Cartafol..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contactos..."
-
 #, fuzzy
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Fábrica para importar ficheiros VCard a Evolution."
@@ -27996,10 +28698,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Opcións por defecto"
 
 #, fuzzy
-#~ msgid "Select"
-#~ msgstr "Seleccionar Todo"
-
-#, fuzzy
 #~ msgid "_Add Mapping"
 #~ msgstr "Engadir acción"
 
@@ -28052,9 +28750,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Unnamed Contact List"
 #~ msgstr "Contacto Sen Nome"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontactos..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Tipos de Teléfono"
 
@@ -28110,10 +28805,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "1"
 
 #, fuzzy
-#~ msgid "nd"
-#~ msgstr "2"
-
-#, fuzzy
 #~ msgid "rd"
 #~ msgstr "3"
 
@@ -28541,10 +29232,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Hora do _final da reunión:"
 
 #, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Información de Libre/Ocupado"
-
-#, fuzzy
 #~ msgid "Task Completed: <b>"
 #~ msgstr " (Completada "
 
@@ -28653,9 +29340,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Send _Later"
 #~ msgstr "Enviar máis _Tarde"
 
-#~ msgid "Send _later"
-#~ msgstr "Enviar máis _tarde"
-
 #, fuzzy
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Preferencias de Correo..."
@@ -28664,12 +29348,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Fábrica para o compoñente Libro de Enderezos de Evolution."
 
-#, fuzzy
-#~ msgid "Could not query for schema information"
-#~ msgstr ""
-#~ "Información de traza opaca non válida:\n"
-#~ "%s"
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Fábrica para o compoñente Resume da Axenda."
 
@@ -28784,12 +29462,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Could not create a PGP decryption context."
 #~ msgstr "Non foi posible crear un contexto de descifrado PGP."
 
-#~ msgid "Moving"
-#~ msgstr "Movendo"
-
-#~ msgid "Copying"
-#~ msgstr "Copiando"
-
 #, fuzzy
 #~ msgid "Signature name:"
 #~ msgstr "Ficheiro de sinatura:"
@@ -29102,9 +29774,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr ""
 #~ "Non foi posible abrir o cartafol: o listado de mensaxes era incompleto."
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
-
 #~ msgid ""
 #~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
 #~ "it."
@@ -29341,9 +30010,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Cannot summarise folder: %s: %s"
 #~ msgstr "Non é posible resumir o cartafol: %s: %s"
 
-#~ msgid "Could not create composer window."
-#~ msgstr "Non foi posible crear a fiestra do compositor."
-
 #, fuzzy
 #~ msgid "GnomeCard:"
 #~ msgstr "Tarxeta: "
@@ -29873,9 +30539,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Open %s with the default GNOME web browser"
 #~ msgstr "Abrir %s co navegador web por defecto de GNOME"
 
-#~ msgid "Send an email to %s"
-#~ msgstr "Enviar unha mensaxe a %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Executar %s"
 
@@ -30031,9 +30694,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Chec_k Names (FIXME)"
 #~ msgstr "Comproba_r Nomes (AMÁÑAME)"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Pechar esta cita"
-
 #~ msgid "Cop_y to Folder... (FIXME)"
 #~ msgstr "Cop_iar ao Cartafol... (AMÁÑAME)"
 
@@ -30218,9 +30878,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Personali_zar Barras de Tarefas..."
 
-#~ msgid "Customize toolbars"
-#~ msgstr "Personaliza-las barras de tarefas"
-
 #~ msgid "Evolution bar _shortcut"
 #~ msgstr "_Atallo da barra de Evolution"
 
diff --git a/po/hr.po b/po/hr.po
index b97a39e22d..7b25ce5c95 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-29 00:45+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -49,34 +41,251 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Unos nije mogao biti poslan!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Neuspjela prijava na LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Server je odgovorio nepodržanim bazama za pretragu"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Ne mogu učitati adresar"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Uređivač kategorija nije dostupan."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Spremi u adresaru"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Greška kod učitavanja inicijalnog adresara."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Nisam mogao da prođem kroz mapu sa redom"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Želite li spremiti promjene?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "Unesi novi kontakt"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nije moguća analiza sadržaja poruke"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Greška prilikom dodavanja kontakta"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Preglednik adresa Evolution adresara"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Uobičajena adresa za sinhroniziranje:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Ne mogu učitati adresar"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao pročitati programski blok adresa pilota"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Neuspjela prijava.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automatsko dovršavanje"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesite zaporku za %s (korisnik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Potvrde"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Ovdje podesite automatsko nadopunjavanje"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Iskačući prozor za adrese Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Dio Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime kontrola za upravljanje certifikatima"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola podešavanja postavki Evolucija direktorija"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Upravljanje vašim S/Mime certifikatima"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -109,7 +318,7 @@ msgstr "Novi kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakti:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,15 +342,15 @@ msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na ovom računalu"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -150,19 +359,19 @@ msgid "Personal"
 msgstr "Osobni podaci"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Na LDAP poslužiteljima"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Postavke automatskog dopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -174,7 +383,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -186,7 +395,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -198,7 +407,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -210,36 +419,45 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Postavke..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupam LDAP serveru"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Neuspjela prijava.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -261,61 +479,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Automatsko dovršavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Potvrde"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Ovdje podesite automatsko nadopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iskačući prozor za adrese Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Dio Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime kontrola za upravljanje certifikatima"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola podešavanja postavki Evolucija direktorija"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Upravljanje vašim S/Mime certifikatima"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -323,7 +486,7 @@ msgstr "Upravljanje vašim S/Mime certifikatima"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -332,8 +495,7 @@ msgstr "Upravljanje vašim S/Mime certifikatima"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -359,6 +521,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "SMTP prijava"
@@ -407,13 +570,11 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
@@ -669,33 +830,26 @@ msgid "cards"
 msgstr "karte"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Odabir kontakata iz adresara"
+#: 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 Evolution adresara"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Ukloni sve"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ukloni"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ukloni sve"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Pogledaj kontakt popis"
@@ -710,7 +864,7 @@ msgid "Send HTML Mail?"
 msgstr "Pošalji HTML poruku?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj kontaktima"
 
@@ -718,15 +872,22 @@ msgstr "Dodaj kontaktima"
 msgid "Unnamed Contact"
 msgstr "&Novi 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Izvor"
 
-#: 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 Evolution adresara"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Odabir kontakata iz adresara"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -748,6 +909,11 @@ msgstr "K_ategorija:"
 msgid "_Find"
 msgstr "_Nađi"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_&Traži"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -793,9 +959,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Ako</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -820,7 +985,6 @@ msgid "Birthday:"
 msgstr "_Rođendan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -835,15 +999,15 @@ msgid "Company:"
 msgstr "Naredba:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -952,8 +1116,8 @@ msgstr "_Web stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -975,44 +1139,28 @@ msgid "_File under:"
 msgstr "Ime trake:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Poslužitelj:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ovaj kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Može se uređivati"
 
@@ -1984,132 +2132,124 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "Grupa"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Servis"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Lokacija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Korisničko ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Polazno"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Ostalo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Grupa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Datum povratka nije ispravan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Neispravni potpis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Servis"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Lokacija"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
@@ -2127,6 +2267,22 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_Adresa 2:"
@@ -2249,48 +2405,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Odabir kontakata iz adresara"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Članovi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Ukloni odabrane predmete sa liste priloga"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Odabrano"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sakrij adrese prilikom slanja pošte na ovaj popis "
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Ime _liste:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Unesite elektronsku adresu ili prevucite kontakt u donji popis:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "urednik-kontakt-liste"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Je li novi popis"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Obavezni sudionici"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Spremi popis kao VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Promijenjen kontakt:"
@@ -2329,422 +2506,11 @@ msgstr ""
 "u ovom direktoriju. Želite li svejedno dodati?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "karta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Popis članova"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Položaj"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video savjetovanje"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "osobno"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Bilješka"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Poslovna titula"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Početna stranica"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Uspjeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova lista kontakata"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Pristup odbijen"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kontakt nije nađen"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Identifikator kontakta već postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ne mogu otvoriti izvor"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Provjera vjerodostojnosti neuspješna"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Zahtijev za autentifikaciju obavezan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS nije dostupan"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nema takve poruke"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Druga greška"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
-"dozvole pristupiti joj."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
-"URI, ili je LDAP poslužitelj nedostupan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
-"koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
-"nakon što skinete OpenLDAP sa donjeg linka."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
-"URI, ili je poslužitelj nedostupan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Više karti odgovara upitu koji je ili server tako  \n"
-"podešen vratio ili je Evolution tako podešen da pokaže.\n"
-"Molim da preciznije oblikujete upit ili povećate limit\n"
-"broja rezultata u podešavanjima adresara za server direktorija."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
-"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
-"postavite \n"
-"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
-"direktorija\n"
-"za ovaj adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspješno završen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Greška kod dodavanja popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Greška prilikom dodavanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Greška kod izmjene popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Greška prilikom mijenjanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Greška pri uklanjanju kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
-"Da li doista želite prikazati sve ove kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s već postoji\n"
-"Želite li  prepisati preko njega?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Prebriši"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "popis"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Premjesti kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Kopiraj kontakt u "
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Premjesti kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Kopiraj kontakte u "
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Odaberite odredišni adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(niti jedan) "
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Glavna email adresa\r"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promjeni podatke o kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Prikaži potpun VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži kompaktan VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Spremi u adresaru"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakata"
@@ -2758,9 +2524,9 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Upit"
 
@@ -2776,130 +2542,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška kod promijene karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Poruka počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Kopiraj u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Premjesti u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2933,6 +2699,8 @@ msgid "Car Phone"
 msgstr "Telefon (u autu)"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -2940,6 +2708,21 @@ msgstr "Kategorije"
 msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Obiteljsko ime"
@@ -2976,14 +2759,29 @@ msgstr "Dnevnik"
 msgid "Manager"
 msgstr "Upravitelj"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Bilješka"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ured"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3035,29 +2833,21 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Web-lokacija"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Sadrži Fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Sadrži Pokazivač"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
@@ -3074,7 +2864,11 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina stupca"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3088,7 +2882,7 @@ msgstr ""
 "\n"
 "Kliknite dva puta da biste napravili novi kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3098,13 +2892,392 @@ msgstr ""
 "\n"
 "Nema se što pokazati u ovom pogledu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Kartica"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina stupca"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Sadrži Pokazivač"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "karta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Popis članova"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Položaj"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video savjetovanje"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "posao"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "osobno"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Poslovna titula"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Početna stranica"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Uspjeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova lista kontakata"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Pristup odbijen"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontakt nije nađen"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Identifikator kontakta već postoji"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu otvoriti izvor"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Provjera vjerodostojnosti neuspješna"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Zahtijev za autentifikaciju obavezan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS nije dostupan"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Druga greška"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
+"dozvole pristupiti joj."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
+"URI, ili je LDAP poslužitelj nedostupan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
+"koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
+"nakon što skinete OpenLDAP sa donjeg linka."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
+"URI, ili je poslužitelj nedostupan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Više karti odgovara upitu koji je ili server tako  \n"
+"podešen vratio ili je Evolution tako podešen da pokaže.\n"
+"Molim da preciznije oblikujete upit ili povećate limit\n"
+"broja rezultata u podešavanjima adresara za server direktorija."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
+"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
+"postavite \n"
+"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
+"direktorija\n"
+"za ovaj adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Ovaj upit nije uspješno završen."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Greška kod dodavanja popisa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Greška prilikom dodavanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Greška kod izmjene popisa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Greška prilikom mijenjanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Greška kod uklanjanja popisa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Greška pri uklanjanju kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
+"Da li doista želite prikazati sve ove kontakte?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li  prepisati preko njega?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Prebriši"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "popis"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Premjesti kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Kopiraj kontakt u "
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Premjesti kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Kopiraj kontakte u "
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Odaberite odredišni adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(niti jedan) "
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Glavna email adresa\r"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Odaberi akciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Promjeni podatke o kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Prikaži potpun VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži kompaktan VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Spremi u adresaru"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3148,6 +3321,11 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Ispis koverte "
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Ispiši kontakte"
@@ -3157,11 +3335,6 @@ msgstr "Ispiši kontakte"
 msgid "Print contact"
 msgstr "Ispiši kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Ispis koverte "
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3346,6 +3519,22 @@ msgstr "Testiranje ispisa kontakata"
 msgid "This should test the contact print code"
 msgstr "To bi trebalo iskušati kontaktni kod za ispis"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Ne mogu otvoriti datoteku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ne mogu učitati adresar"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ne mogu otvoriti adresar"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Odredi izlaznu datoteku umjesto standardnog izlaza"
@@ -3404,22 +3593,6 @@ msgstr "U normalnom načinu rada, ne treba postojati postavka veličine."
 msgid "Impossible internal error."
 msgstr "Nemoguća interna greška."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Ne mogu otvoriti datoteku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Ne mogu učitati adresar"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ne mogu otvoriti adresar"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja inicijalnog adresara."
@@ -3436,39 +3609,362 @@ msgstr "Ime datoteke nije dano"
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ne briši"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Za:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Sigurno želite poništiti i obrisati ovaj sastanak?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Obveza"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Želite li spremiti promjene?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređivač?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Zanemari promjene"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Spremi poruku..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Pošalji"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar uvoznik"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Podijeli višednevne događaje:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nisam mogao pokrenuti wombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nisam mogao pokrenuti wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisam mogao pročitati programski blok Kalendara"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Predefinirani prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Podesite vašu vremensku zonu, kalendar i popis zadataka ovdje "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolution kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolution kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolution kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Kalendar komponenta Evolutiona"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponenta zadataka Evolutiona"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zadaci"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servis za alarm obavijesti Evolution kalendara"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pokrećem:"
@@ -3568,10 +4064,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za alarm obavijesti Evolution kalendara"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu inicijalizirati Bonobo"
@@ -3712,9 +4204,29 @@ msgstr "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Treba li prikazivati brojeve tjedana u navigatoru datumima"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Mjesto sadrži"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Neupariv"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3734,8 +4246,8 @@ msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dana"
 
@@ -3746,7 +4258,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3795,62 +4307,52 @@ msgstr "NIje moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Kalendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
@@ -3880,26 +4382,6 @@ msgstr "Tjedni pregled"
 msgid "Month View"
 msgstr "Mjesečni pregled"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Mjesto sadrži"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Neupariv"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
@@ -3917,225 +4399,133 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opcije za zvučni alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opcije za alarm poruke"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opcije alarma preko e-maila"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opcije za program alarma"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Nepoznate opcije za alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Ponavljanje alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Poruka za prikaz:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Poruka za slanje"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Pusti zvuk:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Ponovi alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Pokreni program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Za:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Sa ovim argumentima:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Tada</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "pokaži još na svakih"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Postavke popisa zadataka</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "sati"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Tada</b> "
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Akcija/okidač"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Dodaj novi kalendar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Sastavi poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Osnove"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datum/Vrijeme:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Poruke"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Podsjetnici"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Za:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pošalji e-poštu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Sažetak:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Račun:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Postavke..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Pokreni program:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Ponovi alarm"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Pošalji"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "nakon"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "prije"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "pokaži još na svakih"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "sat(i)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "sati"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuta(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Morate navesti lokaciju iz koje ćete dohvatiti kalendar."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Lokacija izvora '%s' nije dobro formirana."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Lokacija izvora '%s' nije webcal izvor."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Datoteka s kodom '%s' već postoji u odabranoj grupi"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"'%s' je udaljena grupa. morate navesti lokaciju sa koej želite dohvatiti "
-"kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa popisa zadataka"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "boja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Odabir boje"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "Grupa"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Osvježi"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Akcija/okidač"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tjedni"
+msgid "Alarms"
+msgstr "Alarm na %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4251,7 +4641,7 @@ msgid "Free/Busy Publishing"
 msgstr "Slobodan/zauzet zahtjev"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Petak"
@@ -4265,7 +4655,7 @@ msgid "Minutes"
 msgstr "Minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Ponedjeljak"
@@ -4275,7 +4665,7 @@ msgid "S_un"
 msgstr "_Ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Subota"
@@ -4289,7 +4679,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedjelja"
@@ -4303,7 +4693,7 @@ msgid "T_hu"
 msgstr "_Čet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Četvrtak"
@@ -4317,7 +4707,7 @@ msgid "Time format:"
 msgstr "Oblik vremena:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorak"
@@ -4327,7 +4717,7 @@ msgid "W_eek starts:"
 msgstr "Početak t_jedna:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Srijeda"
@@ -4360,7 +4750,8 @@ msgstr "_Skupi tjedne u mjesečni prikaz"
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4410,6 +4801,82 @@ msgstr "_Sri"
 msgid "before every appointment"
 msgstr "prije svakog zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Morate navesti lokaciju iz koje ćete dohvatiti kalendar."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Lokacija izvora '%s' nije dobro formirana."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Lokacija izvora '%s' nije webcal izvor."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Datoteka s kodom '%s' već postoji u odabranoj grupi"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"'%s' je udaljena grupa. morate navesti lokaciju sa koej želite dohvatiti "
+"kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa popisa zadataka"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "boja"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Odabir boje"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Grupa"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Osvježi"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "tjedni"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
@@ -4454,80 +4921,74 @@ msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređivač?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Greška pri provjeri: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "do"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nisam mogao ažurirati objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Promijeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Stavka dnevnika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Spremi kao..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Ne mogu koristiti trenutnu inačicu!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Greška pri provjeri: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "do"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Ne mogu otvoriti izvor"
@@ -4589,8 +5050,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Zbog greške je stavku nemoguće obrisati"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresar..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakti"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4600,160 +5062,224 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Obveza"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Podsjetnik"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
-#: 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Raspored"
 
-#: 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orijentacija"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Završni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Početno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Završno vrijeme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "prije svakog zakazanog sastanka"
+msgstr[1] "prije svakog zakazanog sastanka"
+msgstr[2] "prije svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "kraj zakazanog sastanka"
+msgstr[1] "kraj zakazanog sastanka"
+msgstr[2] "kraj zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "prije svakog zakazanog sastanka"
+msgstr[1] "prije svakog zakazanog sastanka"
+msgstr[2] "prije svakog zakazanog sastanka"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Cije_lodnevni događaj"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "prije svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Zauzeto"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "prije svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Kategorije..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "prije svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Postavke popisa zadataka</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikacija"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Tada</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Povjerljivo"
+msgid "A_ll day event"
+msgstr "Cije_lodnevni događaj"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Datum i Vrijeme"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Spremi korisnički pogled..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Slobodno"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Kategorije..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Mjesto:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Privatno"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Javno"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Povjerljivo"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Pokaži vrijeme kao"
+msgid "L_ocation:"
+msgstr "_Mjesto:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privatno"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Javno"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Pokaži vrijeme kao"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "_Sažetak:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Očisti"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Krajnje vrijeme:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Početno vrijeme:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nijedan"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Odabrani organizator više nema račun."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Nužna je najmanje jedna prisutna osoba."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Obriši"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Ukloni"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4792,35 +5318,45 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Dodaj sudionika"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Tada</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Dodaj pošiljaoca u adresa_r"
+msgid "<b>Organizer</b>"
+msgstr "<b>Tada</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Promijeni organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakti"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Promijeni organizatora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4887,148 +5423,141 @@ msgstr "Ova i buduće pojave"
 msgid "All Instances"
 msgstr "Svi unosi"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ovaj sastanak sadrži povratne podatke koje Evolution ne može mijenjati."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Datum povratka nije ispravan"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "uključeno"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "prvi"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekunda"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "treći"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "četvrti"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "posljednjoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "ponavljanja"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Datum/vrijeme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Svaki"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Izuzetci"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Pregled"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Pravilo ponavljanja"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Posebno ponavljanje"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Izmijeni"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Pregled</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Bez ponavljanja"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Ponavljanje"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Ukloni"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Svaki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Jednostavno ponavljanje"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Promijeni sastanak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "Za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "uvijek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mjesec(i)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "tjedan(a)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Odaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Odredišni direktorij:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista zadataka"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>Vrijednost polja</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _ dovršeno"
+msgid "<span weight=\"bold\">Status</span>"
+msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Završeno"
 
@@ -5040,8 +5569,8 @@ msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Izvodi se"
@@ -5053,22 +5582,22 @@ msgid "Low"
 msgstr "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Obično"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nije započelo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Napredak"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Postotak završenog: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5091,36 +5620,40 @@ msgstr "_Stanje:"
 msgid "_Web Page:"
 msgstr "_Web stranica:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zadatak"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Dodjela"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Povjerljivo"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Mapa:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "_Početni datum:"
@@ -5129,52 +5662,58 @@ msgstr "_Početni datum:"
 msgid "_Due date:"
 msgstr "_Datum krajnjeg roka:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Vjerodajnice autentifikacije za HTTP poslužitelj"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Kalendari odabrani za objavljivanje"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Postavke kalendara</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Dnevno"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Frekvencija objavljivanja"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Slobodan/zauzet uređivač"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Slobodna/zauzeta lokacija izdavanja"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Slobodna/zauzeta lokacija izdavanja"
+msgid "Free/Busy Editor"
+msgstr "Slobodan/zauzet uređivač"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Ime prijave:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Dnevno"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Lozinka:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Pošta:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Frekvencija objavljivanja"
+#, fuzzy
+msgid "_Password:"
+msgstr "Lozinka:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Zapamti lozinku"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Korisničko ime:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Korisnik izdaje"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Tjedno"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5256,7 +5795,7 @@ msgstr "%s kod %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za otvaranje %s"
@@ -5265,6 +5804,11 @@ msgstr "Kliknite za otvaranje %s"
 msgid "Untitled"
 msgstr "Bez naslova"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Sažetak:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5276,7 +5820,7 @@ msgstr "Datum krajnjeg roka:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5289,20 +5833,93 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "_Web stranica:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Javno"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Završni datum"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privatno"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Datum početka"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Povjerljivo"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Sažetak"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Slobodno"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zauzeto"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geografsko mjesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Da"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ne"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ponavljajući"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Dodijeljeno"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5348,95 +5965,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Slobodno"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zauzeto"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Spremi Kao..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Ispis..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "I_zreži"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Zaljepi"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Dodijeli zadatak"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Proslijedi kao iCalendar "
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Obilježi kao izvršeno "
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obilježi odabrane zadatke kao izvršene "
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Obriši"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši odabrane zadatke"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Spremi kao..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite ovdje za dodavanje zadatka"
 
@@ -5445,178 +6068,109 @@ msgstr "Kliknite ovdje za dodavanje zadatka"
 msgid "% Complete"
 msgstr "% gotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Završi"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Datum dovršetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Datum krajnjeg roka"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Datum početka"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sažetak"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Razvrstani zadaci"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Premještam poruke"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopiram poruke"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Odaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Obriši..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Premjesti u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Postavke..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Završni datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Datum početka"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Ponavljajući"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Dodijeljeno"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mjesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5640,36 +6194,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "razmaci od %02i minuta"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "razmaci od %02i minuta"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5736,343 +6290,321 @@ msgid ", ending on "
 msgstr ", završavajući sa "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Početak:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Kraj:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Završeno:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Do:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Due "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ništa</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Lokacija:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Odaberite akciju:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "U redu"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Odbijanje"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži da %s bude prisutan na sastanku."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Otkaz sastanka"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Otkazivanje zadatka"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Čini se da poruka nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Nastala je greška u CORBA sustavu\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objekt se ne može naći\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
@@ -6101,6 +6633,10 @@ msgstr "Učitavam kalendar"
 msgid "Loading calendar..."
 msgstr "Učitavam kalendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Poruka poslužitelja:"
@@ -6117,11 +6653,6 @@ msgstr "početni-datum"
 msgid "Chair Persons"
 msgstr "Predsjedništvo"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Obavezni sudionici"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
@@ -6189,6 +6720,28 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "U toku"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Odsutan..."
@@ -6197,98 +6750,64 @@ msgstr "Odsutan..."
 msgid "No Information"
 msgstr "Nema podataka"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Dodaj pošiljaoca u adresa_r"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Odrednice"
+msgid "O_ptions"
+msgstr "Odrednice"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Ažuriraj slobodan/zauzet"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Sam bira"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Sve _osobe i jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Obavezne osobe"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "_Obavezni sudionici i jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Početno vrijeme _sastanka:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Završno vrijem_e sastanka:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6297,116 +6816,51 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Učitavanje zadataka"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Greška pri otvaranju %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Učitavanje zadataka"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zadaci"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Unosim promene u objekte"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam sastanke kod %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zadatke kod %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Brisanje"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vašu vremensku zonu, kalendar i popis zadataka ovdje "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolution kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolution kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolution kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Kalendar komponenta Evolutiona"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponenta zadataka Evolutiona"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zadaci"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Travanj"
@@ -6754,10 +7208,6 @@ msgstr "Odabran mjesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Odabrana godina (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zadatak"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6788,7 +7238,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
@@ -6818,7 +7268,7 @@ msgstr[0] "Novi zadatak"
 msgstr[1] "Novi zadatak"
 msgstr[2] "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6841,35 +7291,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Interesne grupe"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Grupa popisa zadataka"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novi zadatak"
@@ -8547,69 +8991,69 @@ msgstr "Pripremam mapu '%s' za neumreženi rad"
 msgid "You must be working online to complete this operation"
 msgstr "Morate biti na mreži da biste završili ovu operaciju"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Neuspjelo stvaranje veze ka '%s': %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Neuspjelo stvaranje sadržanog procesa '%s': %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sinkroniziram mape"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primjene filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nisam mogao otvoriti mapu za smještanje reda ( spool )"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz mapu sa redom"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ne mogu otvoriti poruku"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sinkroniziram mapu"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
@@ -8631,42 +9075,6 @@ msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primjene filtera pretrage: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: priključena poruka: za %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Premještam poruke"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopiram poruke"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Upozorenje"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtriranje novih poruka"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8712,7 +9120,43 @@ msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodržana operacija: priključena poruka: za %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Premještam poruke"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopiram poruke"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Upozorenje"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtriranje novih poruka"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8723,15 +9167,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao pročitati gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8740,28 +9184,28 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\"3+"
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao otključati tajni ključ: date su 3 pogrešne lozinke."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8772,62 +9216,82 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ne mogu stvoriti podatke za potpis: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao izvršiti gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao izvršiti gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Dio poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno kriptirani dio poruke"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Kriptirani sadržaj"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Nije moguća analiza sadržaja poruke"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
+
+#: 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 "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ne mogu zaključati '%s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8850,26 +9314,6 @@ msgstr "Nisam mogao zaključiti koristeći fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao zaključiti koristeći flock(2): %s "
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
-
-#: 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 "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ne mogu zaključati '%s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9122,7 +9566,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
@@ -9205,55 +9649,55 @@ msgstr "POP prije SMTP autorizacija korištenjem izvora koji nije pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspjela kompilacija regularnog izraza: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži dio sa korisničkim imenom'"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži dio sa imenom računala"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' traži dio sa putanjom"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razlučujem: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Neuspjelo nalaženje domaćina: ne može stvoriti nit: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Neuspjelo nalaženje domaćina: %s: domaćin nije pronađen"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: %s: nepoznat razlog"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Razlučujem adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Neuspjelo nalaženje domaćina: domaćin nije pronađen"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Neuspjelo nalaženje domaćina: nepoznat razlog"
 
@@ -9329,7 +9773,7 @@ msgstr "_Potvrda kriptiranja:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Ne mogu zaključati  mapu %s: %s"
@@ -9419,7 +9863,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Ispravni potpis"
 
 #: camel/camel-smime-context.c:651
@@ -9434,48 +9878,47 @@ msgstr "Greška kod izvršavanja naredbe DATA"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Na_pravi pravilo od poruke"
+msgid "Cannot create CMS Message"
+msgstr "Ne mogu otvoriti poruku"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ne mogu otvoriti poruku"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ne mogu priložiti datoteku %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ne mogu priložiti datoteku %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ne mogu otvoriti poruku"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Ne mogu zaključati  mapu %s: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9522,7 +9965,8 @@ msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
@@ -9531,8 +9975,8 @@ msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smeće"
 
@@ -9652,7 +10096,7 @@ msgstr "Upotreba ključa ne podržava potpis certifikatom"
 msgid "Error in application verification"
 msgstr "Greška kod provjere programa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9665,11 +10109,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9693,7 +10137,7 @@ msgstr ""
 "Želite li ipak prihvatiti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9708,7 +10152,7 @@ msgstr ""
 "\n"
 "Želite li prihvatiti?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9717,7 +10161,7 @@ msgstr ""
 "Problem sa certifikatom: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9726,7 +10170,7 @@ msgstr ""
 "Neispravna domena certifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9735,7 +10179,7 @@ msgstr ""
 "Certifikat istekao: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9744,7 +10188,7 @@ msgstr ""
 "Popis priznatih certifikata istekao: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao obraditi URL `%s"
@@ -9768,7 +10212,7 @@ msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
@@ -9787,8 +10231,8 @@ msgid "Checking for new mail"
 msgstr "Provjeravam za novu poštu"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Provjeri za nove poruke u svim mapama"
 
@@ -9818,8 +10262,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristupanje Novell Groupwise serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9837,322 +10281,28 @@ msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 msgid "Checklist"
 msgstr "Kontrolni popis"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mape"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo pretplaćene mape"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Pređi preko formata imena mape kojeg daje poslužitelj"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Prostor naziva"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Za čitanje i spremanje pošte na IMAP servere."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP poslužitelj %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nisam se mogao povezati na %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nedostupan"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
-"nije podržan."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sMolim, upišite SMTP lozinku za %s na računalu %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nisam se mogao prijaviti na POP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ne mogu dohvatiti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Naredba:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Ne mogu stvoriti mapu: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10221,7 +10371,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10293,6 +10443,27 @@ msgstr "Koristi prilagođenu naredbu za spajanje na poslužitelj"
 msgid "Command:"
 msgstr "Naredba:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mape"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Pokaži samo pretplaćene mape"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Pređi preko formata imena mape kojeg daje poslužitelj"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Prostor naziva"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
@@ -10315,43 +10486,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i spremanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP poslužitelj %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nisam se mogao povezati na %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nedostupan"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS dodatak nije podržan."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP poslužitelj %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip autentifikacije  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP zaporku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10362,30 +10583,280 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Za čitanje i spremanje pošte na IMAP servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
+"nije podržan."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sMolim, upišite SMTP lozinku za %s na računalu %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10557,18 +11028,26 @@ msgstr "Nisam mogao sačuvati sažetak: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu dodati poruku u sažetak: nepoznat razlog"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Dolazna pošta"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Dodata Maildir poruka otkazana"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10584,48 +11063,48 @@ msgstr ""
 "Ne mogu dobiti poruku: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ne mogu dohvatiti mapu: `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Ne mogu dohvatiti mapu `%s': nije maildir direktorij."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao obrisati direktorij `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11217,20 +11696,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisam se mogao povezati na POP server %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam se mogao povezati na POP server %s u sigurnosnom načinu rada: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisam se mogao povezati na POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11239,28 +11723,28 @@ msgstr ""
 "Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
 "nije podržan."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prijava neuspela na POP poslužitelj %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu se prijaviti na POP server %s: greška kod SASL protokola"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nisam se mogao prijaviti na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sMolim, upišite POP lozinku za %s na računalu %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11269,7 +11753,16 @@ msgstr ""
 "Nisam mogao da se povežem na POP poslužitelj %s.\n"
 "Greška kod slanja zaporke: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nisam mogao da se povežem na POP poslužitelj %s.\n"
+"Greška kod slanja zaporke: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
@@ -11481,93 +11974,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP poslužitelj %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Ne mogu poslati poruku: nema veze sa servisom.."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Ne mogu poslati poruku: adresa pošiljatelja nije ispravna."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu poslati poruku: nisu određeni primatelji."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu poslati poruku: jedan ili više neispravnih primatelja"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Greška kod izvršavanja naredbe HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Greška kod izvršavanja naredbe HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP prijava"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Greška kod stvaranja objekta SASL prijave."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Greška kod izvršavanja naredbe AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Greška kod izvršavanja naredbe AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Neispravan odgovor autentifikacije od servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe MAIL FROM: %s: poruka nije poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Greška kod izvršavanja naredbe MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe RCPT TO: %s: poruka nije poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> neuspelo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Greška kod izvršavanja naredbe DATA: %s: poruka nije poslana"
@@ -11575,26 +12068,26 @@ msgstr "Greška kod izvršavanja naredbe DATA: %s: poruka nije poslana"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Greška kod izvršavanja naredbe DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Greška kod izvršavanja naredbe RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Greška kod izvršavanja naredbe RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Greška kod izvršavanja naredbe QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Greška kod izvršavanja naredbe QUIT"
 
@@ -11657,105 +12150,6 @@ msgstr "Mime tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje privitka"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
-"korisnički račun"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
-"za ovaj korisnički račun"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu otvoriti datoteku"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automatski stvoren"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "Dodana <b>%d</b> datoteka"
-msgstr[1] "Dodane <b>%d</b> datoteke"
-msgstr[2] "Dodano <b>%d</b> datoteka"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Sastavi poruku"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu pokrenuti kontrolu biranja adresa."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu aktivirati komponentu HTML urednika.\n"
-"Molim vas da provjerite imate li odgovarajuće inačice\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu aktivirati komponentu HTML urednika."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Urednik sadrži poruku koja nije tekstualna, te ne može biti mijenjana.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište slanja"
@@ -11836,17 +12230,97 @@ msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
+"korisnički račun"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
+"za ovaj korisnički račun"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu otvoriti datoteku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatski stvoren"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "Dodana <b>%d</b> datoteka"
+msgstr[1] "Dodane <b>%d</b> datoteke"
+msgstr[2] "Dodano <b>%d</b> datoteka"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sastavi poruku"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Prosljeđena poruka - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Pridruži izvornu poruku"
+msgstr[1] "Pridruži izvornu poruku"
+msgstr[2] "Pridruži izvornu poruku"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Urednik sadrži poruku koja nije tekstualna, te ne može biti mijenjana.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Dodaj datoteku poruci"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11864,53 +12338,67 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nisam mogao napraviti cjevovod: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Nepročitane poruke"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Želite li spremiti promjene?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Nemoj ukloniti"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Ukloni"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmjenjena poruka"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11918,57 +12406,74 @@ msgid ""
 msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promjene"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Spremi poruku..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nisam mogao napraviti cjevovod: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog da biste mogli sastaviti poruku."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nisam mogao napraviti cjevovod: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Ne mogu kreirati prozor za sastavljanje:\n"
+"Ne mogu pokrenuti kontrolu biranja adresa."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Ne mogu kreirati prozor za sastavljanje:\n"
+"Ne mogu aktivirati komponentu HTML urednika.\n"
+"Molim vas da provjerite imate li odgovarajuće inačice\n"
+"gtkhtml i libgtkhtml na sistemu.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution Groupware okruženje"
@@ -12275,11 +12780,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Odaberite ime za usporedbu"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "<b>Pravila _filtera</b>"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12308,19 +12808,8 @@ msgstr "Morate dati ime datoteci."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Premještam mapu %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Morate odrediti mapu."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12328,155 +12817,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Dodjela"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Morate imenovati ovaj vfolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nije odabran poslužitelj"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Izaberite datoteku"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Tada</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Označi mapu"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Pravila _filtera</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder izvori</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Usporedi sa"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Dolazno"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum poruke će biti uspoređen sa\n"
-"vremenom u ponoć danog datuma."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum poruke će biti uspoređen sa\n"
-"vremenom kada se filtriranje dogodilo."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum poruke će biti uspoređen sa\n"
-"trenutnim vremenom kada se filtriranje dogodilo."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "vrijeme u odnosu na trenutno vrijeme"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "prije"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mjeseci"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekunde"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "samo određene mape"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "trenutno vrijeme"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "vrijeme koje ste odredili"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "sa svim aktivnim mrežnim mapama"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "sa svim lokalnim i aktivnim mrežnim mapama"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "sa svim lokalnim mapama"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "godine"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Važno"
 
@@ -12544,6 +12915,70 @@ msgstr "dolazeći"
 msgid "outgoing"
 msgstr "odlazeći"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Pravila _filtera</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Usporedi sa"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Dolazno"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum poruke će biti uspoređen sa\n"
+"vremenom u ponoć danog datuma."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum poruke će biti uspoređen sa\n"
+"vremenom kada se filtriranje dogodilo."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum poruke će biti uspoređen sa\n"
+"trenutnim vremenom kada se filtriranje dogodilo."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "vrijeme u odnosu na trenutno vrijeme"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "prije"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mjeseci"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekunde"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "trenutno vrijeme"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "vrijeme koje ste odredili"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "godine"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -12556,60 +12991,70 @@ msgstr "Promjeni pravilo"
 msgid "Rule name"
 msgstr "Ime pravila"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Pravila rezultata"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Postavke uređivača poruka"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Tijelo sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Tijelo ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite provjeru pravopisa, potpise, i sastavljač poruke ovdje"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Tijelo ili naslov sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovdje"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Poruka sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Primaoci sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Pošiljatelj sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Subjekt sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Subjekt ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "<b>Virtualne _mape</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Dodaj"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pošta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder izvor"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštanski račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12642,45 +13087,310 @@ msgstr "Dod_aj potpis"
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "nepoznati pošiljatelj"
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pravila _filtera</b>"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Označi mapu"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Preračunaj"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Dodijeli boju"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Dodijeli bodovanje"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Privici"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Zvučni signal"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "sadrži"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiraj u mapu"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Datum primanja"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Datum slanja"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Obrisano"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ne sadrži"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ne završava sa"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ne postoji"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ne vraća"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne zvuči kao"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ne počinje sa"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Ne postoji"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Nacrt"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "završava sa"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Postoji"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "postoji"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Izraz"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Sljedi"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "Prenosim podatke sa %1$S\r"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "Šaljem zahtjev na %1$S\r"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označen"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "je veće od"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "je manje od"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nije"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nije označen"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Testiranje pošte smeća"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Oznaka"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Dopisna lista"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Tijelo poruke"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Zaglavlje poruke"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Poruka je smeće"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Poruka nije smeće"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Premjesti u mapu"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Izlaz iz programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Pusti zvuk"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Čitaj"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Primatelji"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Reg. izraz pretraga"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Odgovoreno na"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "vraća"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "vraća više od"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "vraća manje od"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Pokreni program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultat"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Pošiljatelj"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Postavi status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Veličina (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "zvuči kao\r"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Izvorni izvještaj"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Određeno zaglavlje"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "počinje sa"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Prekini sa obradom"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subjekt"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Nedodeljen status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Tada</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Svojstva mape"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Svojstva"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Naziv mape"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Ukupno poruka"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Ukupno poruka"
+msgstr[1] "Ukupno poruka"
+msgstr[2] "Ukupno poruka"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Nepročitane poruke"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nepročitane poruke"
+msgstr[1] "Nepročitane poruke"
+msgstr[2] "Nepročitane poruke"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12690,463 +13400,307 @@ msgstr "<kliknite ovdje za odabir mape>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolder-i"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "Neupariv"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Učitavam..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premještam mapu %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapu %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premještam poruke u mapu %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u mapu %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u mapu"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Premjesti u mapu"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Pomakni"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Otkaži zadatak"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiraj"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Stvaram mapu \"%s\""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu \"%s\" u:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "P_ogled"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopiraj"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Pomakni"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Postavke..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "Neupariv"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Dolazna pošta"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Učitavam..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pošta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Svojstva"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Ispis"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Označi kao pročitano"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Označi kao nepročitano"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Označ_i kao važno"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nebitno "
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao smeće"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da nije smeće"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Oznaka"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Pri_mjeni filtere"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltriraj neželjenu poštu"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu "
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter na Sub_jekt"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljatelja"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter na Pri_matelje"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odgovor-Za"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Prima"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subjekt"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Interesne grupe"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Nepodržani format potpisa"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Greška pri provjeri potpisa"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri provjeri potpisa"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Dohvaćanje `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Nepotpisano"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Ispravni potpis"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Neispravni potpis"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Nekriptirano"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Kriptirano, slaba enkripcija"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Šifrirano"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Kriptirano, jaka enkripcija"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Neispravan vanjski dio poruke."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežne podatke (%s) "
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatiranje poruke"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Program e-pošte"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Nepotpisano"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Ispravni potpis"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13154,18 +13708,22 @@ msgstr ""
 "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za "
 "kojeg se predstavlja."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Neispravni potpis"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13173,7 +13731,11 @@ msgstr ""
 "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
 "provjeriti"
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Nekriptirano"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13182,7 +13744,11 @@ msgstr ""
 "Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
 "internetom."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Kriptirano, slaba enkripcija"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13192,14 +13758,22 @@ msgstr ""
 "teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
 "kratkom vremenu."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Šifrirano"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Kriptirano, jaka enkripcija"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13208,39 +13782,162 @@ msgstr ""
 "Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško "
 "stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno na %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Dohvaćanje `%s'"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Neispravan vanjski dio poruke."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP adresu (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pokazivač na lokalnu datoteku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na mrežne podatke (%s) "
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatiranje poruke"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odgovor-Za"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Prima"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc (kopija)"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc (nevidljiva kopija)"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Program e-pošte"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Interesne grupe"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s prilog"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepodržani format potpisa"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Greška pri provjeri potpisa"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nepoznata greška pri provjeri potpisa"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ugrađeni)"
@@ -13352,7 +14049,7 @@ msgstr "Pošalji poruku na..."
 msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -13365,7 +14062,7 @@ msgstr "Ova lokacija ne podržava pretplate ili nije omgućena"
 msgid "Subscribed"
 msgstr "U pretplati"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mapa"
 
@@ -13399,11 +14096,24 @@ msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Virtualne _mape</b>"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder izvor"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
@@ -13888,63 +14598,33 @@ msgstr "veza za pokretanje korisnički pokrenutim spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Postavke uređivača poruka"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Podesite provjeru pravopisa, potpise, i sastavljač poruke ovdje"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovdje"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštanski račun"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Pošta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14002,34 +14682,6 @@ msgstr "Uvoz `%s'"
 msgid "Importing mailbox"
 msgstr "Uvoz sandučića"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14195,77 +14847,90 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo za filter"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Obrisano"
+msgid_plural "%d deleted"
+msgstr[0] "Obrisano"
+msgstr[1] "Obrisano"
+msgstr[2] "Obrisano"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr ""
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Nacrt"
+msgstr[1] "Nacrt"
+msgstr[2] "Nacrt"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "Datum slanja"
+msgid_plural "%d sent"
+msgstr[0] "Datum slanja"
+msgstr[1] "Datum slanja"
+msgstr[2] "Datum slanja"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
-msgstr ""
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
-msgstr ""
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nova mapa za poštu"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Mapa pošte"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Stvori novu mapu e-pošte"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Provjeravam servis"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Spajam se na server...\r"
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
@@ -14327,14 +14992,22 @@ msgstr ""
 "korisnički račun. Ime će biti korištenosamo za potrebe prikazivanja na "
 "zaslonu."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Provjeravam servis"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Spajam se na server...\r"
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Pregled</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14588,7 +15261,7 @@ msgstr "Ne citiraj originalnu poruku"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahtjeve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
@@ -14926,6 +15599,117 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder izvori</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Prihvaćeno"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Završeno"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Razlikuj velika i mala slova"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Pronađi u poruci"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Nađi:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Označi za praćenje"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Pretplate na direktorije"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Ključni dogovor"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ništa nije odabrano"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Poslužitelj:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Podaci o sigurnosti"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Poruke koje ste odabrali za praćenje su dole izlistane.\n"
+"Molim odaberite akciju za praćenje iz \"Oznaka\" menija."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Popis korisničkih računa"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Zastavica:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Pretplati se"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Otkaži pretplatu"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "samo određene mape"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "sa svim aktivnim mrežnim mapama"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "sa svim lokalnim i aktivnim mrežnim mapama"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "sa svim lokalnim mapama"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15133,14 +15917,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15240,8 +16016,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne mogu stvoriti mapu: %s: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15256,8 +16033,9 @@ msgstr ""
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne mogu obrisati mapu %s."
 
 #. mail:no-move-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
@@ -15273,8 +16051,9 @@ msgstr "Ne mogu otvoriti poruku"
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne mogu stvoriti mapu: %s: %s"
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
@@ -15290,8 +16069,9 @@ msgstr "Ne mogu otvoriti izvor"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "Unesi novi kontakt"
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15320,8 +16100,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ne briši"
+msgstr "_Vrati obrisano"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15385,8 +16166,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "Ne mogu obrisati mapu %s."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15428,13 +16210,44 @@ msgstr ""
 "    '%s'\n"
 "Potom su osvježeni."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Premještam mapu %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Morate odrediti mapu."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Morate imenovati ovaj vfolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nije odabran poslužitelj"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15442,16 +16255,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prebriši"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Pošalji"
@@ -15613,7 +16426,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15622,45 +16435,21 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Razlikuj velika i mala slova"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Pronađi u poruci"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Nađi:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Podaci o sigurnosti"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Poništavam...\r"
@@ -15696,24 +16485,24 @@ msgstr "Ažuriram..."
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ovog postupka"
 
@@ -15769,15 +16558,15 @@ msgstr "Osvežavam vfolder-e za uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "New VFolder"
 
@@ -15841,7 +16630,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Radim popis poruka"
 
@@ -15897,10 +16686,6 @@ msgstr "Naprijed"
 msgid "No Response Necessary"
 msgstr "Nije nužan odgovor"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Čitaj"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -15913,49 +16698,49 @@ msgstr "Odgovori svima"
 msgid "Review"
 msgstr "Ponovni pregled"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Označi za praćenje"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Tijelo sadrži"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Završeno"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Tijelo ne sadrži"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Poruke koje ste odabrali za praćenje su dole izlistane.\n"
-"Molim odaberite akciju za praćenje iz \"Oznaka\" menija."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Tijelo ili naslov sadrže"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr ""
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Poruka sadrži"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Zastavica:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Primaoci sadrže"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Pretplate na direktorije"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Pošiljatelj sadrži"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ništa nije odabrano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Subjekt sadrži"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Poslužitelj:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Subjekt ne sadrži"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Pretplati se"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Otkaži pretplatu"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Probni dio Evolutiona"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16025,31 +16810,18 @@ msgstr "Treba li preskočiti dijalog s upozorenjem o razvojnoj inačici"
 msgid "mail"
 msgstr "oklop"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Nepoznata greška"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ne mogu se registrirati na OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Baza sa postavkama nije pronađena"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generička greška"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Odaberite OK za prekid ovih veza"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16235,30 +17007,6 @@ msgstr "Ime mape ne može sadržavati znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' su rezervirana imena mapa."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
-"mreže."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
-"mreži."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pošta za %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Čini se da GNOME Pilot alati nisu instalirani na ovaj sistem."
@@ -16276,110 +17024,94 @@ msgstr "Bug buddy nije instaliran."
 msgid "Bug buddy could not be run."
 msgstr "Ne mogu pokrenuti Bug buddy."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Neumreženi rad"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kvadratić"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novi"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Novi test"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Test"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Unesi novi zadatak"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
+"mreže."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktivne veze"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktivne veze"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
+"mreži."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Odaberite OK za prekid ovih veza"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendar"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Konatkti: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Pošta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "Za_duženja:"
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Vrsta mape"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Otvaranje mape drugog korisnika"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ne mogu se registrirati na OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Račun:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Baza sa postavkama nije pronađena"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Ime mape: "
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generička greška"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Korisnik:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novi"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvoz datoteka"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Vremenska zona"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16393,7 +17125,7 @@ msgstr ""
 "\n"
 "Molim pritisnite gumb \"Naprijed\" za nastavak. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16405,17 +17137,17 @@ msgstr ""
 "\n"
 "Pritisnite gumb \"Primjeni\" da sačuvate vaša podešavanja. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Novi test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Probni dio Evolutiona"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Unesi novi zadatak"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16476,7 +17208,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može uvesti podatke iz sijedećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16511,7 +17243,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16520,39 +17252,39 @@ msgstr ""
 "Hvala\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovno reći"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evolution aktiviranjem određene komponente"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve dijelove evolutiona"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Inzistiraj na ponovnoj migraciji iz Evoultion 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih komponenti u datoteku."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16627,6 +17359,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16872,6 +17626,11 @@ msgstr "Vaše potvrde"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certifikat već postoji"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17073,11 +17832,6 @@ msgstr "Jedinstveni ID subjekta"
 msgid "Certificate Signature Value"
 msgstr "Vrijednost potpisa uvjerenja"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Certifikat već postoji"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 datoteka s lozinkama"
@@ -17218,8 +17972,8 @@ msgstr "Pregledaj tekući kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17696,16 +18450,6 @@ msgstr "_Inverzni odabir"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
@@ -18107,6 +18851,16 @@ msgstr "_Alati"
 msgid "_Undelete"
 msgstr "_Vrati obrisano"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Dodaj"
@@ -18189,10 +18943,6 @@ msgstr "Makni trenutni pogled na spremink"
 msgid "Save the message in a specified folder"
 msgstr "Spremi poruku u naznačenu mapu"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Pošalji"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18763,7 +19513,7 @@ msgid "Evolution Query"
 msgstr "Evolution Test"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18922,27 +19672,255 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Vjerodajnice autentifikacije za HTTP poslužitelj"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Kalendari odabrani za objavljivanje"
+
+#~ msgid "Login name:"
+#~ msgstr "Ime prijave:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Korisnik izdaje"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "urednik-kontakt-liste"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Spremi popis kao VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Grupa"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nisam mogao pokrenuti wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "_Kalendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opcije za zvučni alarm"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opcije za alarm poruke"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opcije alarma preko e-maila"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opcije za program alarma"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Nepoznate opcije za alarm"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Ponavljanje alarma"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Poruka za prikaz:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Poruka za slanje"
+
+#~ msgid "Play sound:"
+#~ msgstr "Pusti zvuk:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Sa ovim argumentima:"
+
+#~ msgid "Basics"
+#~ msgstr "Osnove"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datum/Vrijeme:"
+
+#~ msgid "Reminders"
+#~ msgstr "Podsjetnici"
+
+#~ msgid "_Options..."
+#~ msgstr "_Postavke..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresar..."
+
+#~ msgid "Reminder"
+#~ msgstr "Podsjetnik"
+
+#~ msgid "B_usy"
+#~ msgstr "_Zauzeto"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Povjerljivo"
+
+#~ msgid "Date & Time"
+#~ msgstr "Datum i Vrijeme"
+
+#~ msgid "F_ree"
+#~ msgstr "_Slobodno"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Privatno"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Javno"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Dodaj sudionika"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "Preview"
+#~ msgstr "Pregled"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravilo ponavljanja"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Posebno ponavljanje"
+
+#~ msgid "_Modify"
+#~ msgstr "_Izmijeni"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Bez ponavljanja"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Jednostavno ponavljanje"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _ dovršeno"
+
+#~ msgid "Progress"
+#~ msgstr "Napredak"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Povjerljivo"
+
+#~ msgid "Folder:"
+#~ msgstr "Mapa:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Početak:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Kraj:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Završeno:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Do:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ništa</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Nastala je greška u CORBA sustavu\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objekt se ne može naći\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "_Options"
+#~ msgstr "_Odrednice"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Početno vrijeme _sastanka:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Završno vrijem_e sastanka:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Greška pri otvaranju %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Na_pravi pravilo od poruke"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Ne mogu zaključati  mapu %s: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Ne mogu kreirati prozor za sastavljanje:\n"
+#~ "Ne mogu aktivirati komponentu HTML urednika."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Pravila rezultata"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Naziv mape"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Postavke..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kvadratić"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendar"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Konatkti: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Pošta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "Za_duženja:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Vrsta mape"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Otvaranje mape drugog korisnika"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Ime mape: "
+
+#~ msgid "_User:"
+#~ msgstr "_Korisnik:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Neuspjela prijava na LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nisam mogao obaviti upit na Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Greška kod čitanja podataka sheme"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " P_rikaži podržane baze "
 
@@ -19014,9 +19992,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Webcam:"
 #~ msgstr "Internet stranica"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Uređivač kategorija nije dostupan."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19067,9 +20042,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
 #~ "otkazivanje?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Sigurno želite poništiti i obrisati ovaj sastanak?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19086,24 +20058,12 @@ msgstr "%s (%d%% dovršeno)"
 #~ "Obrisani unos iz dnevnika je objavljen, želite li da pošaljete poruku za "
 #~ "njegovo otkazivanje?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni zadatak?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
 
@@ -19142,9 +20102,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "Učim koje su poruke neželjena pošta."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "News poslužitelj ne dozvoljava slanje"
 
@@ -19178,168 +20135,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Nepoznat odgovor poslužitelja: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Preračunaj"
-
-#~ msgid "Assign Color"
-#~ msgstr "Dodijeli boju"
-
-#~ msgid "Assign Score"
-#~ msgstr "Dodijeli bodovanje"
-
-#~ msgid "Attachments"
-#~ msgstr "Privici"
-
-#~ msgid "Beep"
-#~ msgstr "Zvučni signal"
-
-#~ msgid "contains"
-#~ msgstr "sadrži"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiraj u mapu"
-
-#~ msgid "Date received"
-#~ msgstr "Datum primanja"
-
-#~ msgid "Date sent"
-#~ msgstr "Datum slanja"
-
-#~ msgid "Deleted"
-#~ msgstr "Obrisano"
-
-#~ msgid "does not contain"
-#~ msgstr "ne sadrži"
-
-#~ msgid "does not end with"
-#~ msgstr "ne završava sa"
-
-#~ msgid "does not exist"
-#~ msgstr "ne postoji"
-
-#~ msgid "does not return"
-#~ msgstr "ne vraća"
-
-#~ msgid "does not sound like"
-#~ msgstr "ne zvuči kao"
-
-#~ msgid "does not start with"
-#~ msgstr "ne počinje sa"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ne postoji"
-
-#~ msgid "Draft"
-#~ msgstr "Nacrt"
-
-#~ msgid "ends with"
-#~ msgstr "završava sa"
-
-#~ msgid "Exist"
-#~ msgstr "Postoji"
-
-#~ msgid "exists"
-#~ msgstr "postoji"
-
-#~ msgid "Expression"
-#~ msgstr "Izraz"
-
-#~ msgid "Follow Up"
-#~ msgstr "Sljedi"
-
-#~ msgid "is"
-#~ msgstr "je"
-
-#~ msgid "is after"
-#~ msgstr "Prenosim podatke sa %1$S\r"
-
-#~ msgid "is before"
-#~ msgstr "Šaljem zahtjev na %1$S\r"
-
-#~ msgid "is Flagged"
-#~ msgstr "je označen"
-
-#~ msgid "is greater than"
-#~ msgstr "je veće od"
-
-#~ msgid "is less than"
-#~ msgstr "je manje od"
-
-#~ msgid "is not"
-#~ msgstr "nije"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nije označen"
-
-#~ msgid "Junk Test"
-#~ msgstr "Testiranje pošte smeća"
-
-#~ msgid "Mailing list"
-#~ msgstr "Dopisna lista"
-
-#~ msgid "Message Body"
-#~ msgstr "Tijelo poruke"
-
-#~ msgid "Message Header"
-#~ msgstr "Zaglavlje poruke"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Poruka je smeće"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Poruka nije smeće"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Premjesti u mapu"
-
-#~ msgid "Play Sound"
-#~ msgstr "Pusti zvuk"
-
-#~ msgid "Recipients"
-#~ msgstr "Primatelji"
-
-#~ msgid "Regex Match"
-#~ msgstr "Reg. izraz pretraga"
-
-#~ msgid "Replied to"
-#~ msgstr "Odgovoreno na"
-
-#~ msgid "returns"
-#~ msgstr "vraća"
-
-#~ msgid "returns greater than"
-#~ msgstr "vraća više od"
-
-#~ msgid "returns less than"
-#~ msgstr "vraća manje od"
-
-#~ msgid "Sender"
-#~ msgstr "Pošiljatelj"
-
-#~ msgid "Set Status"
-#~ msgstr "Postavi status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Veličina (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "zvuči kao\r"
-
-#~ msgid "Source Account"
-#~ msgstr "Izvorni izvještaj"
-
-#~ msgid "Specific header"
-#~ msgstr "Određeno zaglavlje"
-
-#~ msgid "starts with"
-#~ msgstr "počinje sa"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Prekini sa obradom"
-
-#~ msgid "Unset Status"
-#~ msgstr "Nedodeljen status"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "Provjera _dolazne pošte"
 
@@ -19573,9 +20368,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Finished"
 #~ msgstr "Završeno"
 
-#~ msgid "Group:"
-#~ msgstr "Grupa:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
diff --git a/po/hu.po b/po/hu.po
index bf1e4a5698..b8b3d65f43 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-02 18:26+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -24,14 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution címjegyzék"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "névjegy fejléce: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minikártya"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "jelenlegi címjegyzékmappa "
@@ -52,34 +44,248 @@ msgstr " kártya"
 msgid " card"
 msgstr " kártya"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "névjegy fejléce: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minikártya"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Az elemet nem lehetett elküldeni!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "A kiszolgáló nem támogatott keresési alapokkal válaszolt"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+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:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nem sikerült elindítani a wombat kiszolgálót"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "A kiszolgáló nem válaszolt érvényes sémainformációval"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nem lehet betölteni a címjegyzéket"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "A kategóriaszerkesztő nem elérhető."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "Nem sikerült megnyitni a címjegyzéket"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Hiba az alapértelmezett címjegyzék betöltése közben."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Nem sikerült feldolgozni a spool mappát"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Menti a változtatásokat?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Elvetés"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "és egy másik névjegy."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nem lehet feldolgozni a levél tartalmát"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Hiba a névjegy hozzáadásakor"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Címjegyzék címnéző"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Alapértelmezett szinkronizálási cím:"
 
-#: addressbook/conduit/address-conduit.c:1150
-#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nem lehet betölteni a címjegyzéket"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nem lehet olvasni a pilot Address application blokkját"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Sikertelen hitelesítés.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automatikus kiegészítés"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sÍrja be %s jelszavát (%s felhasználó)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "Névj_egyek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Tanúsítványok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Automatikus kiegészítés beállítása itt"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Névjegyek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Címjegyzék"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Címjegyzék címnéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Címjegyzék kártyanéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Címjegyzék komponens"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappabeállító kontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -110,87 +316,60 @@ msgid "New Contacts Group"
 msgstr "Új névjegycsoport"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Névjegycsoport"
 
 #: addressbook/gui/component/addressbook-component.c:111
 msgid "Create a new contacts group"
 msgstr "Új névjegycsoport létrehozása"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nem sikerült kapcsolódni az LDAP-kiszolgálóhoz"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nem lehet elvégezni a lekérdezést a DSE gyökérkönyvtárban"
-
-#: addressbook/gui/component/addressbook-config.c:840
-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:1245
-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:1266
-msgid "Error retrieving schema information"
-msgstr "Hiba a sémainformációk betöltése közben"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-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-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Átköltöztetés..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' átköltöztetése:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Ezen a számítógépen"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Személyes"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP-kiszolgálókon"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP-kiszolgálók"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Automatikus kiegészítés beállításai"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -202,7 +381,7 @@ msgstr ""
 "\n"
 "Egy kis türelmet kérek, amíg az Evolution átköltözteti a mappáit..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -214,7 +393,7 @@ msgstr ""
 "\n"
 "Egy kis türelmet kérek, amíg az Evolution átköltözteti a mappáit..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -226,7 +405,7 @@ msgstr ""
 "\n"
 "Egy kis türelmet kérek, amíg az Evolution átköltözteti a mappáit..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -238,19 +417,19 @@ msgstr ""
 "\n"
 "Egy kis türelmet kérek, amíg az Evolution átköltözteti a mappáit..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Új címjegyzék"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 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
@@ -258,21 +437,25 @@ msgstr "Új címjegyzék"
 msgid "Delete"
 msgstr "Törlés"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Tulajdonságok..."
 
-#. 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/addressbook-view.c:1002
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Névjegyek"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Sikertelen hitelesítés.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sÍrja be %s jelszavát (%s felhasználó)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -292,71 +475,14 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Automatikus kiegészítés"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "Névj_egyek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Tanúsítványok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Automatikus kiegészítés beállítása itt"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Címjegyzék"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Címjegyzék címnéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Címjegyzék kártyanéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Címjegyzék komponens"
-
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappabeállító kontroll"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Támogatott típusok lekérdezése"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -364,190 +490,155 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Hitelesítés</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Megjelenítés</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Letöltés</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Keresés</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Kiszolgáló információ</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Típus:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Névjegycsoport hozzáadása"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Címjegyzék tulajdonságai"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Mindig"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Névtelenül"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
-#: calendar/gui/dialogs/task-editor.c:193
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Alap"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Kapcsolódás"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Részletek"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Megkülönböztető _név:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: 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:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "E-mail cím"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-mail cím:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid ""
+"Evolution will use this email address 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"
+"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:29
-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:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Soha"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Egy"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Keresés _hatóköre: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Keresés kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Keresés kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Keresés hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Keresés"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Ha engedélyezi ezt a beállítást, akkor az Evolution csak akkor csatlakozik \n"
 "az LDAP-kiszolgálóhoz, ha az támogatja az SSL vagy a TLS protokollt."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Ha engedélyezi ezt a beállítást, akkor az Evolution csak SSL/TLS protokollt "
 "próbál használni, ha \n"
@@ -557,13 +648,12 @@ msgstr ""
 "kapcsolat\n"
 "már eleve biztonságos."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Ez a beállítás azt jelenti, hogy a kiszolgáló nem támogatja sem az SSL, sem "
 "a TSL \n"
@@ -571,37 +661,32 @@ msgstr ""
 "sebezhetővé \n"
 "válik a külső támadásokkal szemben."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Al"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "A keresési alap a Megkülönbözető névnek az bejegyzése, ahol a keresés "
 "kezdődik majd. Amennyiben\n"
 "üresen hagyja, a keresés a gyökérkönyvtárban fog kezdődni."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "A keresési terület meghatározza, hogy milyen mélységben szeretne keresni "
 "lefelé a\n"
@@ -610,23 +695,23 @@ 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:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 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:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "A letölthető bejegyzések maximális száma. Ha túl\n"
 "magasra állítja ezt az értéket, akkor jelentős mértékben lelassul a "
 "címjegyzéke."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -636,149 +721,121 @@ msgstr ""
 "Ne felejtse el, hogy az \"E-mail cím használatával\" 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:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"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:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Itt kell megadnod azt a portot, amelyen az Evolution kapcsolódik majd az \n"
 "LDAP-kiszolgálóhoz. Az általános portok megtalálhatók a listában. Kérdezd \n"
 "meg a rendszergazdát, hogy melyik portot kell beállítanod."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Itt határozhatod meg, hogy mennyi ideig tartson egy keresés."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Várakozási idő:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_SSL/TLS használata:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "Névjegycsoport hozzá_adása"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Megjelenítendő név:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Támogatott keresési típusok"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Bejelentkezés"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portszám:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Keresés _kiindulópontja:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Kiszolgáló neve:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Keresés hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Kiszolgáló:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Szundi idő (percek)"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Várakozási idő:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Biztonságos kapcsolat használata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kártya"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "percenként"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
+#: 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.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Névjegyek kijelölése a címjegyzékből"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Mindet eltávolítja"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Mindet eltávolítja"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Névjegylista megtekintése"
@@ -793,7 +850,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML levél küldése?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Hozzáadás a címjegyzékhez"
 
@@ -801,15 +858,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Forrás"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Névjegyek kijelölése a címjegyzékből"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -831,6 +895,11 @@ msgstr "K_ategória:"
 msgid "_Find"
 msgstr "_Keresés"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Keresés"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
@@ -869,8 +938,7 @@ msgstr "<b>Munkahely:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -891,7 +959,6 @@ msgid "Birthday:"
 msgstr "Születésnap:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Naptár:"
 
@@ -904,15 +971,15 @@ msgid "Company:"
 msgstr "Cég:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Névjegy"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Névjegyszerkesztő"
 
@@ -933,86 +1000,85 @@ msgid "Full _Name..."
 msgstr "_Teljes név..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Otthoni"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Honlap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Beosztás:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Hely:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Levelezőcím"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Főnök:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "Be_cenév:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Feljegyzések:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Egyéb"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Hivatal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Postafiók:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Személyes adatok"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Foglalkozás:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Házastárs"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Állam/helytartóság:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Megszólítás:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Akar HTML-levelet fogadni"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webkamera:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Weboldal:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Munka"
 
@@ -1029,50 +1095,27 @@ msgid "_File under:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Hol:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Biztos benne, hogy eltávolítja\n"
-"ezeket a névjegyeket?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Biztos benne, hogy\n"
-"eltávolítja ezt a névjegyet?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Cím"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Szerkeszthető"
 
@@ -2044,107 +2087,121 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Szolgáltatás"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Hely"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Felhasználónév"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
+msgid "Home"
+msgstr "Otthoni"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
+msgid "Other"
+msgstr "Egyéb"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:336
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:335
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
-msgid "ICQ"
-msgstr "ICQ"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Forráskönyv"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Célkönyv"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Írható mező"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Megváltoztatva"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "A kategóriaszerkesztő nem elérhető."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ez a névjegy az alábbi kategóriákhoz tartozik:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Válasszon egy képet a névjegyhez"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Nincs kép"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+#, fuzzy
 msgid ""
-"The following entries are invalid:\n"
-"\n"
-msgstr ""
-"A következő bejegyzések érvénytelenek:\n"
+"The contact data is invalid:\n"
 "\n"
+msgstr "Érvénytelen ismétlődési dátum"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nem található widget a mezőhöz: `%s'"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Szolgáltatás"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Hely"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Felhasználónév"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2155,7 +2212,7 @@ msgid "_Edit Full"
 msgstr "_Részletes szerkesztés"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Teljes név:"
 
@@ -2163,6 +2220,22 @@ msgstr "_Teljes név:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Biztos benne, hogy eltávolítja\n"
+"ezeket a névjegyeket?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Biztos benne, hogy\n"
+"eltávolítja ezt a névjegyet?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. cím:"
@@ -2285,48 +2358,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Névjegyek kijelölése a címjegyzékből"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Tagok"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Eltávolítja a kiválasztott elemeket a mellékletlistáról"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Kiválasztva"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Címek elrejtése, amikor erre a listára küld levelet"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Listanév:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "Í_rjon be egy e-mail címet, vagy húzzon egy névjegyet az alábbi listába:"
+msgstr ""
+"Í_rjon be egy e-mail címet, vagy húzzon egy névjegyet az alábbi listába:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Új lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Szükséges résztvevők"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Címlista-szerkesztő"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
-msgid "Save List as VCard"
-msgstr "Lista mentése VCard-ként"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Megváltozott névjegy:"
@@ -2365,439 +2460,11 @@ msgstr ""
 "Mindenképpen hozzáadja?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Haladó keresés"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
-msgid "List Members"
-msgstr "Listatagok"
-
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Szervezet"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-msgid "Position"
-msgstr "Helyzet"
-
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Groupwise"
-msgstr "Csoport"
-
-#: addressbook/gui/widgets/eab-contact-display.c:348
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:350
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "work"
-msgstr "munka"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:371
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:375
-msgid "personal"
-msgstr "személyes"
-
-#: addressbook/gui/widgets/eab-contact-display.c:382
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Megjegyzés"
-
-#: addressbook/gui/widgets/eab-contact-display.c:548
-msgid "Job Title"
-msgstr "Beosztás"
-
-#: addressbook/gui/widgets/eab-contact-display.c:552
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Home page"
-msgstr "Weboldal"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Success"
-msgstr "Sikerült"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Repository offline"
-msgstr "Kapcsolat nélküli tároló"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
-msgid "Address Book does not exist"
-msgstr "A címjegyzék nem létezik"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Új címlista"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Permission denied"
-msgstr "Hozzáférés megtagadva"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact not found"
-msgstr "A névjegy nem található"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Contact ID already exists"
-msgstr "A névjegyazonosító már létezik"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Protocol not supported"
-msgstr "A protokoll nem támogatott"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Megszakítva"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Could not cancel"
-msgstr "Nem lehet megszakítani"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Failed"
-msgstr "Hitelesítés sikertelen"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "Authentication Required"
-msgstr "Hitelesítés szükséges"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "TLS not Available"
-msgstr "TLS nem elérhető"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "No such source"
-msgstr "Nincs ilyen forrás"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
-msgid "Other error"
-msgstr "Egyéb hiba"
-
-#: addressbook/gui/widgets/eab-gui-util.c:103
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nem sikerült megnyitni ezt a címjegyzéket. Ellenőrizze, hogy az útvonal "
-"létezik-e, és van-e joga az eléréséhez."
-
-#: addressbook/gui/widgets/eab-gui-util.c:110
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy azt jelenti, hogy "
-"helytelen URI-t adott meg, vagy az LDAP-kiszolgáló nem működik."
-
-#: addressbook/gui/widgets/eab-gui-util.c:115
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
-msgstr ""
-"Ez az Evolution-változat nem támogatja az LDAP-t, mert nem fordították bele. "
-"Ha szeretne LDAP-t használni az Evolution-ben, a CVS forrásból kell "
-"lefordítania a programot, miután letöltötte az OpenLDAP-t az alábbi helyről."
-
-#: addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy azt jelenti, hogy "
-"helytelen URI-t adott meg, vagy a kiszolgáló nem működik."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nem sikerült megnyitni a címjegyzéket"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Ennek a keresésnek az eredménye több kártya, mint \n"
-"amennyi visszaadására ezt a kiszolgálót beállították vagy \n"
-"az Evolution megjeleníteni képes. Kérem, határozza meg pontosabban\n"
-"a keresési feltételeket, vagy emelje 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/widgets/eab-gui-util.c:168
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Ennek a lekérdezésnek az elvégzése meghaladja a kiszolgáló vagy ennek\n"
-"a címjegyzéknek az időkorlátját. Szűkítse jobban a keresési\n"
-"feltételeket, vagy emelje meg az ehhez a címjegyzékhez tartozó\n"
-"időkorlátot a címtárkiszolgálón."
-
-#: addressbook/gui/widgets/eab-gui-util.c:174
-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/widgets/eab-gui-util.c:177
-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/widgets/eab-gui-util.c:180
-msgid "This query did not complete successfully."
-msgstr "Ez a keresés nem volt sikeres."
-
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Menti a változtatásokat?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Elvetés"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
-msgid "Error adding list"
-msgstr "Hiba a lista hozzáadásakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
-msgid "Error adding contact"
-msgstr "Hiba a névjegy hozzáadásakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:240
-msgid "Error modifying list"
-msgstr "Hiba a lista módosításakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:240
-msgid "Error modifying contact"
-msgstr "Hiba a névjegy módosításakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:252
-msgid "Error removing list"
-msgstr "Hiba a lista törlésekor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
-msgid "Error removing contact"
-msgstr "Hiba a névjegy törlésekor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:334
-#, 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 ""
-"A %d névjegyek megnyitásával egyidejűleg megnyitásra\n"
-"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:360
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s már létezik\n"
-"Szeretné felülírni?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:364
-msgid "Overwrite"
-msgstr "Felülírás"
-
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, 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:437
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:571
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Move contact to"
-msgstr "Névjegy áthelyezése a következő helyre"
-
-#: addressbook/gui/widgets/eab-gui-util.c:708
-msgid "Copy contact to"
-msgstr "Névkártya másolása a következő helyre"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Move contacts to"
-msgstr "Névjegyek áthelyezése a következő helyre"
-
-#: addressbook/gui/widgets/eab-gui-util.c:713
-msgid "Copy contacts to"
-msgstr "Névjegy másolása a következő helyre"
-
-#: addressbook/gui/widgets/eab-gui-util.c:716
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Névjegyek kijelölése a címjegyzékből"
-
-#: addressbook/gui/widgets/eab-gui-util.c:939
-msgid "Multiple VCards"
-msgstr "Több VKártya"
-
-#: addressbook/gui/widgets/eab-gui-util.c:942
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VKártyája"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(nincs)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Elsődleges e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "2. e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "3. e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Válassz egy műveletet"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Új névjegy készítése: %s"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Cím hozzáadása a létező %s névjegyhez"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "A címjegyzék lekérdezése..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Névjegy adatainak szerkesztése"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-mail cím összefésülése"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "és egy másik névjegy."
-msgstr[1] "és %d másik névjegy."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Teljes VKártya megjelenítése"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Névjegy mentése VCard-ként"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Mentés a címjegyzékbe"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nincsenek névjegyek"
@@ -2811,9 +2478,9 @@ msgstr[1] "%d névjegy"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Lekérdezés"
 
@@ -2829,142 +2496,130 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Név ezzel kezdődik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-mail ezzel kezdődik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategória"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bármely mező tartalmazza"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Haladó..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Típus"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Mentés VCard-ként..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Új névjegy..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Új címlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Mappára ugrás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importálás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Névjegyek keresése..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Címjegyzék forrásai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot beállításai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Névjegy továbbítása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Levél küldése ennek a személynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Boríték nyomtatása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Másolás a címjegyzékbe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Áthelyezés a címjegyzékbe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kivágás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: 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"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Jelenlegi nézet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"A %s-hez\n"
-"kapcsolódó címjegyzék háttér\n"
-"leállt. Újra kell indítania az Evolution-t, hogy használni tudja ezt a "
-"felületet"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bármelyik kategória"
 
@@ -2997,6 +2652,8 @@ msgid "Car Phone"
 msgstr "Autótelefon"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategóriák"
 
@@ -3004,6 +2661,21 @@ msgstr "Kategóriák"
 msgid "Company Phone"
 msgstr "Céges telefon"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "2. e-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "3. e-mail"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Családi név"
@@ -3040,14 +2712,29 @@ msgstr "Napló"
 msgid "Manager"
 msgstr "Főnök"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Becenév"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Megjegyzés"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Hivatal"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Szervezet"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Egyéb fax"
@@ -3070,7 +2757,7 @@ msgstr "Rádió"
 
 #: 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-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Szerep"
@@ -3099,29 +2786,21 @@ msgstr "Egység"
 msgid "Web Site"
 msgstr "Webhely"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Szélesség"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Magasság"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Fókuszban"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Kiválasztva"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Megmutatva"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Mező"
@@ -3138,7 +2817,11 @@ msgstr "Szöveg minta"
 msgid "Max field name length"
 msgstr "Mezőnév maximális hosszúsága"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Oszlop szélessége"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3152,7 +2835,7 @@ msgstr ""
 "\n"
 "Új névjegy készítéséhez kattints kettőt ide."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3162,13 +2845,393 @@ msgstr ""
 "\n"
 "Ebben a nézetben nincsenek megjeleníthető névjegyek."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Csatlakozó"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Oszlop szélessége"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Kiválasztva"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Megmutatva"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Listatagok"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Helyzet"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "munka"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "személyes"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Beosztás"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Weboldal"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Sikerült"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Kapcsolat nélküli tároló"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "A címjegyzék nem létezik"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Új címlista"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Hozzáférés megtagadva"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "A névjegy nem található"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "A névjegyazonosító már létezik"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "A protokoll nem támogatott"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Megszakítva"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Nem lehet megszakítani"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Hitelesítés sikertelen"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Hitelesítés szükséges"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS nem elérhető"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Nincs ilyen forrás"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Egyéb hiba"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nem sikerült megnyitni ezt a címjegyzéket. Ellenőrizze, hogy az útvonal "
+"létezik-e, és van-e joga az eléréséhez."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy azt jelenti, hogy "
+"helytelen URI-t adott meg, vagy az LDAP-kiszolgáló nem működik."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ez az Evolution-változat nem támogatja az LDAP-t, mert nem fordították bele. "
+"Ha szeretne LDAP-t használni az Evolution-ben, a CVS forrásból kell "
+"lefordítania a programot, miután letöltötte az OpenLDAP-t az alábbi helyről."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy azt jelenti, hogy "
+"helytelen URI-t adott meg, vagy a kiszolgáló nem működik."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Ennek a keresésnek az eredménye több kártya, mint \n"
+"amennyi visszaadására ezt a kiszolgálót beállították vagy \n"
+"az Evolution megjeleníteni képes. Kérem, határozza meg pontosabban\n"
+"a keresési feltételeket, vagy emelje 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/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Ennek a lekérdezésnek az elvégzése meghaladja a kiszolgáló vagy ennek\n"
+"a címjegyzéknek az időkorlátját. Szűkítse jobban a keresési\n"
+"feltételeket, vagy emelje meg az ehhez a címjegyzékhez tartozó\n"
+"időkorlátot a címtárkiszolgálón."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Ez a keresés nem volt sikeres."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Hiba a lista hozzáadásakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Hiba a névjegy hozzáadásakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Hiba a lista módosításakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Hiba a névjegy módosításakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Hiba a lista törlésekor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Hiba a névjegy törlésekor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"A %d névjegyek megnyitásával egyidejűleg megnyitásra\n"
+"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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s már létezik\n"
+"Szeretné felülírni?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Névjegy áthelyezése a következő helyre"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Névkártya másolása a következő helyre"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Névjegyek áthelyezése a következő helyre"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Névjegy másolása a következő helyre"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Névjegyek kijelölése a címjegyzékből"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Több VKártya"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VKártyája"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(nincs)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Elsődleges e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Válassz egy műveletet"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Új névjegy készítése: %s"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Cím hozzáadása a létező %s névjegyhez"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "A címjegyzék lekérdezése..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Névjegy adatainak szerkesztése"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "E-mail cím összefésülése"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "és egy másik névjegy."
+msgstr[1] "és %d másik névjegy."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Teljes VKártya megjelenítése"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Névjegy mentése VCard-ként"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Mentés a címjegyzékbe"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3212,20 +3275,20 @@ msgstr "Evolution VCard-importáló"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Boríték nyomtatása"
+
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Névjegyek nyomtatása"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Névjegy nyomtatása"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Boríték nyomtatása"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3412,6 +3475,22 @@ msgstr "_Címlista"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Nem lehet megnyitni a fájlt"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nem lehet betölteni a címjegyzéket"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nem sikerült megnyitni a címjegyzéket"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3438,7 +3517,8 @@ msgid "Export in asynchronous mode "
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3446,7 +3526,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3465,16 +3546,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Lehetetlen belső hiba."
 
-#: 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
-msgid "Can not open file"
-msgstr "Nem lehet megnyitni a fájlt"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Nem lehet betölteni az URI-t"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Hiba az alapértelmezett címjegyzék betöltése közben."
@@ -3491,39 +3562,361 @@ msgstr "Nincs fájlnév megadva."
 msgid "Unnamed List"
 msgstr "Névtelen lista"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Nem töröl"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Címzett:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Tényleg törölni akarod ezt az értekezletet?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Tényleg törölni akar %d feladatot?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Tényleg törölni akarod ezt a naplóbejegyzést?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Tényleg törölni akar %d naplóbejegyzést?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Tényleg törölni akarod ezt a találkozót: '%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Tényleg törölni akar %d találkozót?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Tényleg törölni akarod ezt a feladatot: '%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Tényleg törölni akarod ezt a naplóbejegyzést: '%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Tényleg törölni akarod ezt a találkozót: '%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Tényleg törölni akarod ezt a feladatot: '%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Tényleg törölni akarod ezt a naplóbejegyzést: '%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Találkozó"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Menti a változtatásokat?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Változtattál. Elveted a változásokat, és frissíted a szerkesztőt?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Változások elvetése"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Üzenet mentése..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Küldés"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importáló"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Adja meg a jelszót"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Többnapos események felosztása:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nem sikerült elindítani a wombat kiszolgálót"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nem sikerült a wombatot elindítani"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem sikerült a pilot Calendar application blokkját olvasni"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Alapértelmezett prioritás:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem sikerült a pilot Calendar ToDo blokkját olvasni"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Naptárak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Állítsa be a Naptárhoz és a Feladatlistához tartozó időzónát."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Naptár beállító kontroll"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Naptár/Feladat szerkesztő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution Naptár komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution Feladatok komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Naptárak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Kezdet:"
@@ -3619,10 +4012,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializálása sikertelen"
@@ -3767,11 +4156,31 @@ msgstr ""
 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:50
+msgid "Summary contains"
+msgstr "Összefoglaló tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Leírás tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Megjegyzés tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Hely tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ki nem válogatott"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Naptár"
 
@@ -3793,8 +4202,8 @@ msgid "Purge events older than"
 msgstr "visszatér kisebb mint"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "naponként"
 
@@ -3805,7 +4214,7 @@ msgstr "%Y %B %d, %A"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%b %d, %a"
@@ -3853,62 +4262,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Naptárak"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Új találkozó"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Találkozó"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Új találkozó létrehozása"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "É_rtekezlet"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Új értekezlet összehívási kérés létrehozása"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Új egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Új egész napos esemény létrehozása"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Új naptár"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Naptár"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Naptár"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Új naptár létrehozása"
 
@@ -3938,26 +4337,6 @@ msgstr "Hétnézet"
 msgid "Month View"
 msgstr "Hónapnézet"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Összefoglaló tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Leírás tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Megjegyzés tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Hely tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ki nem válogatott"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Hiba történt a naptár megnyitása közben"
@@ -3975,237 +4354,133 @@ msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
-msgid "Audio Alarm Options"
-msgstr "Hangos riasztás beállításai"
-
-#: calendar/gui/dialogs/alarm-options.c:475
-msgid "Message Alarm Options"
-msgstr "Riasztóüzenet beállításai"
-
-#: calendar/gui/dialogs/alarm-options.c:484
-msgid "Email Alarm Options"
-msgstr "Riasztólevél beállításai"
-
-#: calendar/gui/dialogs/alarm-options.c:493
-msgid "Program Alarm Options"
-msgstr "Riasztóprogram beállításai"
-
-#: calendar/gui/dialogs/alarm-options.c:509
-msgid "Unknown Alarm Options"
-msgstr "Ismeretlen típusú riasztás beállításai"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Riasztás ismétlése"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Megjelenítendő üzenet:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Küldendő üzenet"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Hangjelzés:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Riasztás megismétlése"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Program futtatása:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Címzett:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Kezdődik:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Ezekkel az argumentumokkal:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Feladatlista beállításai</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Általános</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "-szer minden"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Naptár hozzáadása"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
-msgid "hours"
-msgstr "óránként"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Levél írása"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Hozzá_adás"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Alapok"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Dátum és idő:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Ü_zenetek"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Hangjelzés"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Emlékeztetők"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Program futtatása"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Címzett:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "E-mail küldése"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Összefoglaló:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Azonosítónév:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Beállítások..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Program futtatása"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Riasztás megismétlése"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Küldés"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "utána"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "előtte"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "nap"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "találkozó vége"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "-szer minden"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "óra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "óránként"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "perc"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "találkozó kezdete"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Meg kell adnod egy fájlnevet."
-
-#: calendar/gui/dialogs/calendar-setup.c:178
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "'%s' betöltéséhez szükséges eljárás nem támogatott"
-
-#: calendar/gui/dialogs/calendar-setup.c:193
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:265
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:278
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Naptár hozzáadása"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Feladatcsoport hozzáadása"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Szín:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Naptár tulajdonságai"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Szín kiválasztása"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Távoli"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Feladatlista tulajdonságai"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Add Calendar"
-msgstr "Naptár hozzá_adása"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr "Csoport hozzá_adása"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Frissítési időköz:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr "_Frissítés:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Forrás-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr "_Típus:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Hozzá_adás"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "hét"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Ébresztő %s-kor"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4306,7 +4581,7 @@ msgid "Display"
 msgstr "Megjelenítés"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "E_ngedélyezés"
 
@@ -4316,8 +4591,8 @@ msgid "Free/Busy Publishing"
 msgstr "Szabad/foglalt kérés"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Péntek"
 
@@ -4330,8 +4605,8 @@ msgid "Minutes"
 msgstr "perccel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "hétfő"
 
@@ -4340,8 +4615,8 @@ msgid "S_un"
 msgstr "_v"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "szombat"
 
@@ -4354,8 +4629,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Hét _számának megjelenítése a dátumnavigátorban"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "vasárnap"
 
@@ -4368,8 +4643,8 @@ msgid "T_hu"
 msgstr "_cs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "csütörtök"
 
@@ -4382,8 +4657,8 @@ msgid "Time format:"
 msgstr "Időformátum:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "kedd"
 
@@ -4392,8 +4667,8 @@ msgid "W_eek starts:"
 msgstr "_Hét kezdete:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "szerda"
 
@@ -4425,8 +4700,9 @@ msgstr "A hétvégék össze_nyomása a hónapnézetben"
 msgid "_Day begins:"
 msgstr "_Nap kezdete:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 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:43
@@ -4475,162 +4751,187 @@ msgstr "_sze"
 msgid "before every appointment"
 msgstr "minden találkozó előtt"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-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/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Meg kell adnod egy fájlnevet."
 
-#: 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/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "'%s' betöltéséhez szükséges eljárás nem támogatott"
 
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
 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: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/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:75
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
 msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
 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: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/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Naptár hozzáadása"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Feladatcsoport hozzáadása"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Szín:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Szín kiválasztása"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "Naptár hozzá_adása"
 
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "Csoport hozzá_adása"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Frissítés:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Típus:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "hét"
+
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Az esemény törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "A feladat törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "A naplóbejegyzés törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, 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:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, 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:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Az esemény megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "A feladat megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "A naplóbejegyzés megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, 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:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Érvényesítési hiba: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Befejezve"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Befejezve"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Esedékes "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Esedékes "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nem sikerült frissíteni az objektumot"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Találkozó szerkesztése"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Időpont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napló bejegyzés - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nincs összefoglaló"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Mentés másként..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nem sikerült megszerezni a legfrissebb változatot!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Érvényesítési hiba: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Befejezve"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Befejezve"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Esedékes "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Esedékes "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Nem lehet megnyitni a forrást"
@@ -4643,105 +4944,59 @@ msgstr "Nem lehet megnyitni a célt"
 msgid "Destination is read only"
 msgstr ""
 
-#: 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: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: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: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: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: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:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Tényleg törölni akar %d találkozót?"
-msgstr[1] "Tényleg törölni akar %d találkozót?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Tényleg törölni akar %d feladatot?"
-msgstr[1] "Tényleg törölni akar %d feladatot?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Tényleg törölni akar %d naplóbejegyzést?"
-msgstr[1] "Tényleg törölni akar %d naplóbejegyzést?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 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:55
+#: calendar/gui/dialogs/delete-error.c:57
 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:58
+#: calendar/gui/dialogs/delete-error.c:60
 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:61
+#: calendar/gui/dialogs/delete-error.c:63
 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:68
+#: calendar/gui/dialogs/delete-error.c:70
 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:71
+#: calendar/gui/dialogs/delete-error.c:73
 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:74
+#: calendar/gui/dialogs/delete-error.c:76
 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."
+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:77
+#: calendar/gui/dialogs/delete-error.c:79
 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:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Az eseményt egy hiba miatt nem lehet törölni"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "A feladatot egy hiba miatt nem lehet törölni"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "A naplóbejegyzést egy hiba miatt nem lehet törölni"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Az elemet egy hiba miatt nem lehet törölni"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Címjegyzék..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Névjegyek"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4751,163 +5006,221 @@ 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:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Találkozó"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Emlékeztető"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Tájolás"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Értekezlet"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Esemény kezdő dátum nélkül"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Hibás a kezdés dátuma"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Érvénytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Hibás a kezdés időpontja:"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Helytelen befejezési időpont"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nem lehet megnyitni a(z) '%s' naptárt."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "minden találkozó előtt"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "találkozó vége"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "minden találkozó előtt"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Egész napos esemény"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "minden találkozó előtt"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "F_oglalt"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "minden találkozó előtt"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegóriák..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "minden találkozó előtt"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Feladatlista</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Besorolás"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Idő</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Bi_zalmas"
+msgid "A_ll day event"
+msgstr "_Egész napos esemény"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Dátum és idő"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Egyéni nézet mentése..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Szabad"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegóriák..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "He_ly:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Naptár:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Szemé_lyes"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Besorolás"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Nyil_vános"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Bizalmas"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Időformátum"
+msgid "L_ocation:"
+msgstr "He_ly:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Személyes"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Nyilvános"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Időformátum"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Ö_sszefoglaló:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Törlés"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Leírás:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Befejezés időpontja:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Kezdés időpontja:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nincs"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 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:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "A szervezőt be kell állítani."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Feladatkiadás..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Törlés"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Eltávolítás"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Résztvevő"
@@ -4943,36 +5256,45 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Állapot"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Rész_tvevő hozzáadása"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Kezdődik:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Egyéb</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Szervező:"
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Szervező megváltoztatása"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
-msgstr "_Szervező megváltoztatása"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Névjegyek"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Mások meghívása..."
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Szervező:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -5020,7 +5342,8 @@ 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: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 "Egy ismétlődő naplóbejegyzést módosítasz, mit szeretnél módosítani?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5040,221 +5363,181 @@ msgstr "Ezt és a jövőbeli előfordulásokat"
 msgid "All Instances"
 msgstr "Minden előfordulást"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ez a találkozó olyan ismétlődéseket tartalmaz, amelyeket az Evolution nem "
 "tud szerkeszteni."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Érvénytelen ismétlődési dátum"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "első"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "másodperc"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "harmadik"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "negyedik"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "utolsó"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Egyéb dátum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "előfordulások"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Dátum és idő"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Minden"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Kivételek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Előnézet"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Ismétlődési szabály"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Egyéni ismétlődés"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Módosítás"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Előnézet</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Nincs ismétlődés"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Ismétlődés"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
-msgid "_Remove"
-msgstr "_Eltávolítás"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Minden"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Egyszerű ismétlődés"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Találkozó szerkesztése"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "ennyiszer:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "örökké"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "hónapban"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "eddig:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "héten"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "évben"
 
-#: 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 ""
-"Az esemény megváltozott, de nem lett mentve.\n"
-"\n"
-"Akarod menteni a változásaidat?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Változások elvetése"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Esemény mentése"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Cél kiválasztása"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Cél"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Feladatlista"
 
-#: 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: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: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: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:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Helytelen befejezési dátum"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Figyelmeztetések</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _kész"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Figyelmeztetések</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Befejezve"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Magas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Alacsony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normál"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nem indult még el"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Folyamatjelző"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Százalékos készenlét: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5277,36 +5560,42 @@ msgstr "Áll_apot:"
 msgid "_Web Page:"
 msgstr "_Weboldal:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Feladat"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Kiosztás"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nem sikerült megnyitni a feladatokat ebben: %s."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Bi_zalmas"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Figyelmeztetések</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Általános</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Leírás:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Mappa:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Ke_zdés dátuma:"
@@ -5315,55 +5604,58 @@ msgstr "Ke_zdés dátuma:"
 msgid "_Due date:"
 msgstr "Le_járat:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Rossz hitelesítési válasz a kiszolgálótól"
+msgid "_Group:"
+msgstr "Csoport"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Naptárbeállítások</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Napi"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Szabad/foglalt információ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Szabad/foglalt információ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Bejelentkezési név:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Napi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Jelszó:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Levél"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Jelszó:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Jelszó megjegyzése"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Felhasználónév:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Heti"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5445,7 +5737,7 @@ msgstr "%s %s-kor"
 msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kattintson a(z) %s megnyitásához"
@@ -5454,6 +5746,11 @@ msgstr "Kattintson a(z) %s megnyitásához"
 msgid "Untitled"
 msgstr "Névtelen"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Összefoglaló:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5465,7 +5762,7 @@ msgstr "Lejárat:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Állapot:"
 
@@ -5477,20 +5774,93 @@ msgstr "Prioritás:"
 msgid "Web Page:"
 msgstr "Weboldal:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Nyilvános"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Befejezési dátum"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Személyes"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Kezdés dátuma"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Bizalmas"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Összefoglaló"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Szabad"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Foglalt"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "É"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "K"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Ny"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A földrajzi pozíció megadása a következő formátumban lehetséges: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Igen"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nem"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ismétlődő"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Hozzárendelve"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5536,95 +5906,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Szabad"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Foglalt"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objektumok frissítése"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Weboldal megnyitása"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "M_entés másként..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Nyomtatás..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kivágás"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Feladat kiosztása"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Továbbítás iCalendarként"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Megjelölés készként"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Kijelölt feladatok megjelölése készként"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Törlés"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Kijelölt feladatok törlése"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Mentés másként..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kattints ide új feladat hozzáadásához"
 
@@ -5633,176 +6009,107 @@ msgstr "Kattints ide új feladat hozzáadásához"
 msgid "% Complete"
 msgstr "% kész"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Kész"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Befejezés dátuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Lejárat"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritás"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Kezdés dátuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Összefoglaló"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Feladatrendezés"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Levelek áthelyzése"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Levelek másolása"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Új feladat"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "_Szál kijelölése"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "Dátum _kiválasztása..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt információ _közzététele"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Na_ptárba másolás..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Á_thelyezés naptárba..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Ugrás a _mai napra"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Beállítások..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Befejezési dátum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Kezdés dátuma"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Ismétlődő"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Hozzárendelve"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Igen"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nem"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "É"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "K"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Ny"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A földrajzi pozíció megadása a következő formátumban lehetséges: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5826,432 +6133,418 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "de"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "du"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i perces osztás"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%B %d, %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i perces osztás"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "de"
 
-#: calendar/gui/e-itip-control.c:592
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "du"
+
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Igen. (Összetett ismétlődés)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Minden nap"
 msgstr[1] "%d naponta"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Minden héten"
 msgstr[1] "%d hetente"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Minden héten ekkor "
 msgstr[1] "%d hetente ekkor "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " és "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s napján"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s napján"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "minden hónapban"
 msgstr[1] "%d havonta"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Minden évben"
 msgstr[1] "%d évente"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "összesen ennyiszer: %d"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", véget ér"
 
-#: calendar/gui/e-itip-control.c:693
-msgid "<b>Starts:</b> "
-msgstr "<b>Kezdődik:</b> "
-
-#: calendar/gui/e-itip-control.c:703
-msgid "<b>Ends:</b> "
-msgstr "<b>Vége:</b> "
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Starts"
+msgstr "Állapot"
 
-#: calendar/gui/e-itip-control.c:723
-msgid "<b>Completed:</b> "
-msgstr "<b>Befejezve:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:733
-msgid "<b>Due:</b> "
-msgstr "<b>Határidő:</b> "
+#, fuzzy
+msgid "Due"
+msgstr "Esedékes "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar információ"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Ismeretlen személy"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:913
 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."
+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:925
-msgid "<i>None</i>"
-msgstr "<i>Nincs</i>"
+#: calendar/gui/e-itip-control.c:942
+msgid "Location:"
+msgstr "Hely:"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Válassz egy műveletet:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Frissítés"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt információ küldése"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Információ az értekezletről"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1200
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1201
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Javaslat értekezletre"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1206
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Értekezlet frissítése"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1211
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Értekezletfrissítési kérés"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1219
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Válasz az értekezletre"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az értekezletet."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Értekezlet lemondása"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1235
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Rossz értekezletfelhívás"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Feladatinformáció"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1268
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1269
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1274
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Feladat frissítése"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1279
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Feladatfrissítési felhívás"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1287
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Válasz feladatra"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1295
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Feladat lemondása"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Rossz feladatüzenet"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1323
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt információ"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1328
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt kérés"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1333
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt válasz"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt üzenet"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Úgy tűnik, hogy az üzenet nem megfelelően formázott"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Az üzenet csak nem támogatott kéréseket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1509
 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:1535
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
-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:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1803
 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:1825
+#: calendar/gui/e-itip-control.c:1813
 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?"
+msgstr ""
+"A válasz oylantól érkezett, aki nem résztvevő. Hozzáadod a résztvevőkhöz?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1825
 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:1856
-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:1859
-msgid "Object could not be found\n"
-msgstr "Az elem nem található\n"
-
-#: calendar/gui/e-itip-control.c:1862
-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"
+msgstr ""
+"A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:1868
-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:1845
+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:1899
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elküldve!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elküldeni!\n"
 
@@ -6280,6 +6573,10 @@ msgstr "Naptár betöltése"
 msgid "Loading calendar..."
 msgstr "Naptár betöltése folyamatban..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Szervező:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Üzenet a kiszolgálótól:"
@@ -6292,74 +6589,69 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Elnök"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
-msgid "Required Participants"
-msgstr "Szükséges résztvevők"
-
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Esetleges résztvevők"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Erőforrások"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Egyén"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Csoport"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Erőforrás"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Szoba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Levezető"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 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 "Szükséges résztvevők"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Esetleges résztvevő"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Nem vesz részt"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 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 "Beavatkozás szükséges"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 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 "Kísérleti"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegált"
@@ -6368,6 +6660,28 @@ msgstr "Delegált"
 msgid "In Process"
 msgstr "Folyamatban"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%Y %B %d, %A"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nincs bent"
@@ -6376,86 +6690,64 @@ msgstr "Nincs bent"
 msgid "No Information"
 msgstr "Nincs információ"
 
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Beállítások"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Beállítások"
 
-#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:449
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Csak a _munkaórák megjelenítése"
 
-#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:459
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "_Megjelenítés nagyítva"
 
-#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:474
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Szabad/foglalt frissítése"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automatikus kiszedés"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:539
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Minden ember és erőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:548
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Minden _ember és egy erőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:557
+#, fuzzy
+msgid "_Required people"
 msgstr "_A kért emberek"
 
-#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:566
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "A kért emberek és egy e_rőforrás"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Megbeszélés _kezdődik:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Megbeszélés _vége:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%Y %B %d, %A"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Adja meg %s jelszavát"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6464,125 +6756,51 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Feladatok betöltése"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: calendar/gui/e-tasks.c:709
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Hiba a(z) %s megnyitásakor:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:730
-msgid "Loading tasks"
-msgstr "Feladatok betöltése"
-
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Feladatok"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Objektumok frissítése"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nincsenek találkozók."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Képek betöltése"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "%s megnyitása"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Tisztítás"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Állítsa be a Naptárhoz és a Feladatlistához tartozó időzónát."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Naptár beállító kontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Naptár/Feladat szerkesztő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution Naptár komponens"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution Feladatok komponens"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Naptárak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Feladatok"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "április"
@@ -6720,7 +6938,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6731,7 +6949,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nem lehet megnyitni a(z) '%s' naptárt."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nem sikerült megnyitni a feladatokat ebben: %s."
@@ -6921,10 +7139,6 @@ msgstr "Kijelölt hónap (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Kijelölt év (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Feladat"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6955,7 +7169,7 @@ msgid "Contacts: "
 msgstr "Névjegyek: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Nyomtatási kép"
 
@@ -6967,69 +7181,64 @@ msgstr "Elem nyomtatása"
 msgid "Print Setup"
 msgstr "Nyomtatás beállítása"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Új feladatlista"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d feladat"
 msgstr[1] "   feladat"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d kiválasztott"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Feladatok betöltése"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Új feladatcsoport"
 
-#: calendar/gui/tasks-component.c:813
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Feladatcsoport"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Új feladat létrehozása"
@@ -8707,69 +8916,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Érvénytelen üzenetfolyam érkezett innen: %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Mappák szinkronizálása"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Hiba a szűrő feldolgozása közben: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, 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:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nem sikerült megnyitni spool mappát"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nem sikerült feldolgozni a spool mappát"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d. üzenet letöltése (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d. üzenet rossz"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Mappa szinkronizálása"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Levelek letöltése: %d/%d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Hiba a %d / %d üzenetnél"
@@ -8791,37 +9000,6 @@ msgstr "Érvénytelen argumentumok (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a szűrt keresés végrehajtása közben: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nem támogatott művelet: üzenet hozzáfűzése: %s"
-
-#: camel/camel-folder.c:1259
-#, 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:1299
-#, 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:1416
-msgid "Moving messages"
-msgstr "Levelek áthelyzése"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Levelek másolása"
-
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr ""
-
-#: camel/camel-folder.c:1695
-msgid "Filtering new message(s)"
-msgstr "Új üzenet(ek) szűrése"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8852,22 +9030,58 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "a (match-all) egy darab logikai eredményt vár"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "a (match-all) egy darab logikai eredményt vár"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nem támogatott művelet: üzenet hozzáfűzése: %s"
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Levelek áthelyzése"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Levelek másolása"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Figyelmeztetés"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Új üzenet(ek) szűrése"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8878,15 +9092,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "A gpg felhasználói azonosító sikertelen elemzése."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "A gpg jelmondat kérés sikertelen elemzése"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8895,27 +9109,29 @@ msgstr ""
 "Meg kell adnod a jelmondatot \"%s\"\n"
 "titkos kulcsának érvényesítéséhez."
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Megszakítva"
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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."
+msgstr ""
+"A titkos kulcs érvényesítéséhez 3 alkalommal adtál meg rossz jelmondatot."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, 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:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Sikertelen titkosítás: Nincs érvényes címzett megadva."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8926,83 +9142,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sikertelen GPG-zés: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, 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:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "A %s levél dekódolása sikertelen."
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "A gpg végrehajtása sikertelen."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 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:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nem lehet ellenőrizni az üzenet aláírását: helytelen üzenetformátum"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nem lehet előállítani tikosított adatokat: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ez egy digitálisan aláírt üzenetrész"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Titkosított tartalom"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Nem lehet feldolgozni a levél tartalmát"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nem sikerült zárolófájlt létrehozni %s számára: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Időtúllépés %s fájl zárolási kísérlete közben. Próbáld később."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Sikertelen zárolás az fcntl(2) használatával: %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Sikertelen zárolás az flock(2) használatával: %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9023,6 +9219,26 @@ msgstr "Nem sikerült '%s' zárolása: segédzároló protokollhiba"
 msgid "Could not lock '%s'"
 msgstr "Nem sikerült a zárolás: %s"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Nem sikerült zárolófájlt létrehozni %s számára: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Időtúllépés %s fájl zárolási kísérlete közben. Próbáld később."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Sikertelen zárolás az fcntl(2) használatával: %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Sikertelen zárolás az flock(2) használatával: %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9102,7 +9318,8 @@ msgstr ""
 #: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "%s betöltése sikertelen: A modulbetöltés nem támogatott a rendszereden."
+msgstr ""
+"%s betöltése sikertelen: A modulbetöltés nem támogatott a rendszereden."
 
 #: camel/camel-provider.c:181
 #, c-format
@@ -9266,11 +9483,13 @@ msgstr "A megadott kontextuskezelő nem hivatkozott érvényes kontextusra."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
-msgstr "Az input_token-re végrehajtott konzisztencia-ellenőrzés sikertelen volt."
+msgstr ""
+"Az input_token-re végrehajtott konzisztencia-ellenőrzés sikertelen volt."
 
 #: camel/camel-sasl-gssapi.c:180
 msgid "The consistency checks performed on the credential failed."
-msgstr "Az azonosító adatra végrehajtott konzisztencia-ellenőrzés sikertelen volt."
+msgstr ""
+"Az azonosító adatra végrehajtott konzisztencia-ellenőrzés sikertelen volt."
 
 #: camel/camel-sasl-gssapi.c:183
 msgid "The referenced credentials have expired."
@@ -9279,7 +9498,7 @@ msgstr "A hivatkozott azonosító adatok lejártak."
 #: 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:1212
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 
@@ -9343,7 +9562,8 @@ msgstr "POP az SMTP előtt"
 
 #: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr "Ezzel a beállítással a POP engedélyezése az SMTP kapcsolat előtt jön létre"
+msgstr ""
+"Ezzel a beállítással a POP engedélyezése az SMTP kapcsolat előtt jön létre"
 
 #: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
@@ -9362,55 +9582,55 @@ msgstr "POP az SMTP hitelesítés előtt nem pop forrás használatával"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "A reguláris kifejezés lefordítása sikertelen: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL-ben kell lennie felhasználónév összetevőnek"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL-ben kell lennie gépnév összetevőnek"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL-ben kell lennie útvonal összetevőnek"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "'%s' feloldása"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Sikertelen névkikeresés: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Sikertelen gépkikeresés: a szál nem található: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Sikertelen gépkikeresés: %s: a gép nem található"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Sikertelen gépkikeresés: %s: ismeretlen ok"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Cím feloldása"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Sikertelen gépkikeresés: a gép nem található"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Sikertelen gépkikeresés: ismeretlen ok"
 
@@ -9486,7 +9706,7 @@ msgstr "_Tanúsítványazonosító:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nem sikerült zárolni a mappát: %s: %s"
@@ -9579,7 +9799,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Érvényes aláírás"
 
 #: camel/camel-smime-context.c:651
@@ -9594,49 +9814,48 @@ msgstr "A DATA-parancs sikertelen"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nem sikerült \"common bulk\" algoritmust találni."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "S_zabály gyártása levélből"
+msgid "Cannot create CMS Message"
+msgstr "Nem lehet megnyitni a levelet"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Nem lehet megnyitni a levelet"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Nem sikerült csatolni a fájlt: %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Nem sikerült csatolni a fájlt: %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Nem lehet megnyitni a levelet"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nem sikerült zárolni a mappát: %s: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9660,40 +9879,43 @@ msgstr "A parancs nincs megvalósítva"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 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"
+msgstr ""
+"Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: a mappa létezik"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 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"
+msgstr ""
+"Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: a mappa létezik"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, 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-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Kuka"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "június"
@@ -9712,7 +9934,8 @@ msgstr "Nem lehet feloldani a tanúsítvány aláírásának titkosítását"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Nem lehet visszafejteni a visszavont tanúsítványok listájának aláírását"
+msgstr ""
+"Nem lehet visszafejteni a visszavont tanúsítványok listájának aláírását"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -9814,7 +10037,7 @@ msgstr "A használatban lévő kulcs nem támogatja tanúsítvány aláírását
 msgid "Error in application verification"
 msgstr "Hiba az alkalmazás igazolásában"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9827,11 +10050,11 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Aláírás:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "JÓ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "ROSSZ"
 
@@ -9855,7 +10078,7 @@ msgstr ""
 "Ennek ellenére elfogadod?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9871,7 +10094,7 @@ msgstr ""
 "\n"
 "Elfogadod?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9880,7 +10103,7 @@ msgstr ""
 "Tanúsítványprobléma: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9889,7 +10112,7 @@ msgstr ""
 "Hibás tanúsítványtartomány: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9898,7 +10121,7 @@ msgstr ""
 "A tanúsítvány lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9907,7 +10130,7 @@ msgstr ""
 "Visszavont tanúsítványok listája lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nem sikerült értelmezni ezt az URL-t: `%s'"
@@ -9926,12 +10149,12 @@ msgstr "Nincs ilyen üzenet (%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:377
+#: camel/camel-vee-store.c:374
 #, 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:398
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
@@ -9952,8 +10175,8 @@ msgid "Checking for new mail"
 msgstr "Új levelek keresése"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Új levelek keresése az összes mappában"
 
@@ -9977,24 +10200,24 @@ msgstr "Címjegyzék"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
-#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Jelszó"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10002,330 +10225,34 @@ msgstr ""
 "Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
 "kiszolgálóval."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Sűrű köd"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mappák"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: 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/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Névtér"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Levélolvasás és -tárolás IMAP-kiszolgálókon."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
-"kiszolgálóval."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP-kiszolgáló"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nem sikerült csatlakozni %s %d portjához: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nem elérhető"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Kapcsolat megszakítva"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
-"kiszolgálóhoz: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
-"kiszolgálóhoz: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
-msgid "Unknown error"
-msgstr "Ismeretlen hiba"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz. A kért hitelesítési "
-"mechanizmus nem támogatott."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sAdja meg %s SMTP jelszavát a(z) %s gépen"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Parancs:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Nincsenek feladatok"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "A művelet leállítva"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10385,13 +10312,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nem lehet elhozni a levelet: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: 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"
@@ -10401,15 +10321,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nincs ilyen üzenet"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ez az üzenet jelenleg nem elérhető"
 
@@ -10418,7 +10338,23 @@ msgstr "Ez az üzenet jelenleg nem elérhető"
 msgid "Fetching summary information for new messages"
 msgstr "Összefoglaló adatok letöltése az új levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nem található a levéltörzs a FETCH válaszban."
 
@@ -10458,6 +10394,27 @@ msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 msgid "Command:"
 msgstr "Parancs:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mappák"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Csak az előfizetett mappák megjelenítése"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+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:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Névtér"
+
 #: 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"
@@ -10480,43 +10437,94 @@ msgstr "IMAP"
 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-store.c:650
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "%s IMAP-kiszolgáló"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nem sikerült csatlakozni %s %d portjához: %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nem elérhető"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Kapcsolat megszakítva"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
+"kiszolgálóhoz: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS kiterjesztés nem támogatott"
 
-#: camel/providers/imap/camel-imap-store.c:681
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL-tárgyalás sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nem lehet csatlakozni a(z) \"%s\" paranccsal: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP-kiszolgáló nem támogatja a kért %s hitelesítési típust"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s hitelesítési típus nem támogatott"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAdd meg %s@%s IMAP-jelszavát!"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nem adtál meg jelszót."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10527,30 +10535,284 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A szülőmappa nem tartalmazhat almappákat"
 
-#: camel/providers/imap/camel-imap-store.c:1970
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: a mappa létezik."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen szülőmappa: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Levélolvasás és -tárolás IMAP-kiszolgálókon."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
+"kiszolgálóval."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
+"kiszolgálóhoz: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz. A kért hitelesítési "
+"mechanizmus nem támogatott."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sAdja meg %s SMTP jelszavát a(z) %s gépen"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Parancs:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Nincsenek feladatok"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10579,20 +10841,20 @@ msgid "Index message body data"
 msgstr "Levél küldése ennek a személynek"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postaláda:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10653,7 +10915,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10717,60 +10979,85 @@ msgstr "Nem sikerült menteni az összefoglalót: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nem sikerült hozzáadni a levelet az összefoglalóhoz: ismeretlen ok"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Beérkezett levelek"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir üzenet hozzáfűzése megszakítva"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nem lehet a levelet a maildir mappához fűzni: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Az üzenet tartalma érvénytelen"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nem lehet megszerezni a(z)`%s' mappát: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nem lehet megszerezni a(z)`%s' mappát: mappa nem létezik."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Nem lehet megszerezni a(z)`%s' mappát: nem maildir könyvtár."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nem sikerült törölni a mappát: `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nem maildir könyvtár"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:355
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem sikerült pásztázni a mappát: `%s': %s"
@@ -10817,27 +11104,18 @@ msgstr "Levél hozzáfűzése megszakítva"
 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: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 ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 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:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Levélírás sikertelen: sérült postafiók?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Nem lehet könyvtárat létrehozni ezen a néven."
 
@@ -10867,30 +11145,30 @@ msgstr "`%s' nem közönséges fájl."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem üres. Nem törölhető."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nem lehet létrehozni a(z) `%s' könyvtárat: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nem lehet létrehozni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "A mappa már létezik"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Az új mappanév érvénytelen."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nem lehet átnevezni a(z)`%s'-t: `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nem lehet '%s'-t %s névre átnevezni: %s"
@@ -11081,7 +11359,7 @@ msgstr ""
 "A mappa valószínűleg sérült, másolat mentve `%s' néven"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Adja meg %s@%s NNTP-jelszavát"
@@ -11098,18 +11376,10 @@ msgstr "Nem sikerült elküldeni a felhasználónevet a kiszolgálónak"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: 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 "Felhasználó megszakította"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11118,62 +11388,51 @@ msgstr "Felhasználó megszakította"
 msgid "Cannot get message %s: %s"
 msgstr "Nem sikerült betölteni a levelet: %s:  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: 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 "Felhasználó megszakította"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nem sikerült elindítani a wombat kiszolgálót"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Hiba a levél küldése közben: %s: a levél nem lett elküldve"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Művelet sikertelen: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nem másolhat leveleket egy NNTP mappából!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nem lehet megszerezni a csoportlistát a kiszolgálótól."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11181,7 +11440,8 @@ msgstr ""
 " %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11202,27 +11462,29 @@ msgid ""
 "password."
 msgstr "Ez a beállítás sima szöveges jelszót használ az NNTP-kiszolgálóhoz."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Az NNTP-parancs sikertelen: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nem sikerült az üdvözlést elolvasni innen: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "A(z) %s NNTP-kiszolgáló %d hibakódot adott vissza: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET hírcsoportok innen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "értelmezési hiba"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11233,7 +11495,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11243,7 +11505,7 @@ msgstr ""
 "\n"
 "Nincs ilyen hírcsoport. A kiválasztott elem valószínűleg egy szülőmappa."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11253,61 +11515,61 @@ msgstr ""
 "\n"
 "hírcsoport nem létezik!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Kapcsolódási hiba: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nincs ilyen mappa: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Hitelesítés szükséges"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nem sikerült a csoportot letölteni: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nem sikerült elküldeni a levelet: %s"
+msgid "Not connected."
+msgstr "Nincsenek névjegyek"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Az NNTP-parancs sikertelen: %s"
+msgid "No such folder: %s"
+msgstr "Nincs ilyen mappa: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Új üzenetek keresése"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Ismeretlen válasz a kiszolgálótól: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Nem várt válasz a GnuPG részéről: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Felhasználó megszakította"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Művelet sikertelen: %s"
@@ -11355,7 +11617,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:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11387,20 +11649,26 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nem sikerült csatlakozni a(z) %s POP-kiszolgálóhoz (port: %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
-msgstr "Nem sikerült biztonságos módon kapcsolódni a(z) %s POP-kiszolgálóhoz: %s."
+msgstr ""
+"Nem sikerült biztonságos módon kapcsolódni a(z) %s POP-kiszolgálóhoz: %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nem sikerült kapcsolódni a(z) %s POP-kiszolgálóhoz."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11409,28 +11677,29 @@ msgstr ""
 "Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz. A kért hitelesítési "
 "mechanizmus nem támogatott."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Sikertelen bejelentkezés a(z) %s POP-kiszolgálóra: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "SASL protokollhiba miatt nem lehet bejelentkezni a(z) %s POP-kiszolgálóra"
+msgstr ""
+"SASL protokollhiba miatt nem lehet bejelentkezni a(z) %s POP-kiszolgálóra"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sAdja meg %s POP jelszavát a(z) %s gépen"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11439,13 +11708,22 @@ msgstr ""
 "Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz.\n"
 "Hiba a jelszó küldése közben: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz.\n"
+"Hiba a jelszó küldése közben: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs `%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11462,7 +11740,8 @@ msgstr "Nem sikerült értelmezni a címzettek listáját"
 #: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
-msgstr "Nem sikerült csővezetéket létrehozni a sendmailhez: %s: a levél nem ment el"
+msgstr ""
+"Nem sikerült csővezetéket létrehozni a sendmailhez: %s: a levél nem ment el"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
@@ -11497,7 +11776,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:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11650,94 +11929,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP-kiszolgáló"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP-levélküldés %s kiszolgálón át"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Nem lehet elküldeni a levelet: nincs címzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Levél küldése"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Nem lehet elküldeni a levelet: nincs címzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nem lehet elküldeni a levelet: egy vagy több érvénytelen címzett."
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP-üdvözlet"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "A HELO-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "A HELO-parancs sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP-hitelesítés"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Hiba a SASL hitelesítési objektum létrehozásakor."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Az AUTH-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Az AUTH-parancs sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Rossz hitelesítési válasz a kiszolgálótól.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "A MAIL FROM parancs sikertelen: %s: a levél nem lett elküldve"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "A MAIL FROM parancs sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Az RCPT TO parancs sikertelen: %s: a levél nem lett elküldve"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "A DATA-parancs sikertelen: %s: a levél nem lett elküldve"
@@ -11745,26 +12024,26 @@ msgstr "A DATA-parancs sikertelen: %s: a levél nem lett elküldve"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "A DATA-parancs sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Az RSET-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Az RSET-parancs sikertelen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "A QUIT-parancs sikertelen: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "A QUIT-parancs sikertelen"
 
@@ -11783,19 +12062,19 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "melléklet"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Eltávolítja a kiválasztott elemeket a mellékletlistáról"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Csatolás..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Fájl csatolása a levélhez"
 
@@ -11827,99 +12106,6 @@ msgstr "MIME-típus:"
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a melléklet automatikus megjelenítését"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nem lehet megnyitni a fájlt"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Névtelen üzenet"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Fájl megnyitása"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
-msgid "Autogenerated"
-msgstr "Automatikusan létrehozott"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Aláírás:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> csatolt fájl"
-msgstr[1] "<b>%d</b> csatolt fájl"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Levél írása"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"Nem lehetett aktiválni a címkiválasztó kontrollt."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"A HTML-szerkesztő komponens aktiválása sikertelen.\n"
-"Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
-"libgtkhtml van-e telepítve.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"A HTML-szerkesztő komponens aktiválása sikertelen."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(A szerkesztő olyan nem szöveg jellegű üzenettörzset tartalmaz, melyet "
-"nem szerkeszthetsz.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Címzett címe"
@@ -12002,20 +12188,93 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nem lehet megnyitni a fájlt"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Névtelen üzenet"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Fájl megnyitása"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatikusan létrehozott"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Aláírás:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> csatolt fájl"
+msgstr[1] "<b>%d</b> csatolt fájl"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Levél írása"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Továbbított üzenet - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Eredeti levél csatolása"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(A szerkesztő olyan nem szöveg jellegű üzenettörzset tartalmaz, melyet "
+"nem szerkeszthetsz.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Fájl csatolása a levélhez"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12030,54 +12289,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nem sikerült csővezetéket létrehozni: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Olvasatlan üzenetek"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Menti a változtatásokat?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ne távolítsa el"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Eltávolítás"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Nem sikerül elmenteni az elemeket."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Figyelem: Módosított levél"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12085,55 +12358,74 @@ msgid ""
 msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Változások elvetése"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Üzenet mentése..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nem sikerült csővezetéket létrehozni: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Be kell állítanod egy postafiókot, mielőtt levelet küldhetnél."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nem sikerült csővezetéket létrehozni: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nem sikerült létrehozni a szerkesztőablakot:\n"
+"Nem lehetett aktiválni a címkiválasztó kontrollt."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nem sikerült létrehozni a szerkesztőablakot:\n"
+"A HTML-szerkesztő komponens aktiválása sikertelen.\n"
+"Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
+"libgtkhtml van-e telepítve.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "A Ximian Evolution csoportmunka-programcsomag"
@@ -12435,11 +12727,6 @@ msgstr "%Y %b %d"
 msgid "Select a time to compare against"
 msgstr "Idő megadása"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "<b>_Szűrő szabályok</b>"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12468,19 +12755,8 @@ msgstr "Meg kell adnod egy fájlnevet."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "%s mappa áthelyezése"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Meg kell adnia egy mappát."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12488,88 +12764,118 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Kiosztás"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Meg kell adnia a szűrő nevét."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Meg kell adnod a vmappa nevét."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 #, fuzzy
 msgid "Please choose another name."
 msgstr "Válassz egy kiszolgálót."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nincs kiszolgáló kiválasztva."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Fájl kiválasztása"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Fontos"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Teendő"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "Később"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Teszt"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Szabály neve:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Ha</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ha minden feltétel teljesül"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ha bármelyik feltétel teljesül"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Művelet végrehajtása,"
+
+#: filter/filter-rule.c:877
 #, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Határidő:</b> "
+msgid "All related"
+msgstr "Delegált"
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
-msgid "Select Folder"
-msgstr "Mappa kiválasztása"
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Címzettek"
 
-#: filter/filter.glade.h:1
-msgid "    "
-msgstr "    "
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Válasz"
 
-#: filter/filter.glade.h:2
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Beleértve:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "bejövő"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "kimenő"
+
+#: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Szűrő szabályok</b>"
 
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>VMappa források</b>"
-
-#: filter/filter.glade.h:4
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr "Összehasonlítás"
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr "Bejövő"
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -12577,7 +12883,7 @@ msgstr ""
 "A levél dátuma az itt megadott dátummal\n"
 "lesz összehasonlítva."
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -12585,7 +12891,7 @@ msgstr ""
 "A levél dátuma a szűrő futtatásának dátumához\n"
 "viszonyított dátumhoz lesz hasonlítva."
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -12593,498 +12899,447 @@ msgstr ""
 "A levél dátuma a szűrő futtatásakor a jelenlegi\n"
 "dátummal lesz összehasonlítva."
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr "az idő mostantól számítva"
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr "óta"
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr "hónap"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "másodperc"
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "csak a megadott mappák"
-
-#: filter/filter.glade.h:21
+#: filter/filter.glade.h:18
 msgid "the current time"
 msgstr "a pontos idő most"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:19
 msgid "the time you specify"
 msgstr "megadott idő"
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "az összes aktív távoli mappával"
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "év"
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "az összes helyi és aktív távoli mappával"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Szabály hozzáadása"
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "az összes helyi mappával"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Szabály szerkesztése"
 
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "év"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Szabály neve"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Fontos"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Teendő"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Levélszerkesztő beállításai"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Később"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+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."
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Teszt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+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"
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Szabály neve:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Postafiókok beállítása"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Ha</b> "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Levelező"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "ha minden feltétel teljesül"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Levelező postafiók-beállító kontroll"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "ha bármelyik feltétel teljesül"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Levelező komponens"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Művelet végrehajtása,"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution levélszerkesztő"
 
-#: filter/filter-rule.c:877
-#, fuzzy
-msgid "All related"
-msgstr "Delegált"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Levelezés levélszerkesztő beállító kontrollja"
 
-#: filter/filter-rule.c:877
-#, fuzzy
-msgid "Replies"
-msgstr "Címzettek"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Levelező beállító kontroll"
 
-#: filter/filter-rule.c:877
-#, fuzzy
-msgid "Replies and parents"
-msgstr "Válasz"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Levél"
 
-#: filter/filter-rule.c:879
-#, fuzzy
-msgid "Include threads"
-msgstr "Beleértve:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Postafiókok"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "bejövő"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Levelezés beállításai"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "kimenő"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Levél"
+
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
+msgstr "[Alapértelmezett]"
+
+#: mail/em-account-prefs.c:472
+msgid "Account name"
+msgstr "Postafiók neve:"
+
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
+msgstr "Névtelen"
+
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
+msgstr "Nyelv(ek)"
+
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
+msgstr "Aláírás-parancsfájl hozzáadása"
+
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr "Aláírás(ok)"
+
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Továbbított levél --------"
+
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
+msgstr "ismeretlen feladó"
+
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>_Szűrő szabályok</b>"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Mappa kiválasztása"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
 msgstr "Pontszám beállítása"
 
-#: filter/libfilter-i18n.h:3
+#: mail/em-filter-i18n.h:3
 msgid "Assign Color"
 msgstr "Szín hozzárendelése"
 
-#: filter/libfilter-i18n.h:4
+#: mail/em-filter-i18n.h:4
 msgid "Assign Score"
 msgstr "Pontszám hozzárendelése"
 
-#: filter/libfilter-i18n.h:5
+#: mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Mellékletek"
 
-#: filter/libfilter-i18n.h:6
+#: mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "Hangjelzés"
 
-#: filter/libfilter-i18n.h:7
+#: mail/em-filter-i18n.h:7
 msgid "contains"
 msgstr "tartalmazza"
 
-#: filter/libfilter-i18n.h:8
+#: mail/em-filter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Mappába másolás"
 
-#: filter/libfilter-i18n.h:9
+#: mail/em-filter-i18n.h:9
 msgid "Date received"
 msgstr "Fogadás dátuma"
 
-#: filter/libfilter-i18n.h:10
+#: mail/em-filter-i18n.h:10
 msgid "Date sent"
 msgstr "Küldés dátuma"
 
-#: filter/libfilter-i18n.h:12
+#: mail/em-filter-i18n.h:12
 msgid "Deleted"
 msgstr "Törölt"
 
-#: filter/libfilter-i18n.h:13
+#: mail/em-filter-i18n.h:13
 msgid "does not contain"
 msgstr "nem tartalmazza"
 
-#: filter/libfilter-i18n.h:14
+#: mail/em-filter-i18n.h:14
 msgid "does not end with"
 msgstr "nem végződik"
 
-#: filter/libfilter-i18n.h:15
+#: mail/em-filter-i18n.h:15
 msgid "does not exist"
 msgstr "nem létezik"
 
-#: filter/libfilter-i18n.h:16
+#: mail/em-filter-i18n.h:16
 msgid "does not return"
 msgstr "nem tér vissza"
 
-#: filter/libfilter-i18n.h:17
+#: mail/em-filter-i18n.h:17
 msgid "does not sound like"
 msgstr "nem úgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:18
+#: mail/em-filter-i18n.h:18
 msgid "does not start with"
 msgstr "nincs az elején"
 
-#: filter/libfilter-i18n.h:19
+#: mail/em-filter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Nem létezik"
 
-#: filter/libfilter-i18n.h:20
+#: mail/em-filter-i18n.h:20
 msgid "Draft"
 msgstr "Piszkozat"
 
-#: filter/libfilter-i18n.h:21
+#: mail/em-filter-i18n.h:21
 msgid "ends with"
 msgstr "végződik"
 
-#: filter/libfilter-i18n.h:22
+#: mail/em-filter-i18n.h:22
 msgid "Exist"
 msgstr "Létezik"
 
-#: filter/libfilter-i18n.h:23
+#: mail/em-filter-i18n.h:23
 msgid "exists"
 msgstr "létezik"
 
-#: filter/libfilter-i18n.h:24
+#: mail/em-filter-i18n.h:24
 msgid "Expression"
 msgstr "Kifejezés"
 
-#: filter/libfilter-i18n.h:25
+#: mail/em-filter-i18n.h:25
 msgid "Follow Up"
 msgstr "Nyomon követés"
 
-#: filter/libfilter-i18n.h:27
+#: mail/em-filter-i18n.h:27
 msgid "is"
 msgstr "="
 
-#: filter/libfilter-i18n.h:28
+#: mail/em-filter-i18n.h:28
 msgid "is after"
 msgstr "után volt"
 
-#: filter/libfilter-i18n.h:29
+#: mail/em-filter-i18n.h:29
 msgid "is before"
 msgstr "előtte volt"
 
-#: filter/libfilter-i18n.h:30
+#: mail/em-filter-i18n.h:30
 msgid "is Flagged"
 msgstr "megjelölt"
 
-#: filter/libfilter-i18n.h:31
+#: mail/em-filter-i18n.h:31
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:32
+#: mail/em-filter-i18n.h:32
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:33
+#: mail/em-filter-i18n.h:33
 msgid "is not"
 msgstr "nem"
 
-#: filter/libfilter-i18n.h:34
+#: mail/em-filter-i18n.h:34
 msgid "is not Flagged"
 msgstr "nem megjelölt"
 
-#: filter/libfilter-i18n.h:36
+#: mail/em-filter-i18n.h:36
 #, fuzzy
 msgid "Junk Test"
 msgstr "június"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Címke"
 
-#: filter/libfilter-i18n.h:38
+#: mail/em-filter-i18n.h:38
 msgid "Mailing list"
 msgstr "Levelezőlista"
 
-#: filter/libfilter-i18n.h:39
+#: mail/em-filter-i18n.h:39
 msgid "Message Body"
 msgstr "Levéltörzs"
 
-#: filter/libfilter-i18n.h:40
+#: mail/em-filter-i18n.h:40
 msgid "Message Header"
 msgstr "Levél fejléce"
 
-#: filter/libfilter-i18n.h:41
+#: mail/em-filter-i18n.h:41
 #, fuzzy
 msgid "Message is Junk"
 msgstr "Üzenetek"
 
-#: filter/libfilter-i18n.h:42
+#: mail/em-filter-i18n.h:42
 #, fuzzy
 msgid "Message is not Junk"
 msgstr "Küldendő üzenet"
 
-#: filter/libfilter-i18n.h:43
+#: mail/em-filter-i18n.h:43
 msgid "Move to Folder"
 msgstr "Áthelyezés mappába"
 
-#: filter/libfilter-i18n.h:44
+#: mail/em-filter-i18n.h:44
 #, fuzzy
 msgid "Pipe to Program"
 msgstr "Kilépés a programból"
 
-#: filter/libfilter-i18n.h:45
+#: mail/em-filter-i18n.h:45
 msgid "Play Sound"
 msgstr "Hangjelzés"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Olvasott"
 
-#: filter/libfilter-i18n.h:47
+#: mail/em-filter-i18n.h:47
 msgid "Recipients"
 msgstr "Címzettek"
 
-#: filter/libfilter-i18n.h:48
+#: mail/em-filter-i18n.h:48
 msgid "Regex Match"
 msgstr "Regex illeszkedés"
 
-#: filter/libfilter-i18n.h:49
+#: mail/em-filter-i18n.h:49
 msgid "Replied to"
 msgstr "Válasz"
 
-#: filter/libfilter-i18n.h:50
+#: mail/em-filter-i18n.h:50
 msgid "returns"
 msgstr "visszatér"
 
-#: filter/libfilter-i18n.h:51
+#: mail/em-filter-i18n.h:51
 msgid "returns greater than"
 msgstr "visszatér nagyobb mint"
 
-#: filter/libfilter-i18n.h:52
+#: mail/em-filter-i18n.h:52
 msgid "returns less than"
 msgstr "visszatér kisebb mint"
 
-#: filter/libfilter-i18n.h:53
+#: mail/em-filter-i18n.h:53
 msgid "Run Program"
 msgstr "Program futtatása"
 
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Pontszám"
 
-#: filter/libfilter-i18n.h:55
+#: mail/em-filter-i18n.h:55
 msgid "Sender"
 msgstr "Feladó"
 
-#: filter/libfilter-i18n.h:56
+#: mail/em-filter-i18n.h:56
 msgid "Set Status"
 msgstr "Állapot beállítása"
 
-#: filter/libfilter-i18n.h:57
+#: mail/em-filter-i18n.h:57
 msgid "Size (kB)"
 msgstr "Méret (kB)"
 
-#: filter/libfilter-i18n.h:58
+#: mail/em-filter-i18n.h:58
 msgid "sounds like"
 msgstr "úgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:59
+#: mail/em-filter-i18n.h:59
 msgid "Source Account"
 msgstr "Forráspostafiók"
 
-#: filter/libfilter-i18n.h:60
+#: mail/em-filter-i18n.h:60
 msgid "Specific header"
 msgstr "Adott fejléc"
 
-#: filter/libfilter-i18n.h:61
+#: mail/em-filter-i18n.h:61
 msgid "starts with"
 msgstr "kezdete"
 
-#: filter/libfilter-i18n.h:63
+#: mail/em-filter-i18n.h:63
 msgid "Stop Processing"
 msgstr "Feldolgozás leállítása"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
+#: smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Tárgy"
 
-#: filter/libfilter-i18n.h:65
+#: mail/em-filter-i18n.h:65
 msgid "Unset Status"
 msgstr "Állapot nincs beállítva"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Szabály hozzáadása"
-
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Szabály szerkesztése"
-
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Szabály neve"
-
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Pont_számszabályok"
-
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "A szövegtörzs tartalmazza"
-
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "A szövegtörzs nem tartalmazza"
-
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "A szövegtörzs vagy a tárgy tartalmazza"
-
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "A levél tartalmazza"
-
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "A címzett tartalmazza"
-
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "A feladó tartalmazza"
-
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "A tárgy tartalmazza"
-
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "A tárgy nem tartalmazza"
-
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtuális _mappák"
-
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "Hozzá_adás"
-
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VMappa-forrás"
-
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
-msgstr "[Alapértelmezett]"
-
-#: mail/em-account-prefs.c:472
-msgid "Account name"
-msgstr "Postafiók neve:"
-
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
-msgstr "Névtelen"
-
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
-msgstr "Nyelv(ek)"
-
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
-msgstr "Aláírás-parancsfájl hozzáadása"
-
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
-msgstr "Aláírás(ok)"
-
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Továbbított levél --------"
-
-#: mail/em-composer-utils.c:1499
-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-composer-utils.c:1509
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y.%m.%d, %a keltezéssel %H.%M %%+05d-kor %%s ezt írta:"
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Határidő:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuális mappa gyártása a keresésből"
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Mappa tulajdonságai"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Tulajdonságok"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Mappanév"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Összes üzenet"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Összes üzenet"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Olvasatlan üzenetek"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Olvasatlan üzenetek"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -13094,393 +13349,427 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Add meg, hogy hol hozod létre a mappát."
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 msgid "Create"
 msgstr "Létrehozás"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VMappák"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Betöltés..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s mappa áthelyezése"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s mappa másolása"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Levelek áthelyezése a(z) %s mappába"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Levelek másolása a(z) %s mappába"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Másolás mappába"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Á_thelyezés mappába"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "Á_thelyezés"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "A feladat lemondása"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Másolás"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' mappa létrehozása"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Mappa létrehozása"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa átnevezése erre:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Mappa átnevezése"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Nézet"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Megnyitás ú_j ablakban"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Másolás"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "Á_thelyezés"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: mail/em-folder-tree.c:2558
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "Á_tnevezés"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Tulajdonságok..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
-msgid "VFolders"
-msgstr "VMappák"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Beérkezett levelek"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
-msgid "Loading..."
-msgstr "Betöltés..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
-msgid "Mail"
-msgstr "Levél"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Továbbítás"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Követés..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Befejezve _Jelölő"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "J_elölő törlése"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Elolvasva"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Visszaállítás"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Á_thelyezés mappába..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Szűrők alkalmazása"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Szűrő szabályok"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "S_zabály gyártása levélből"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tárgyra"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _címzettekre"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezőlistára"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Szű_rő a tárgyra"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Szűrő a _címzettekre"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Hivatkozás cí_mének másolása"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kattintson a(z) %s elküldéséhez"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Feladó"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Válaszcím"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Címzett"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Másolat"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Rejtett másolat"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dátum"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s melléklet"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nem lehet feldolgozni az S/MIME-üzenetet: Ismeretlen hiba"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-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.c:1298
-msgid "Unsupported signature format"
-msgstr "Nem támogatott aláírási formátum"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Hiba az aláírás ellenőrzésekor"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Ismeretlen hiba az aláírás ellenőrzésekor"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' letöltése"
+msgid "Matches: %d"
+msgstr "Találatok: %d"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 #, fuzzy
 msgid "Unsigned"
 msgstr "Hozzárendelve"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "Érvényes aláírás"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "Érvénytelen aláírás"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
+"ellenőrizhető."
+
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Megszakítva"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "Titkosított, gyenge"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "Titkosított"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "Titkosított, erős"
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Tanúsítvány megtekintése"
+
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr "A tanúsítvány nem megtekinthető"
+
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%Y %B %d, %l:%M %P szerint"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Lejárt elemek:"
+
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%Y %B %d, %l:%M %P szerint"
+
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Megtekintés beágyazva"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "_Elrejtés"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d/%d oldal"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' letöltése"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Hibás külső törzsrész."
@@ -13514,9 +13803,35 @@ msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
 msgid "Formatting message"
 msgstr "Levél formázása"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Feladó"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Válaszcím"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Címzett"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Másolat"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Rejtett másolat"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Levelező"
 
@@ -13530,105 +13845,43 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "Találatok: %d"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
-"ellenőrizhető."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dátum"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s melléklet"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nem lehet feldolgozni az S/MIME-üzenetet: Ismeretlen hiba"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757
-msgid "_View Certificate"
-msgstr "_Tanúsítvány megtekintése"
-
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
-msgstr "A tanúsítvány nem megtekinthető"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y %B %d, %l:%M %P szerint"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Lejárt elemek:"
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%Y %B %d, %l:%M %P szerint"
+#: mail/em-format.c:1279
+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-display.c:1088
-#, fuzzy
-msgid "_View Inline"
-msgstr "Megtekintés beágyazva"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nem támogatott aláírási formátum"
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "_Elrejtés"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Hiba az aláírás ellenőrzésekor"
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d/%d oldal"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Ismeretlen hiba az aláírás ellenőrzésekor"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13654,7 +13907,7 @@ msgstr "Egy _hét"
 msgid "Once per month"
 msgstr "Egy hón_ap"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13662,89 +13915,89 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nem sikerült másolni a fájlleírót: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Mentés másként..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Névtelen levél"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Hivatkozás _megnyitása böngészőben"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Ü_zenet küldése a listának..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Hozzá_adás a címjegyzékhez"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %s..."
@@ -13757,7 +14010,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Feliratkozva"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mappa"
 
@@ -13791,11 +14044,23 @@ msgid "Add address"
 msgstr "Cím hozzáadása"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "A feladó %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtuális _mappák"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "Hozzá_adás"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VMappa-forrás"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatikus hivatkozás-felismerés"
@@ -14038,7 +14303,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -14266,80 +14532,48 @@ msgstr ""
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Levélszerkesztő beállításai"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Postafiókok beállítása"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Levelező"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Levelező postafiók-beállító kontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Levelező komponens"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importáló"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution levélszerkesztő"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importáló"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Levelezés levélszerkesztő beállító kontrollja"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importáló"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Levelező beállító kontroll"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importáló"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Postafiókok"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importáló"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Levelezés beállításai"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Levél"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evolution importálja a régi Elm-leveleket."
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importálás folyamatban..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Várj"
@@ -14361,54 +14595,28 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Célmappa:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Válassz importálót"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "`%s' importálása"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Postaláda importálása"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importáló"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14539,15 +14747,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Gép:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Ú_tvonal:"
 
@@ -14575,81 +14783,80 @@ msgstr "%s levelezőlista"
 msgid "Add Filter Rule"
 msgstr "Szűrőszabály hozzáadása"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d törölt"
+msgid_plural "%d deleted"
+msgstr[0] "%d törölt"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d elküldetlen"
+msgid_plural "%d junk"
+msgstr[0] "%d elküldetlen"
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d piszkozat"
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d piszkozat"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d elküldött"
+msgid_plural "%d sent"
+msgstr[0] "%d elküldött"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d elküldetlen"
+msgid_plural "%d unsent"
+msgstr[0] "%d elküldetlen"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "összesen: %d"
+msgid_plural "%d total"
+msgstr[0] "összesen: %d"
 
-#: mail/mail-component.c:496
-#, c-format
+#: mail/mail-component.c:494
+#, fuzzy, c-format
 msgid ", %d unread"
-msgstr ", %d olvasatlan"
+msgid_plural ", %d unread"
+msgstr[0] ", %d olvasatlan"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Új VMappa"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Levélszűrők"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Szolgáltatás ellenőrzése"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Kapcsolódás a kiszolgálóhoz..."
-
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Azonosító"
 
@@ -14664,7 +14871,7 @@ msgstr ""
 "leveleidben."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Levelek fogadása"
 
@@ -14681,7 +14888,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Válassz az alábbi lehetőségek közül"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Levelek küldése"
 
@@ -14694,7 +14901,7 @@ msgstr ""
 "nem tudod, hogy milyen protokollt kell használnod, kérdezd meg a "
 "rendszergazdát vagy az internetszolgáltatót."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Postafiók-kezelés"
 
@@ -14711,241 +14918,253 @@ 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.glade.h:1
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Szolgáltatás ellenőrzése"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kapcsolódás a kiszolgálóhoz..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>Előnézet</b>"
-
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>A_láírások</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Nye_lvek</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Figyelmeztetések</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Beállítás</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Általános</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Címkék és színek</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Képek betöltése</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Értesítés új levélről"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Biztonság</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Elküldött levelek és piszkozatok"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Postafiók-szerkesztő"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Ú_j aláírás hozzáadása..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "_Parancsfájl hozzáadása"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Mindig küldjön má_solatot (Cc) ide:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Mindig küldjön rejtett másolatot (_Bcc) ide:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 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:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Titkosításkor mindig megbízom a kulcskarikámon található kulcsokban."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Eredeti levél csatolása"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Melléklet"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Hangulatjelek képeinek automatikus beillesztése"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Hangjelzés új levél beérkezésekor"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Karakterkészlet:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Helyesírás-ellenőrzés _beírás közben"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Ro_sszul írt szavak színe:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Színek"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Megerősítés a mappa tisztításakor"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14961,109 +15180,115 @@ msgstr ""
 "\n"
 "Kattints az \"Alkalmaz\" gombra a beállítások mentéséhez."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Alapértelmezett"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "_Alapértelmezett karakterkódolás:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Alapértékek"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ne idézze az eredeti levelet"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 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)"
+msgstr ""
+"Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitás esetén)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Kész"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Piszkozatok _mappa:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Postafiókok"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "E-mail _cím:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Fi_x szélességű:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Betűk beállításai"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Üzenetek _HTML formázása"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML-levél"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Fejlécek"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Idézetek kiemelése"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Beleértve:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Beágyazott"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Levelezés beállítása"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postafiók helye"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Levélszerkesztő"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15071,135 +15296,135 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonosítója:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 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:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Eredeti levél idézése"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Idézet"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Jelszó _megjegyzése"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Vá_laszcím:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Fogadás beállításai"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Szabványos betűkészlet:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Biztonság"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Fix szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Fix szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Változó szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Kijelölés..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "El_küldött levelek mappája"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolgáló megköveteli a _hitelesítést"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Kiszolgáló _típusa: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Aláí_rás:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Aláírások"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Fájlnév megadása:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Helyesírás-ellenőrzés"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Szabványos Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Típus: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15208,7 +15433,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:144
+#: mail/mail-config.glade.h:147
 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 "
@@ -15218,7 +15443,7 @@ msgstr ""
 "azok a nyelvek vannak felsorolva, amelyekhez van telepítve helyesírás-"
 "ellenőrző szótár."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15226,15 +15451,11 @@ msgstr ""
 "Írd be azt a nevet, amellyel hivatkozni szeretnél erre a postafiókra.\n"
 "Például: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "_Daemon használata"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15244,95 +15465,202 @@ msgstr ""
 "\n"
 "A folytatáshoz kattints a \"Következő\" gombra."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Aláírás hozzáadása"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Mindig töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, 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:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne értesítsen, ha új levél érkezik"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Kim_enő üzenetek titkosítása (alapértelmezettként)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Képek betöltése, ha a feladó szerepel a címjegyzékben"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 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:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Soha ne töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 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:174
+#: mail/mail-config.glade.h:175
 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:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Animált képek _megjelenítése"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 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:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "szín"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "leírás"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>VMappa források</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digitális aláírás</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Titkosítás</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Elfogadva"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Kész"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Kis- és nagybetűk megkülönböztetése"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Keresés a levélben"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Keresés:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Jelölő nyomon követéshez"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Feliratkozás mappákra"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Semmi sincs kiválasztva"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Kiszolgáló:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Biztonsági adatok"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Az alábbiakban felsorolt üzenete(ke)t jelölted meg nyomon követésre.\n"
+"Kérlek válassz egy nyomon követési tevékenységet a \"Jelölő\" menüből."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Postafiókok listája"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Esedékes:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Jelölő:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Feliratkozás"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Leiratkozás"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "csak a megadott mappák"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "az összes aktív távoli mappával"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "az összes helyi és aktív távoli mappával"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "az összes helyi mappával"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -15378,8 +15706,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Küldés"
+msgstr "Küldés"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15424,7 +15753,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
@@ -15499,7 +15829,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15534,14 +15864,6 @@ msgstr "Hiba a művelet végrehajtása közben."
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15561,11 +15883,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nem lehet létrehozni a(z) `%s' könyvtárat: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15587,12 +15904,6 @@ msgstr "Nem lehet létrehozni a(z) `%s' könyvtárat: %s."
 msgid "Cannot create temporary save directory."
 msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15650,8 +15961,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Nem sikerült a mappa áthelyezése: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15702,8 +16014,9 @@ msgstr "Nem lehet megnyitni a forrást"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "és egy másik névjegy."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15732,8 +16045,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Nem töröl"
+msgstr "_Visszaállítás"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15797,8 +16111,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "Nem lehet törölni a helyi %s mappát."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15840,13 +16155,44 @@ msgstr ""
 "    '%s'\n"
 "és frissítve lettek."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "%s mappa áthelyezése"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Meg kell adnia egy mappát."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Meg kell adnod a vmappa nevét."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nincs kiszolgáló kiválasztva."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15854,43 +16200,39 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Felülírás"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "_Megnyitás"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Várj"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Mappa szűrése"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült alkalmazni a kimenő szűrőket: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15899,115 +16241,115 @@ msgstr ""
 "Nem sikerült hozzáírni a következőhöz: %s: %s\n"
 "A helyi `Elküldött elemek' mappához lesz hozzáírva."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nem sikerült hozzáírni a helyi `Elküldött elemek' mappához: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "A levél dekódolása sikertelen."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d levél letöltése"
 msgstr[1] "%d levél letöltése"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d levél mentése"
 msgstr[1] "%d levél mentése"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16016,7 +16358,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16025,11 +16367,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16038,45 +16380,21 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Kis- és nagybetűk megkülönböztetése"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Keresés a levélben"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Keresés:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitális aláírás</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Titkosítás</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Biztonsági adatok"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Megszakítás..."
@@ -16112,24 +16430,24 @@ msgstr "Frissítés..."
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "A felhasználó megszakította a műveletet."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Írd be a jelszót"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -16186,79 +16504,79 @@ msgstr "vMappák frissítése erre az uri-ra: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "vMappák frissítése erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Új VMappa"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nem nézett"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Nézett"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Megválaszolt"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Több láthatatlan levél"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Több levél"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -16326,50 +16644,49 @@ msgstr "Válasz mindenkinek"
 msgid "Review"
 msgstr "Átnézés"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Jelölő nyomon követéshez"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "A szövegtörzs tartalmazza"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Kész"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "A szövegtörzs nem tartalmazza"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Az alábbiakban felsorolt üzenete(ke)t jelölted meg nyomon követésre.\n"
-"Kérlek válassz egy nyomon követési tevékenységet a \"Jelölő\" menüből."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "A szövegtörzs vagy a tárgy tartalmazza"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Esedékes:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "A levél tartalmazza"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Jelölő:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "A címzett tartalmazza"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Feliratkozás mappákra"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "A feladó tartalmazza"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Semmi sincs kiválasztva"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "A tárgy tartalmazza"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Kiszolgáló:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "A tárgy nem tartalmazza"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Feliratkozás"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Héj"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Leiratkozás"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Teszt"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Teszt komponens"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16398,7 +16715,8 @@ msgstr "Levelezést Levelező beállító kontrollja"
 #: shell/apps_evolution_shell.schemas.in.in.h:6
 #, 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"
+msgstr ""
+"A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
 msgid ""
@@ -16413,50 +16731,41 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "mail"
-msgstr "e-mail"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Készítették:"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%B %d"
+msgid "Whether the toolbar should be visible."
+msgstr ""
 
-#: shell/e-shell.c:744
-#, fuzzy
-msgid "Uknown system error."
-msgstr "Ismeretlen hiba"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
 
-#: shell/e-shell.c:1101
-msgid "Invalid arguments"
-msgstr "Érvénytelen argumentumok"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "mail"
+msgstr "e-mail"
 
-#: shell/e-shell.c:1103
-msgid "Cannot register on OAF"
-msgstr "Nem sikerült regisztrálni az OAF-ban"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktív kapcsolatok</b>"
 
-#: shell/e-shell.c:1105
-msgid "Configuration Database not found"
-msgstr "A beállítások adatbázisa nem található"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktív kapcsolatok"
 
-#: shell/e-shell.c:1107
-msgid "Generic error"
-msgstr "Általános hiba"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Kattintson az OK gombra a kapcsolat bezárásához"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16514,7 +16823,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Válassz importálót"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' fájl nem létezik."
@@ -16542,31 +16851,32 @@ msgstr ""
 "%s importálása\n"
 "1. elem importálása."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Fájlnév:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Fájlnév:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Válassz egy fájlt"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Fájl_típus:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Adat_ok és beállítások importálása korábbi programokból"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Egyetlen fájl importálá_sa"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16574,26 +16884,26 @@ msgstr ""
 "Várj...\n"
 "Meglévő beállítások keresése"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importálók indítása"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Feladó %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "'%s' protokollhoz nincs támogatás"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "A gpg végrehajtása sikertelen."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importálás"
 
@@ -16638,195 +16948,111 @@ msgstr "A mappanév nem tartalmazhatja a \"#\" karaktert."
 msgid "'.' and '..' are reserved folder names."
 msgstr "A '.' és a '..' fenntartott mappanevek."
 
-#: shell/e-shell-window.c:336
-#, fuzzy
-msgid "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-window.c:343
-#, fuzzy
-msgid "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-window.c:349
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"A Ximian Evolution kapcsolat nélküli módban van. Kattintson erre a gombra a "
-"hálózatra csatlakozáshoz."
-
-#: shell/e-shell-window.c:621
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "A címzett %s"
-
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Úgy tűnik, hogy nincsenek telepítve a rendszerre GNOME Pilot eszközök."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Hiba a %s végrehajtása közben."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "A Bug Buddy nincs telepítve."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Nem sikerült futtatni a Bug buddy-t."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
-msgid "About Evolution"
-msgstr "A Ximian Evolution névjegye"
+msgid "Groupware Suite"
+msgstr "Csoport"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Munka a hálózatban"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Jelölőnégyzet"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Új"
-
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ismeretlen hiba."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"A komponensrendszer által adott hiba:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"%s\n"
-"\n"
-"Az aktiválórendszer által adott hiba:\n"
-"%s"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Új teszt"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Teszt"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Új tesztelem létrehozása"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Aktív kapcsolatok</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktív kapcsolatok"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Kattintson az OK gombra a kapcsolat bezárásához"
+"A Ximian Evolution a hálózatban van. Kattints erre a gombra a kapcsolat "
+"nélküli munkához."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "C_alendar:"
-msgstr "Naptár:"
+msgid "Evolution is in the process of going offline."
+msgstr "A Ximian Evolution felkészül a kapcsolat nélküli munkára."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Névjegyek: "
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"A Ximian Evolution kapcsolat nélküli módban van. Kattintson erre a gombra a "
+"hálózatra csatlakozáshoz."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "Levél"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "A címzett %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-#, fuzzy
-msgid "_Tasks:"
-msgstr "_Feladatok"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "Folder _type:"
-msgstr "Fájl_típus:"
+msgid "Uknown system error."
+msgstr "Ismeretlen hiba"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "El_küldött levelek mappája"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Érvénytelen argumentumok"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "_Azonosítónév:"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Nem sikerült regisztrálni az OAF-ban"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "Mappanév"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "A beállítások adatbázisa nem található"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "_Felhasználónév:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Általános hiba"
+
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Új"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution beállító varázsló"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fájlok importálása"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Időzóna "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Üdvözlet"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16840,7 +17066,7 @@ msgstr ""
 "\n"
 "A folytatáshoz kattintson a \"Tovább\" gombra."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16851,21 +17077,22 @@ msgstr ""
 "\n"
 "Beállításainak mentéséhez kattintson az \"Alkalmaz\" gombra. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Héj"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Új teszt"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Teszt"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Teszt"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Teszt komponens"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Új tesztelem létrehozása"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "A fájl importálásának megkezdéséhez kattintson az \"Importálás\" gombra."
+msgstr ""
+"A fájl importálásának megkezdéséhez kattintson az \"Importálás\" gombra."
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -16923,7 +17150,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a következő fájlokból képes adatokat importálni:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16959,7 +17186,7 @@ msgstr ""
 "Reméljük, élvezni fogja a kemény munkánk eredményét, és várjuk\n"
 "hozzájárulását! \n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16968,39 +17195,39 @@ msgstr ""
 "Köszönettel\n"
 "A Ximian Evolution Csapat\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ne jelenítse meg többet"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17074,31 +17301,53 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Válasszon ki egy importálandó tanúsítványt..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Tanúsítvány neve"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Folyamatjelző"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Sorozatszám"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Lejárat"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-mail cím"
 
@@ -17143,6 +17392,11 @@ msgstr ""
 "Kibocsátó:\n"
 "  Tárgy: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Ugrás adott dátumra"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17200,7 +17454,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Tanúsítvány"
 
@@ -17224,19 +17478,23 @@ msgstr "Közönséges név"
 msgid "Contact Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Szerkesztés"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17272,266 +17530,277 @@ msgstr "Szervezeti egység"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Nézet"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Tanúsítvány megtekintése"
+msgid "View"
+msgstr "Nézet"
 
 #: 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:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Az ön tanúsítványai"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "A tanúsítvány már létezik"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Aláírás"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Titkosított"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Verzió"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "1. verzió"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "2. verzió"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "3. verzió"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr "°C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Visszavont Tanúsítvány"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Nem megbízható tanúsítvány"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "Azonosító"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Hiba: Nem sikerült feldolgozni a kiterjesztést"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Aláírás"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nincs információ"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "melléklet"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritikus"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nem kritikus"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Kiterjesztések"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s-kor"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Kibocsátó"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Tanúsítványaláírás-hiba"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "A tanúsítvány már létezik"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17563,7 +17832,8 @@ msgstr "A melléklet leírása"
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr "A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg"
+msgstr ""
+"A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg"
 
 #: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -17674,9 +17944,9 @@ msgstr "A jelenlegi névjegy megtekintése"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Műveletek"
 
@@ -17841,7 +18111,7 @@ msgstr "_Bezárás"
 #: 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
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Bezárás"
 
@@ -17854,7 +18124,7 @@ msgid "Delete this item"
 msgstr "Elem törlése"
 
 #: 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:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Fő eszköztár"
 
@@ -17897,7 +18167,7 @@ msgstr "Elem mentése lemezre"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fájl"
 
@@ -18087,8 +18357,10 @@ msgid "Hide _Read Messages"
 msgstr "_Olvasott levelek elrejtése"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "A törölt levelek elrejtése ahelyett, hogy vonallal áthúzottan jelenjenek meg"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"A törölt levelek elrejtése ahelyett, hogy vonallal áthúzottan jelenjenek meg"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18156,16 +18428,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 "A jelenlegi ablak bezárása"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
-msgid "_Close"
-msgstr "_Bezárás"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Fela_dó hozzáadása a címjegyzékhez"
@@ -18213,11 +18475,13 @@ msgstr "Szabály alkotása, amely szűri az ettől feladótól érkező leveleke
 
 #: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Szabály alkotása, amely szűri az ezeknek a címzetteknek szóló leveleket"
+msgstr ""
+"Szabály alkotása, amely szűri az ezeknek a címzetteknek szóló leveleket"
 
 #: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Szabály alkotása, amely szűri az erre a levelezőlistára érkező leveleket"
+msgstr ""
+"Szabály alkotása, amely szűri az erre a levelezőlistára érkező leveleket"
 
 #: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
@@ -18566,7 +18830,7 @@ msgstr "_Előző levél"
 msgid "_Quoted"
 msgstr "_Idézetként"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Eszközök"
 
@@ -18574,6 +18838,16 @@ msgstr "_Eszközök"
 msgid "_Undelete"
 msgstr "_Visszaállítás"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "A jelenlegi ablak bezárása"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Bezárás"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Csatolás"
@@ -18656,10 +18930,6 @@ msgstr "A jelenlegi fájl mentése más néven"
 msgid "Save the message in a specified folder"
 msgstr "A levél mentése a megadott mappába"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Küldés"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18867,109 +19137,123 @@ msgid "_Open Task"
 msgstr "Feladatok _megnyitása"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "A Ximian Evolution névjegye..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "A Ximian Evolution névjegye"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Az Evolution beállításainak szerkesztése"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Mappa tulajdonságainak megváltoztatása"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Új mappa létrehozása"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Kilépés"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _GYIK"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Kilépés a programból"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "_Jelszavak elfelejtése"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Elfelejti a megjegyzett jelszavakat, újra meg fogja kérdezni"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Adatok importálása más programokból"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Ablak"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilot beállításai..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Küldés / Fogadás"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 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:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "A Pilot beállítása"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "A Ximian Evolution névjegyének megjelenítése"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 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:21
-msgid "Toggle whether we are working offline."
-msgstr "Váltás kapcsolat nélküli munkára"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _GYIK"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Fő eszköztár"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "A Ximian Evolution _névjegye..."
+msgid "Toggle whether we are working offline."
+msgstr "Váltás kapcsolat nélküli munkára"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "A Ximian Evolution névjegye"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importálás..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "Ú_j"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Levelezés beállításai"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Küldés / Fogadás"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Ablak"
@@ -19043,7 +19327,7 @@ msgid "With _Status"
 msgstr "Állapot beállítása"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19200,32 +19484,33 @@ msgstr "Egyéb..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution Levelező"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Információ az értekezletről"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution Teszt"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "Elküldött levelek és piszkozatok"
 
 #: widgets/misc/e-expander.c:181
@@ -19362,12 +19647,509 @@ msgstr "Nem lehet menteni a(z) \"{0}\"-t."
 msgid "Cannot open file \"{0}\"."
 msgstr "Nem lehet megnyitni a(z) \"{0}\"-t."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
+
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Rossz hitelesítési válasz a kiszolgálótól"
+
+#~ msgid "Login name:"
+#~ msgstr "Bejelentkezési név:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nem sikerült kapcsolódni az LDAP-kiszolgálóhoz"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nem lehet elvégezni a lekérdezést a DSE gyökérkönyvtárban"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Hiba a sémainformációk betöltése közben"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Támogatott típusok lekérdezése"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Kapcsolódás"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Megkülönböztető _név:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail cím:"
+
+#~ 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"
+
+#~ msgid "One"
+#~ msgstr "Egy"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Keresés _hatóköre: "
+
+#~ msgid "Searching"
+#~ msgstr "Keresés"
+
+#~ msgid "Sub"
+#~ msgstr "Al"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Itt határozhatod meg, hogy mennyi ideig tartson egy keresés."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_SSL/TLS használata:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Megjelenítendő név:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portszám:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Keresés _kiindulópontja:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Kiszolgáló neve:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Szundi idő (percek)"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Job title:"
+#~ msgstr "Beosztás:"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webkamera:"
+
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "A következő bejegyzések érvénytelenek:\n"
+#~ "\n"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nem található widget a mezőhöz: `%s'"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Lista mentése VCard-ként"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Menti a változtatásokat?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Fájlmentési hiba %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "A %s-hez\n"
+#~ "kapcsolódó címjegyzék háttér\n"
+#~ "leállt. Újra kell indítania az Evolution-t, hogy használni tudja ezt a "
+#~ "felületet"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Nem lehet betölteni az URI-t"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nem sikerült a wombatot elindítani"
+
+#~ msgid "C_alendar"
+#~ msgstr "_Naptár"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Hangos riasztás beállításai"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Riasztóüzenet beállításai"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Riasztólevél beállításai"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Riasztóprogram beállításai"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Ismeretlen típusú riasztás beállításai"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Riasztás ismétlése"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Megjelenítendő üzenet:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Küldendő üzenet"
+
+#~ msgid "Play sound:"
+#~ msgstr "Hangjelzés:"
+
+#~ msgid "Run program:"
+#~ msgstr "Program futtatása:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Ezekkel az argumentumokkal:"
+
+#~ msgid "Basics"
+#~ msgstr "Alapok"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Dátum és idő:"
+
+#~ msgid "Reminders"
+#~ msgstr "Emlékeztetők"
+
+#~ msgid "_Options..."
+#~ msgstr "_Beállítások..."
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Naptár tulajdonságai"
+
+#~ msgid "Remote"
+#~ msgstr "Távoli"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Feladatlista tulajdonságai"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Frissítési időköz:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Forrás-URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Az esemény, amit törlésre jelöltél, egy találkozó. Szeretnél küldeni egy "
+#~ "lemondási értesítést?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ 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?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Tényleg törölni akarod ezt a feladatot?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "A kitörlésre jelölt naplóbejegyzés publikus. Szeretnél küldeni egy "
+#~ "érvénytelenítő értesítést?"
+
+#~ 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?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Tényleg törölni akarod ezt a névtelen feladatot?"
+
+#~ 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?"
+
+#~ msgid "Addressbook..."
+#~ msgstr "Címjegyzék..."
+
+#~ msgid "Reminder"
+#~ msgstr "Emlékeztető"
+
+#~ msgid "B_usy"
+#~ msgstr "F_oglalt"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Bi_zalmas"
+
+#~ msgid "Date & Time"
+#~ msgstr "Dátum és idő"
+
+#~ msgid "F_ree"
+#~ msgstr "_Szabad"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Szemé_lyes"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Nyil_vános"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Rész_tvevő hozzáadása"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Mások meghívása..."
+
+#~ msgid "Preview"
+#~ msgstr "Előnézet"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Ismétlődési szabály"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Egyéni ismétlődés"
+
+#~ msgid "_Modify"
+#~ msgstr "_Módosítás"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Nincs ismétlődés"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Egyszerű ismétlődés"
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Az esemény megváltozott, de nem lett mentve.\n"
+#~ "\n"
+#~ "Akarod menteni a változásaidat?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Változások elvetése"
+
+#~ msgid "Save Event"
+#~ msgstr "Esemény mentése"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Az értekezlet adatai létrejöttek. Elküldöd?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Az értekezlet adatai megváltoztak. Küldesz egy frissített változatot?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "A feladat adatai létrejöttek. Elküldöd?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "A feladat adatai megváltoztak. Küldesz egy frissített változatot?"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _kész"
+
+#~ msgid "Progress"
+#~ msgstr "Folyamatjelző"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Bi_zalmas"
+
+#~ msgid "Folder:"
+#~ msgstr "Mappa:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Kezdődik:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Vége:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Befejezve:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Határidő:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nincs</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Hiba történt a CORBA-rendszerben\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Az elem nem található\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "A résztvevő állapotát nem lehetett frissíteni!\n"
+
+#~ msgid "_Options"
+#~ msgstr "_Beállítások"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Megbeszélés _kezdődik:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Megbeszélés _vége:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Hiba a(z) %s megnyitásakor:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nem lehet létrehozni a(z) `%s' mappát: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "S_zabály gyártása levélből"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nem sikerült zárolni a mappát: %s: %s"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Hiba a levél küldése közben: %s: a levél nem lett elküldve"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "értelmezési hiba"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Kapcsolódási hiba: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nem sikerült a csoportot letölteni: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nem sikerült elküldeni a levelet: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Ismeretlen válasz a kiszolgálótól: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nem sikerült létrehozni a szerkesztőablakot:\n"
+#~ "A HTML-szerkesztő komponens aktiválása sikertelen."
+
+#~ msgid "_Score Rules"
+#~ msgstr "Pont_számszabályok"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%Y.%m.%d, %a keltezéssel %H.%M %%+05d-kor %%s ezt írta:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Mappanév"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Tulajdonságok..."
+
+#~ msgid "Use _Daemon"
+#~ msgstr "_Daemon használata"
+
+#~ msgid "Working"
+#~ msgstr "Várj"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Készítették:"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Fájlnév:"
+
+#~ msgid "Checkbox"
+#~ msgstr "Jelölőnégyzet"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ismeretlen hiba."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "A komponensrendszer által adott hiba:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Az aktiválórendszer által adott hiba:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "C_alendar:"
+#~ msgstr "Naptár:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Névjegyek: "
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "Levél"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "_Feladatok"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Fájl_típus:"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "El_küldött levelek mappája"
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "Mappanév"
+
+#, fuzzy
+#~ msgid "_User:"
+#~ msgstr "_Felhasználónév:"
+
+#~ msgid "View Certificate"
+#~ msgstr "Tanúsítvány megtekintése"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "A Ximian Evolution névjegye..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "A Ximian Evolution _névjegye..."
diff --git a/po/is.po b/po/is.po
index 9a710798ec..f433ee6d0b 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-13 14:31-0000\n"
 "Last-Translator: helgi <helgi@trance.is>\n"
 "Language-Team: Icelandic <gnome@techattack.nu>\n"
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -50,34 +42,233 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+msgid "Could not remove addressbook."
+msgstr ""
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr ""
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+msgid "Error loading addressbook."
+msgstr ""
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr ""
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+msgid "Cannot move contact."
+msgstr ""
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+msgid "Unable to save contact(s)."
+msgstr ""
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+msgid "Error saving contacts to {0}: {1}"
+msgstr ""
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr ""
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sLykilorð fyrir %s (notandann %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+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 "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -108,7 +299,7 @@ msgid "New Contacts Group"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,9 +324,9 @@ msgstr ""
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
@@ -143,7 +334,7 @@ msgstr ""
 #  Create the default Person addressbook
 #  orange
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -152,19 +343,19 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -172,59 +363,68 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eyða"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Stillingar..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
 msgstr ""
 
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sLykilorð fyrir %s (notandann %s)"
+
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
 msgstr ""
@@ -243,58 +443,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-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 "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -302,7 +450,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -311,8 +459,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -338,6 +485,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr ""
 
@@ -381,13 +529,11 @@ msgid "Anonymously"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
@@ -599,33 +745,26 @@ msgid "cards"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "mínútur"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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.c:702
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjarlægja Allt"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjarlægja"
 
-#: 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 "Nafn"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjarlægja Allt"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -640,7 +779,7 @@ msgid "Send HTML Mail?"
 msgstr "Senda HTML Póst?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr ""
 
@@ -648,14 +787,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 "Nafn"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -678,6 +824,11 @@ msgstr ""
 msgid "_Find"
 msgstr "_Leita"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Leita"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -719,9 +870,8 @@ msgid "<b>Work</b>"
 msgstr "Forsýn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -743,7 +893,6 @@ msgid "Birthday:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr ""
 
@@ -759,15 +908,15 @@ msgid "Company:"
 msgstr "Afrita"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr ""
 
@@ -864,8 +1013,8 @@ msgstr "Síða"
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -884,39 +1033,27 @@ msgid "_File under:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Breytanlegt"
 
@@ -1888,128 +2025,120 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Annað"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2027,6 +2156,18 @@ msgstr "_Fullt Nafn"
 msgid "E-_mail:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
@@ -2149,46 +2290,65 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-msgid "Members"
+msgid "Add an email to the List"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "_Hide addresses when sending mail to this list"
+msgid "Insert email adresses from Adress Book"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "_List name:"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
+msgid "Members"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "_Type an email address or drag a contact into the list below:"
+msgid "Remove an email address from the List"
 msgstr ""
 
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Valið:"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+msgid "_Hide addresses when sending mail to this list"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+msgid "_List name:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Bók"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr ""
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
-msgid "Contact List Editor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
+msgid "Contact List Editor"
 msgstr ""
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
@@ -2225,396 +2385,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Starfs Titill"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr ""
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Yfirskrifa"
-
-#  This is a filename. Translators take note.
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard fyrir %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2628,9 +2403,9 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr ""
 
@@ -2646,131 +2421,131 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Vista sem..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Prenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Prenta Umslag"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klippa"
 
 #  create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Afrita"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Líma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -2804,6 +2579,8 @@ msgid "Car Phone"
 msgstr ""
 
 #: 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:3
 msgid "Categories"
 msgstr ""
 
@@ -2811,6 +2588,21 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr ""
@@ -2847,14 +2639,29 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2906,29 +2713,21 @@ msgstr ""
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -2945,7 +2744,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -2954,19 +2757,372 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Starfs Titill"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Yfirskrifa"
+
+#  This is a filename. Translators take note.
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard fyrir %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3011,6 +3167,11 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
@@ -3020,11 +3181,6 @@ msgstr ""
 msgid "Print contact"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr ""
@@ -3209,6 +3365,20 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3263,20 +3433,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3293,39 +3449,344 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+msgid "Don't Send"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Senda Til:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
+msgstr ""
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr ""
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+msgid "Save Appointment"
+msgstr ""
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
+msgstr ""
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Vista Sem"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+msgid "Could not start evolution-data-server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Dagatal"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr ""
@@ -3409,10 +3870,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr ""
@@ -3553,9 +4010,29 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3573,8 +4050,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dagar"
 
@@ -3591,7 +4068,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3642,62 +4119,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "D_agatal:"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Dagatal"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3727,26 +4194,6 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3764,219 +4211,130 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Dagatal"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+msgid "Custom _message"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Vista Sem"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "Senda Til:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "klukkustundir"
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Bæta við"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Heimilisfang:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+msgid "_Program:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Senda Til:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
-msgid "hour(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:16
-msgid "minute(s)"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:17
-msgid "start of appointment"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "klukkustundir"
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dagatal"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Loka"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dagatal"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Bæta við"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_Add Group"
-msgstr "Hópur:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
+msgid "Alarms"
+msgstr "Ávallt"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4090,7 +4448,7 @@ msgid "Free/Busy Publishing"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
@@ -4104,7 +4462,7 @@ msgid "Minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Mánudagur"
@@ -4114,7 +4472,7 @@ msgid "S_un"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laugardagur"
@@ -4128,7 +4486,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunnudagur"
@@ -4142,7 +4500,7 @@ msgid "T_hu"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Fimmtudagur"
@@ -4156,7 +4514,7 @@ msgid "Time format:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Þriðjudagur"
@@ -4166,7 +4524,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miðvikudagur"
@@ -4199,7 +4557,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4249,6 +4608,76 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dagatal"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Loka"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dagatal"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Hópur:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr ""
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4293,77 +4722,71 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
-msgid "Could not update object"
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
-msgid "Edit Appointment"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "til"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
-#, c-format
-msgid "Task - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Vista sem..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
-msgid "Changes made to this item may be discarded if an update arrives"
+#: calendar/gui/dialogs/comp-editor.c:264
+msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
-msgid "Unable to use current version!"
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
-msgid "Validation error: %s"
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "til"
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
+#, c-format
+msgid "Task - %s"
+msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
 msgstr ""
 
 #: calendar/gui/dialogs/copy-source-dialog.c:57
@@ -4427,8 +4850,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Letur:"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4438,118 +4862,175 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+msgid "Invitations"
+msgstr ""
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] ""
+msgstr[1] ""
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
+msgid "1 day before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
+msgid "1 hour before appointment"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
+msgid "15 minutes before appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Forsýn:"
+
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr ""
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Forsýn:"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
+msgid "A_ll day event"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
+msgid "C_ustomize..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr ""
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "D_agatal:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
+#: calendar/gui/dialogs/task-page.glade.h:5
+msgid "Classi_fication:"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+msgid "L_ocation:"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+msgid "_Alarm"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+msgid "_Description:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
@@ -4560,43 +5041,38 @@ msgstr ""
 #  Note that we don't show this here, since by default a 'None' date
 #  is not permitted.
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4636,33 +5112,42 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "Forsýn:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "Forsýn:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+msgid "Change Or_ganizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr ""
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Letur:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+msgid "_Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -4730,146 +5215,138 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Forsýn:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "This appointment rec_urs"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Valið:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr ""
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
+msgid "<span weight=\"bold\">Status</span>"
 msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr ""
 
@@ -4881,8 +5358,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr ""
@@ -4894,22 +5371,22 @@ msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr ""
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "_Leita"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4932,34 +5409,38 @@ msgstr ""
 msgid "_Web Page:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
-msgid "Description:"
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+msgid "Description:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:10
@@ -4970,52 +5451,52 @@ msgstr ""
 msgid "_Due date:"
 msgstr ""
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Hópur:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
+msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
+msgid "<b>Publishing Frequency</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr ""
+#, fuzzy
+msgid "_Daily"
+msgstr "Email"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr ""
+#, fuzzy
+msgid "_Manual"
+msgstr "Email"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
+msgid "_Password:"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+msgid "_Remember password"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr ""
+#, fuzzy
+msgid "_Username:"
+msgstr "_Innsetja"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+msgid "_Weekly"
 msgstr ""
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5097,7 +5578,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5106,6 +5587,11 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr ""
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5119,7 +5605,7 @@ msgstr "_Fullt Nafn"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr ""
 
@@ -5132,19 +5618,89 @@ msgstr ""
 msgid "Web Page:"
 msgstr "Síða"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr ""
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr ""
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
@@ -5191,95 +5747,101 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Vista sem..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5288,174 +5850,107 @@ msgstr ""
 msgid "% Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Vista í möppu..."
+
+#: calendar/gui/e-calendar-view.c:1158
+msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Valið:"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "D_agatal:"
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5476,35 +5971,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr ""
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:585
@@ -5572,341 +6067,317 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
+msgid "Starts"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -5935,6 +6406,10 @@ msgstr ""
 msgid "Loading calendar..."
 msgstr ""
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -5951,11 +6426,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6023,6 +6493,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 ""
+
+#. 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:1604
+msgid "%m/%d/%Y"
+msgstr ""
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6031,204 +6523,106 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+#: calendar/gui/e-meeting-time-sel.c:432
+msgid "O_ptions"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr ""
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr ""
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 ""
-
-#. 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:1604
-msgid "%m/%d/%Y"
-msgstr ""
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%sLykilorð fyrir %s (notandann %s)"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:824
+#: calendar/gui/e-tasks.c:846
 #, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
+msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
+#: calendar/gui/gnome-cal.c:704
+msgid "Updating query"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Dagatal"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -6568,10 +6962,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr ""
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6602,7 +6992,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr ""
 
@@ -6630,7 +7020,7 @@ msgid_plural "%d tasks"
 msgstr[0] "dagar"
 msgstr[1] "dagar"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6650,33 +7040,27 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+msgid "Tasks Gro_up"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr ""
 
@@ -8341,69 +8725,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8425,42 +8809,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr ""
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Aðvörun"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr ""
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8500,7 +8848,43 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Aðvörun"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8508,43 +8892,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8552,99 +8936,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -8879,7 +9263,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -8958,55 +9342,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9076,7 +9460,7 @@ msgstr ""
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr ""
 
@@ -9157,7 +9541,7 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr ""
 
 #: camel/camel-smime-context.c:651
@@ -9171,44 +9555,40 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr ""
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+msgid "Cannot create CMS Message"
 msgstr ""
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+msgid "Cannot create CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+msgid "Cannot attach CMS data object"
 msgstr ""
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+msgid "Cannot create CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr ""
-
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
 #: camel/camel-smime-context.c:888
@@ -9255,7 +9635,8 @@ msgstr ""
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
@@ -9264,8 +9645,8 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9385,7 +9766,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9394,11 +9775,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9415,7 +9796,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9425,35 +9806,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9477,7 +9858,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9496,8 +9877,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9527,8 +9908,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9546,144 +9927,220 @@ msgstr ""
 msgid "Checklist"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-command.c:629
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3190
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:415
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Óþekkt villa"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:421
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
-msgid "Cannot select folder `%s': Bad command"
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:335
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:341
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:476
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
-msgid "Cannot expunge folder `%s': Unknown"
+msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:481
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
-msgid "Cannot expunge folder `%s': Bad command"
+msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:616
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
+msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:621
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
+msgid "No such message"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
+msgid "This message is not currently available"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
+msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:746
+#: camel/providers/imap/camel-imap-folder.c:2463
 #, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
+msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:775
+#: camel/providers/imap/camel-imap-folder.c:2471
 #, c-format
-msgid "Cannot append message to folder `%s': Bad command"
+msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:854
+#: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
+msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:858
+#: camel/providers/imap/camel-imap-message-cache.c:155
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:866
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
 #, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-folder.c:870
+#: camel/providers/imap/camel-imap-message-cache.c:417
 #, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgid "Failed to cache %s: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for New Mail"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:48
+msgid "Connection to Server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Use custom command to connect to server"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Command:"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "Folders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:42
 #: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
 msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:44
 #: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
 msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:46
 #: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
 msgid "Namespace"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
+#: camel/providers/imap/camel-imap-provider.c:64
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:76
+msgid "IMAP"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:78
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
 #: camel/providers/imapp/camel-imapp-store.c:231
 #: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
@@ -9693,16 +10150,16 @@ msgstr ""
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:206
 #: camel/providers/nntp/camel-nntp-store.c:224
@@ -9710,359 +10167,310 @@ msgstr ""
 msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Óþekkt villa"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sLykilorð fyrir %s (notandann %s)"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
+msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:723
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:826
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:831
+#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
-msgid "Cannot create folder `%s': Bad command"
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
+#: camel/providers/imap/camel-imap-store.c:1315
+msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:891
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:896
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
-msgid "Cannot delete folder `%s': Bad command"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1037
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
 #, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
 #, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1105
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
+msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgid "Failed sending command to IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1154
+#: camel/providers/imap4/camel-imap4-command.c:656
 #, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-utils.c:85
+#: camel/providers/imap4/camel-imap4-engine.c:232
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
+msgid "Unexpected greeting from IMAP server %s."
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
+msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:389
+#: camel/providers/imap4/camel-imap4-folder.c:359
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:399
+#: camel/providers/imap4/camel-imap4-folder.c:365
 #, c-format
-msgid "IMAP command failed: %s"
+msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:649
+#: camel/providers/imap4/camel-imap4-folder.c:507
 #, c-format
-msgid "IMAP server response did not contain %s information"
+msgid "Cannot expunge folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:685
+#: camel/providers/imap4/camel-imap4-folder.c:697
 #, c-format
-msgid "Unexpected OK response from IMAP server: %s"
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:226
+#: camel/providers/imap4/camel-imap4-folder.c:702
 #, c-format
-msgid "Could not create directory %s: %s"
+msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:245
+#: camel/providers/imap4/camel-imap4-folder.c:827
 #, c-format
-msgid "Could not load summary for %s"
+msgid "Cannot append message to folder `%s': Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
 msgstr ""
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap4/camel-imap4-folder.c:939
 #, c-format
-msgid "Unable to retrieve message: %s"
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap4/camel-imap4-folder.c:947
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mbox-folder.c:418
-#: camel/providers/local/camel-mh-folder.c:202
-msgid "No such message"
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:220
-msgid "This message is not currently available"
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2285
-#: camel/providers/imap/camel-imap-folder.c:2355
-msgid "Fetching summary information for new messages"
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2463
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2471
+#: camel/providers/imap4/camel-imap4-store.c:271
 #, c-format
-msgid "Incomplete server response: no UID provided for message %d"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2484
+#: camel/providers/imap4/camel-imap4-store.c:383
 #, c-format
 msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2660
-msgid "Could not find message body in FETCH response."
-msgstr ""
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sLykilorð fyrir %s (notandann %s)"
 
-#: camel/providers/imap/camel-imap-message-cache.c:155
+#: camel/providers/imap4/camel-imap4-store.c:502
 #, c-format
-msgid "Could not open cache directory: %s"
+msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:252
-#: camel/providers/imap/camel-imap-message-cache.c:309
-#: camel/providers/imap/camel-imap-message-cache.c:340
-#: camel/providers/imap/camel-imap-message-cache.c:372
+#: camel/providers/imap4/camel-imap4-store.c:733
 #, c-format
-msgid "Failed to cache message %s: %s"
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:417
+#: camel/providers/imap4/camel-imap4-store.c:847
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for New Mail"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:48
-msgid "Connection to Server"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Use custom command to connect to server"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Command:"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:64
-msgid "Apply filters to new messages in INBOX on this server"
+msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:76
-msgid "IMAP"
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:78
-msgid "For reading and storing mail on IMAP servers."
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
-msgid "SSL/TLS extension not supported."
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
-msgid "SSL negotiations failed"
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap4/camel-imap4-store.c:1005
 #, c-format
-msgid "Could not connect with command \"%s\": %s"
+msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap4/camel-imap4-store.c:1253
 #, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1282
-#: camel/providers/smtp/camel-smtp-transport.c:486
-#, c-format
-msgid "No support for authentication type %s"
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1305
-#: camel/providers/imapp/camel-imapp-store.c:344
+#: camel/providers/imap4/camel-imap4-store.c:1331
 #, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1319
-msgid "You didn't enter a password."
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap4/camel-imap4-store.c:1396
 #, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap4/camel-imap4-store.c:1401
 #, c-format
-msgid "No such folder %s"
+msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
-msgid "The parent folder is not allowed to contain subfolders"
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
-#: camel/providers/local/camel-mbox-store.c:212
-#: camel/providers/local/camel-mh-store.c:236
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap4/camel-imap4-utils.c:456
 #, c-format
-msgid "Unknown parent folder: %s"
+msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr ""
 
 #: camel/providers/imapp/camel-imapp-provider.c:39
@@ -10225,18 +10633,26 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10250,48 +10666,48 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10853,55 +11269,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -11108,93 +11536,93 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr ""
@@ -11202,26 +11630,26 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr ""
 
@@ -11284,87 +11712,6 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr ""
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11443,16 +11790,85 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr ""
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, c-format
+msgid "Attached message - %s"
+msgstr ""
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Vista Sem"
+msgstr[1] "Vista Sem"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11470,103 +11886,125 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+msgid "Could not retrieve messages to attach from {0}."
+msgstr ""
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr ""
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Fjarlægja"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Vista Sem"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr ""
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
+msgstr ""
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -11854,10 +12292,6 @@ msgstr ""
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr ""
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -11883,363 +12317,581 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Vista í möppu..."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr ""
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
+#: filter/filter-file.c:288
+msgid "Choose a file"
 msgstr ""
 
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
 msgstr ""
 
-#: filter/filter-file.c:288
-msgid "Choose a file"
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
 msgstr ""
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
 msgstr ""
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
 msgstr ""
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "_Fullt Nafn"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
 msgstr ""
 
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:4
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr ""
+
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
 msgstr ""
 
 #: filter/filter.glade.h:21
-msgid "the current time"
+msgid "years"
 msgstr ""
 
-#: filter/filter.glade.h:22
-msgid "the time you specify"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
 msgstr ""
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
+#: filter/rule-editor.c:685
+msgid "Rule name"
 msgstr ""
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: filter/filter.glade.h:27
-msgid "years"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
-msgid "Important"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: filter/filter-rule.c:790
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+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-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+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:99
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
-msgid "Rule name:"
-msgstr "_Fullt Nafn"
+msgid "_Mail"
+msgstr "Email"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
 msgstr ""
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "All related"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "Replies"
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
 msgstr ""
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "incoming"
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
 msgstr ""
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
 msgstr ""
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
 msgstr ""
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
 msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
 msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Tengist"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "D_agatal:"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
 msgstr ""
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "mínútur"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Eyða"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
 msgstr ""
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
 msgstr ""
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
 msgstr ""
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
 msgstr ""
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr ""
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
 msgstr ""
 
-#: filter/vfolder-rule.c:493
+#: mail/em-filter-i18n.h:23
 #, fuzzy
-msgid "_Add"
-msgstr "_Bæta við"
+msgid "exists"
+msgstr "Texti"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
 msgstr ""
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
-#: mail/em-account-prefs.c:472
-msgid "Account name"
+#: mail/em-filter-i18n.h:27
+msgid "is"
 msgstr ""
 
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
+#: mail/em-filter-i18n.h:28
+msgid "is after"
 msgstr ""
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
+#: mail/em-filter-i18n.h:29
+msgid "is before"
 msgstr ""
 
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
+#: mail/em-filter-i18n.h:33
+msgid "is not"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
-msgid "an unknown sender"
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
 msgstr ""
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
 msgstr ""
 
-#: mail/em-folder-browser.c:129
-msgid "Create _Virtual Folder From Search..."
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "_Heimilisfang:"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
 msgstr ""
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
 msgstr ""
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
 msgstr ""
 
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr ""
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Nýtt dagatal"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr ""
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Pólland"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr ""
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr ""
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr ""
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Senda Til:"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Bandaríkin"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr ""
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr ""
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr ""
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
 msgstr ""
 
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr ""
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Bandaríkin"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
 msgstr ""
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "Stillingar..."
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Vista Sem"
+msgstr[1] "Vista Sem"
+
+#: mail/em-folder-properties.c:173
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] ""
+msgstr[1] ""
+
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
 msgstr ""
@@ -12248,397 +12900,414 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Króatía"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Vista í möppu..."
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
 #  create the dialog
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Afrita"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr ""
 
-#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
-msgid "_New Folder..."
-msgstr ""
-
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr ""
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr ""
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr ""
+#  create the dialog
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "Afrita"
 
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Letur:"
 
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
+msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr ""
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Endursenda..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr ""
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Stillingar..."
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:651
+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.c:1306
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr ""
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12674,113 +13343,84 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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."
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
 #: mail/em-junk-filter.c:86
@@ -12886,7 +13526,7 @@ msgstr ""
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -12899,7 +13539,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr ""
 
@@ -12933,11 +13573,24 @@ msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr ""
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr ""
+
+#: mail/em-vfolder-rule.c:494
+#, fuzzy
+msgid "_Add"
+msgstr "_Bæta við"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13389,64 +14042,34 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "Email"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
@@ -13501,34 +14124,6 @@ msgstr ""
 msgid "Importing mailbox"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13670,77 +14265,83 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Eyða"
+msgid_plural "%d deleted"
+msgstr[0] "Eyða"
+msgstr[1] "Eyða"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "dagar"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "dagar"
+msgstr[1] "dagar"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "mínútur"
+msgid_plural "%d sent"
+msgstr[0] "mínútur"
+msgstr[1] "mínútur"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d unsent"
-msgstr ""
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, c-format
 msgid "%d total"
-msgstr ""
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr ""
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr ""
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -13790,15 +14391,22 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Forsýn:"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14046,7 +14654,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
@@ -14374,6 +14982,112 @@ msgstr ""
 msgid "description"
 msgstr ""
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+msgid "Accept License"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14557,18 +15271,11 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
+#, fuzzy
 msgid "Enter password."
-msgstr ""
+msgstr "%sLykilorð fyrir %s (notandann %s)"
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
@@ -14722,8 +15429,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "Eyða"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -14811,13 +15519,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Vista í möppu..."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Eyða"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -14825,16 +15563,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Yfirskrifa"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Senda Til:"
@@ -14990,52 +15728,28 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr ""
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr ""
@@ -15071,24 +15785,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15143,15 +15857,15 @@ msgstr ""
 msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
@@ -15215,7 +15929,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15271,10 +15985,6 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15287,46 +15997,48 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
@@ -15390,33 +16102,16 @@ msgstr ""
 msgid "mail"
 msgstr ""
 
-#  strftime format %d = day of month, %B = full
-#  month name. You can change the order but don't
-#  change the specifiers or add anything.
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
-#, fuzzy
-msgid "Uknown system error."
-msgstr "Óþekkt villa"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
 msgstr ""
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15583,23 +16278,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -15617,110 +16295,89 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr ""
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr ""
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr ""
+#  strftime format %d = day of month, %B = full
+#  month name. You can change the order but don't
+#  change the specifiers or add anything.
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "C_alendar:"
-msgstr "D_agatal:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr ""
+msgid "Uknown system error."
+msgstr "Óþekkt villa"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
+#: shell/e-shell.c:1137
+msgid "Generic error"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "_Fullt Nafn"
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "_Innsetja"
-
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -15729,7 +16386,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -15737,16 +16394,16 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
 msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
 msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
 msgstr ""
 
 #: shell/importer/import.glade.h:1
@@ -15805,7 +16462,7 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -15825,45 +16482,45 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -15908,8 +16565,9 @@ msgstr "Tengist"
 
 #. shell:noshell title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
 msgid "Cannot start Evolution"
-msgstr ""
+msgstr "_Um Ximian Evolution..."
 
 #. shell:noshell primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
@@ -15934,6 +16592,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16172,6 +16852,11 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr ""
@@ -16373,11 +17058,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16517,8 +17197,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
@@ -16994,16 +17674,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Loka þessum glugga"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Loka"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr ""
@@ -17404,6 +18074,16 @@ msgstr ""
 msgid "_Undelete"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Loka þessum glugga"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Loka"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17486,10 +18166,6 @@ msgstr ""
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18046,7 +18722,7 @@ msgid "Evolution Query"
 msgstr "Ximian Evolution _FAQ"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18195,15 +18871,19 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "C_alendar"
+#~ msgstr "D_agatal:"
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "_Fullt Nafn"
+
 #~ msgid "1:00"
 #~ msgstr "1:00"
 
 #~ msgid "5:00"
 #~ msgstr "5:00"
 
-#~ msgid "Connecting"
-#~ msgstr "Tengist"
-
 #~ msgid "One"
 #~ msgstr "Einn"
 
@@ -18234,9 +18914,6 @@ msgstr ""
 #~ msgid "calendar"
 #~ msgstr "dagatal"
 
-#~ msgid "_Resend..."
-#~ msgstr "_Endursenda..."
-
 #, fuzzy
 #~ msgid "_minute(s)"
 #~ msgstr "mínútur"
diff --git a/po/ja.po b/po/ja.po
index 2ec37b6d50..8bbead61f0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-18 11:48+0900\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-18 11:43+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -24,14 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution アドレス帳"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "連絡先のヘッダ: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution ミニカード"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "現在のアドレス帳フォルダには"
@@ -52,34 +44,261 @@ msgstr "カードがあります"
 msgid " card"
 msgstr "カードがあります"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "連絡先のヘッダ: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution ミニカード"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "そのアイテムは送信できませんでした！\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"IMAP サーバへ認証できません。\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"お使いのパスワードの綴りが正しいか確認して下さい。一般的に、パスワードは大文"
+"字/小文字を区別します ([Caps Lock] キーが押下された状態かどうか確認してみて下"
+"さい)。"
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "この格納場所は購読をサポートしていないか、有効になっていません。"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "サーバからグループ一覧を取得できませんでした。"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP サーバの応答は %s 情報を含んでいません"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "アドレス帳を読み込めませんでした"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "無効な説明です。"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "アドレス帳に保存"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "デフォルトのアドレス帳の読み込み中にエラーが発生しました。"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "スプール・フォルダを処理できません"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "変更を保存しますか？"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "破棄(_D)"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "と他に %d 個の連絡先"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"コンタクトをあるアドレス帳から別のアドレス帳へ移動する際に、移動元からそのコ"
+"ンタクトを削除できませんでした。コンタクトを移動する代わりにコピーでよろしい"
+"ですか？"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "メッセージの内容を解析できません"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "連絡先を追加する際にエラーが発生しました"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution アドレス帳アドレス・ビューア"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"終了すると、Evolution を再起動するまで、これらのメッセージは送信されません。"
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "デフォルトで同期するアドレス:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "アドレス帳を読み込めませんでした"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "パイロットのアドレス・アプリケーション・ブロックを読み込めませんでした"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名で LDAP サーバにアクセスします"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "[CTRL]+[F2]"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "認証に失敗しました。\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "自動補完"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "連絡先(_O)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "証明書"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "ここで自動補完を設定します"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "連絡先"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution アドレス帳"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution アドレス帳アドレス・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution アドレス帳カード・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution アドレス帳コンポーネント"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/MIME 証明書管理コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution フォルダ設定コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -110,7 +329,8 @@ msgid "New Contacts Group"
 msgstr "新しい連絡先グループ"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "連絡先グループ(_C):"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,23 +353,19 @@ msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "このコンピュータ"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "プライベート"
 
@@ -208,17 +424,17 @@ msgstr ""
 "\n"
 "Evolution がお使いのパイロット同期データを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-view.c:673
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "アドレス帳 '%s' を削除します。続行してもよろしいですか？"
 
-#: addressbook/gui/component/addressbook-view.c:752
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -228,17 +444,25 @@ msgstr "新しいアドレス帳"
 msgid "Delete"
 msgstr "削除"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:993
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "連絡先"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名で LDAP サーバにアクセスします"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "認証に失敗しました。\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -258,58 +482,6 @@ msgstr "Evolution が自動補完を行う前に入力しておく文字数"
 msgid "URI for the folder last used in the select names dialog"
 msgstr "名前選択ダイアログで使用する最後のフォルダの URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "[CTRL]+[F2]"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "自動補完"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "連絡先(_O)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "証明書"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "ここで自動補完を設定します"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution アドレス帳"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution アドレス帳アドレス・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution アドレス帳カード・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution アドレス帳コンポーネント"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/MIME 証明書管理コントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution フォルダ設定コントロール"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "ここでお使いの S/MIME 型の証明書を管理します"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -317,7 +489,7 @@ msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -326,7 +498,7 @@ msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -352,6 +524,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>認証</b>"
 
@@ -384,7 +557,7 @@ msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "常に"
 
@@ -393,13 +566,11 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "基本"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細"
 
@@ -427,12 +598,12 @@ msgstr "利用可能な検索ベースを検索します"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:87 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "全般"
 
 #: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "しない"
 
@@ -570,7 +741,7 @@ msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
 #: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
@@ -599,7 +770,7 @@ msgid "_Log in:"
 msgstr "ログイン(_L):"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:172
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "名前(_N):"
 
@@ -628,33 +799,26 @@ msgid "cards"
 msgstr "カード"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "全て削除"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全て削除"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "連絡先一覧の表示"
@@ -677,15 +841,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "アドレス帳から連絡先の選択"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -707,6 +878,11 @@ msgstr "カテゴリ(_A):"
 msgid "_Find"
 msgstr "検索(_F)"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "検索(_S)"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-メール</b>"
@@ -744,7 +920,7 @@ msgid "<b>Work</b>"
 msgstr "<b>仕事</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -766,7 +942,6 @@ msgid "Birthday:"
 msgstr "誕生日:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "カレンダ:"
 
@@ -779,7 +954,7 @@ msgid "Company:"
 msgstr "会社:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -787,7 +962,7 @@ msgid "Contact"
 msgstr "連絡先"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -879,10 +1054,10 @@ msgstr "ブログ:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "仕事"
 
@@ -903,22 +1078,6 @@ msgstr "ファイルのグループ(_F);"
 msgid "_Where:"
 msgstr "ファイルの場所(_W):"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -926,16 +1085,16 @@ msgid "Address"
 msgstr "住所"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "編集可"
 
@@ -1907,77 +2066,99 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL インスタント・メッセンジャ"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo メッセンジャ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "サービス"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "場所"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "ユーザ名"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "自宅"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "その他"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "元のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "対象のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "新しい連絡先です"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先が属しているカテゴリ:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "この連絡先の画像を選択して下さい"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "画像なし"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1985,11 +2166,11 @@ msgstr ""
 "連絡先データが間違っています:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "連絡先が正しくありません。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -1997,12 +2178,7 @@ msgstr ""
 "選択したアドレス帳へ連絡先を保存できませんでした。変更を破棄してもよろしいで"
 "すか？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "破棄(_D)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2011,28 +2187,6 @@ msgstr ""
 "ンタクトを削除できませんでした。コンタクトを移動する代わりにコピーでよろしい"
 "ですか？"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL インスタント・メッセンジャ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo メッセンジャ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "サービス"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "場所"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "ユーザ名"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
@@ -2042,7 +2196,7 @@ msgid "_Edit Full"
 msgstr "全て編集(_E)"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "氏名(_F):"
 
@@ -2050,6 +2204,22 @@ msgstr "氏名(_F):"
 msgid "E-_mail:"
 msgstr "E-メール(_M):"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "住所２(_2):"
@@ -2206,16 +2376,16 @@ msgstr ""
 "E-メール・アドレスを入力するか、連絡先を下の一覧の中にドラッグして下さい:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "書籍"
 
@@ -2276,6 +2446,398 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "拡張検索"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "連絡先なし"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "連絡先 %d個"
+msgstr[1] "連絡先 %d個"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "問い合わせ"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "ブックビューの取得でエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "モデル"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "カードの修正中にエラーが発生しました"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "名前が次のもので始まる"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-メールが次のもので始まる"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "カテゴリが次のものを含む"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "項目が次のものを含む"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "拡張..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "種類"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "アドレス帳"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "vCard 形式で保存..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "新しい連絡先..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "新しい連絡先一覧..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "フォルダへ移動..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "インポート..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "連絡先の検索..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "アドレス帳のソース..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "パイロットの設定..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "この連絡先の転送"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "この連絡先へメッセージの送信"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "印刷"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "宛名の印刷"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "アドレス帳へコピー..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "アドレス帳へ移動..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "切り取り"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "コピー"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "貼り付け"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "現在の表示"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "任意のカテゴリ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "アシスタント"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "アシスタントの電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "仕事の FAX"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "仕事の電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "仕事の電話２"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "得意先の電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "車載電話"
+
+#: 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:3
+msgid "Categories"
+msgstr "カテゴリ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "会社の電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "メール"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "メール２"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "メール３"
+
+#: 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 "Given Name"
+msgstr "ファーストネーム"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "自宅の FAX"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "自宅の電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "自宅の電話２"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN 電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "ジャーナル"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "マネージャ"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "携帯電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "あだ名"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "ノート"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "事務所"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "組織"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "その他の FAX"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "その他の電話"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "ポケベル"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "電話"
+
+#: 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:234
+#: 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:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "テレックス"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "敬称 (前つけ)"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "単位"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "ウェブ・サイト"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "幅"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "高さ"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "フォーカスあり"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "項目"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "項目名"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "テキスト・モデル"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "項目名の最大長"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "カラムの幅"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"このビューの中に表示できるアイテムはありません。\n"
+"\n"
+"ダブルクリックをして新しい連絡先を作成して下さい。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"このビューの中に表示できるアイテムはありません。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "アダプタ"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "選択済"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "カーソルあり"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2296,11 +2858,6 @@ msgstr "メンバーのリスト化"
 msgid "E-mail"
 msgstr "E-メール"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "組織"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "役職"
@@ -2331,30 +2888,14 @@ msgstr "ウェブ"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "携帯電話"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "プライベート"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "ノート"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "職業"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "メール"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "ホームページ"
@@ -2411,12 +2952,12 @@ msgstr "プロトコルがサポートされていません"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
 #: camel/camel-service.c:724 camel/camel-service.c:762
 #: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "キャンセル済み"
 
@@ -2620,16 +3161,6 @@ msgstr "(なし)"
 msgid "Primary Email"
 msgstr "E-メール"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "メール２"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "メール３"
-
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "操作の選択"
@@ -2676,368 +3207,6 @@ msgstr "コンパクト vCard の表示"
 msgid "Save in addressbook"
 msgstr "アドレス帳に保存"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "連絡先なし"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "連絡先 %d個"
-msgstr[1] "連絡先 %d個"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "問い合わせ"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "ブックビューの取得でエラーが発生しました"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "モデル"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "カードの修正中にエラーが発生しました"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "名前が次のもので始まる"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "E-メールが次のもので始まる"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "カテゴリが次のものを含む"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "項目が次のものを含む"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "拡張..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "種類"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:535
-msgid "Address Book"
-msgstr "アドレス帳"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "vCard 形式で保存..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "New Contact..."
-msgstr "新しい連絡先..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-msgid "New Contact List..."
-msgstr "新しい連絡先一覧..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "Go to Folder..."
-msgstr "フォルダへ移動..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "Import..."
-msgstr "インポート..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
-msgid "Search for Contacts..."
-msgstr "連絡先の検索..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Address Book Sources..."
-msgstr "アドレス帳のソース..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "Pilot Settings..."
-msgstr "パイロットの設定..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "この連絡先の転送"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
-msgid "Send Message to Contact"
-msgstr "この連絡先へメッセージの送信"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "印刷"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-msgid "Print Envelope"
-msgstr "宛名の印刷"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Copy to Address Book..."
-msgstr "アドレス帳へコピー..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-msgid "Move to Address Book..."
-msgstr "アドレス帳へ移動..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "切り取り"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "コピー"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "貼り付け"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "現在の表示"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "任意のカテゴリ"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "アシスタント"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "アシスタントの電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "仕事の FAX"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "仕事の電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "仕事の電話２"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "得意先の電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "車載電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "Categories"
-msgstr "カテゴリ"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "会社の電話"
-
-#: 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 "Given Name"
-msgstr "ファーストネーム"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "自宅の FAX"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "自宅の電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "自宅の電話２"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN 電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "ジャーナル"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "マネージャ"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "あだ名"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "事務所"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "その他の FAX"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "その他の電話"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "ポケベル"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "電話"
-
-#: 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:234
-#: 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:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "テレックス"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "敬称 (前つけ)"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "単位"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "ウェブ・サイト"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "幅"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "高さ"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "フォーカスあり"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "選択済"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "カーソルあり"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "項目"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "項目名"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "テキスト・モデル"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "項目名の最大長"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"このビューの中に表示できるアイテムはありません。\n"
-"\n"
-"ダブルクリックをして新しい連絡先を作成して下さい。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"このビューの中に表示できるアイテムはありません。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "アダプタ"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "カラムの幅"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "カード表示"
@@ -3046,6 +3215,20 @@ msgstr "カード表示"
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
+#: addressbook/gui/widgets/test-reflow.c:106
+msgid "Reflow Test"
+msgstr "Reflow のテスト"
+
+#: 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 "Copyright (C) 2000, Ximian, Inc."
+
+#: addressbook/gui/widgets/test-reflow.c:109
+msgid "This should test the reflow canvas item"
+msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
+
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF インポータ"
@@ -3066,6 +3249,11 @@ msgstr "Evolution vCard インポータ"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "宛名の印刷"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "複数の連絡先の印刷"
@@ -3075,11 +3263,6 @@ msgstr "複数の連絡先の印刷"
 msgid "Print contact"
 msgstr "連絡先の印刷"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "宛名の印刷"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3252,11 +3435,6 @@ msgstr "フォント(_F)..."
 msgid "Contact Print Style Editor Test"
 msgstr "連絡先印刷スタイル・エディタのテスト"
 
-#: addressbook/printing/test-contact-print-style-editor.c:54
-#: addressbook/printing/test-print.c:53
-msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
-
 #: addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "連絡先印刷スタイル・エディタ・ウィジットをテストします"
@@ -3269,6 +3447,20 @@ msgstr "連絡先印刷のテスト"
 msgid "This should test the contact print code"
 msgstr "連絡先印刷コードをテストします"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "ファイルを開けません"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "アドレス帳の一覧を取得できませんでした"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "アドレス帳を開けませんでした"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "標準出力のかわりに出力するファイルの指定"
@@ -3325,20 +3517,6 @@ msgstr "標準モードでは、サイズ・オプションを指定する必要
 msgid "Impossible internal error."
 msgstr "致命的な内部エラーです。"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "ファイルを開けません"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "アドレス帳の一覧を取得できませんでした"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "アドレス帳を開けませんでした"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "デフォルトのアドレス帳の読み込み中にエラーが発生しました。"
@@ -3355,6 +3533,276 @@ msgstr "ファイル名が指定されていません。"
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "削除しない"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "送信先:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "本当にこのアカウントを削除してもよろしいですか？"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "本当にこのアカウントを削除してもよろしいですか？"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "本当にこのアカウントを削除してもよろしいですか？"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "本当にこのアカウントを削除してもよろしいですか？"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "本当にこのアカウントを削除してもよろしいですか？"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "予定"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "変更を保存しますか？"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  変更しました。この変更を無視してエディタを更新しますか？"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "変更を破棄する"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "保存する"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "送信"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"終了すると、Evolution を再起動するまで、これらのメッセージは送信されません。"
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar インポータ"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"終了すると、Evolution を再起動するまで、これらのメッセージは送信されません。"
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3365,29 +3813,93 @@ msgid "Split Multi-Day Events:"
 msgstr "複数日のイベントに分割:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "wombat サーバを起動できませんでした"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "wombat を起動できませんでした"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "wombat サーバを起動できませんでした"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "パイロットのカレンダ・アプリケーション・ブロックを読み込めませんでした"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "デフォルトの優先度:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "パイロットの ToDo アプリケーション・ブロックを読み込めませんでした"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "[CTRL]+[F3]"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "[CTRL]+[F4]"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "カレンダとタスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "カレンダ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "ここでお使いのタイムゾーンやカレンダ、タスク一覧を設定します"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution カレンダとタスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution カレンダの設定コントロール"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution カレンダ設定メッセージのビューア"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution カレンダ/タスクのエディタ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution カレンダのコンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution タスクのコンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "タスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "カレンダ(_C)"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "タスク(_T)"
+
+#: 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:213
 msgid "Starting:"
 msgstr "開始:"
@@ -3485,10 +3997,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
@@ -3629,8 +4137,28 @@ msgstr "時刻を午前/午後の代わりに 24時間制で表示するかど�
 msgid "Whether to show week numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示するかどうか"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "サマリが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "説明が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "コメントが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "場所が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "該当しないもの"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3651,7 +4179,7 @@ msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "日"
@@ -3662,12 +4190,8 @@ msgstr "%Y年 %B %e日 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m/%d (%a)"
@@ -3715,64 +4239,52 @@ msgstr "イベントと会議を生成するためのカレンダ '%s' を開け
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議を生成するために利用可能なカレンダがありません"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"指定したカレンダは読み込み専用なのでイベントを作成できません。読み込み/書き込"
-"みモードのカレンダを指定して下さい。"
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "カレンダ"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "終日の予定(_D)"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "カレンダ(_A)"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "カレンダ"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
@@ -3802,26 +4314,6 @@ msgstr "週間表示"
 msgid "Month View"
 msgstr "月間表示"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "サマリが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "説明が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "コメントが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "場所が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "該当しないもの"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "カレンダをオープンする際にエラーが発生しました"
@@ -3839,211 +4331,133 @@ msgstr "カレンダをオープンする権限がありません"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "オーディオ・アラームのオプション"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "メッセージ・アラームのオプション"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "E-メール・アラームのオプション"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "プログラム・アラームのオプション"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "不明なアラームのオプション"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "アラームの繰り返し"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "表示するメッセージ:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "送信するメッセージ"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "サウンド再生:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "繰り返す回数"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "プログラム実行:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "送信先:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "引き渡す引数:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>警告</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "回 / "
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>タスク一覧のオプション</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
-msgid "hours"
-msgstr "時間"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>全般</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "アクション/トリガ"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "カレンダの追加"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "追加(_D)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "メッセージの作成"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "基本"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "日付/時刻:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "メッセージ(_M)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "サウンドを演奏する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "警告をポップアップする"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "リマインダ"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "プログラムを実行する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "送信先:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "E-メールを送信する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "サマリ:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "住所(_A):"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "オプション(_O)..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "プログラムを実行する"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "繰り返す回数"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "送信する(_S)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "後"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "前"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "日"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "予定を終了した時"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "回 / "
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "時間"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "時間"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "分"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "予定を開始した時"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "既に '%s' というソースが指定したグループの中にあります"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "グループ '%s' はリモートです。カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "カレンダの追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "タスク・グループの追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "色(_O):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:111
-msgid "Pick a color"
-msgstr "色の選択"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "カレンダの追加(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "グループの追加(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "更新(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "種類(_T):"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "アクション/トリガ"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "追加(_D)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "週"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "%s にアラーム"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4143,7 +4557,7 @@ msgid "Display"
 msgstr "表示"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "有効(_N)"
 
@@ -4152,7 +4566,7 @@ msgid "Free/Busy Publishing"
 msgstr "予定の有無の公開"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "金曜日"
@@ -4166,7 +4580,7 @@ msgid "Minutes"
 msgstr "分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "月曜日"
@@ -4176,7 +4590,7 @@ msgid "S_un"
 msgstr "日(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "土曜日"
@@ -4190,7 +4604,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "日曜日"
@@ -4204,7 +4618,7 @@ msgid "T_hu"
 msgstr "木(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "木曜日"
@@ -4218,7 +4632,7 @@ msgid "Time format:"
 msgstr "時刻の書式:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "火曜日"
@@ -4228,7 +4642,7 @@ msgid "W_eek starts:"
 msgstr "週の開始(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "水曜日"
@@ -4261,8 +4675,9 @@ msgstr "月間ビューで週末を短縮する(_C)"
 msgid "_Day begins:"
 msgstr "一日の開始(_D):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:163 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 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:43
@@ -4311,6 +4726,72 @@ msgstr "水(_W)"
 msgid "before every appointment"
 msgstr "前に表示する"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "カレンダを取得する場所を指定して下さい。"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "既に '%s' というソースが指定したグループの中にあります"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "グループ '%s' はリモートです。カレンダを取得する場所を指定して下さい。"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "カレンダの追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "タスク・グループの追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "色(_O):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "色の選択"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "カレンダの追加(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "グループの追加(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "更新(_R):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "種類(_T):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "週"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "このイベントは削除されました。"
@@ -4355,79 +4836,73 @@ msgstr "%s  変更しました。この変更を無視してエディタを更�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディタを更新しますか？"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "整合性のエラー: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " から "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(完了 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "完了しました"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (期日 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "期日 "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "予定 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "タスク - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "ジャーナル・エントリ - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "別名で保存..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "更新が届いたらこのアイテムに対する変更を破棄する"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "整合性のエラー: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " から "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(完了 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "完了しました"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (期日 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "期日 "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "送信元ソースを開けませんでした"
@@ -4489,8 +4964,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "エラーのためアイテムを削除できませんでした"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "アドレス帳..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "連絡先"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4500,166 +4976,218 @@ msgstr "委任先:"
 msgid "Enter Delegate"
 msgstr "委任先の入力"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "予定"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "リマインダ"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "繰り返し"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "スケジュール"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "方向"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "会議"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "開始日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "終了日が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "開始時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "終了時刻が間違っています"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "カレンダ '%s' を開けません。"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "前に表示する"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "予定を終了した時"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "前に表示する"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "終日のイベントにする(_L)"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "前に表示する"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "予定あり(_U)"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "前に表示する"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "カテゴリ(_T)..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "前に表示する"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>タスク一覧</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "区分"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>時刻</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "極秘(_N)"
+msgid "A_ll day event"
+msgstr "終日のイベントにする(_L)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "日付と時刻"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "カスタム表示の保存..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "予定なし(_R)"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "カテゴリ(_T)..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "場所(_O):"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "カレンダ:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "非公開(_V)"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "区分"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "公開(_B)"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "極秘"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "表示の仕方"
+msgid "L_ocation:"
+msgstr "場所(_O):"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "非公開"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "公開"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "表示の仕方"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "サマリ(_M):"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "クリア(_C)"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "説明:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "終了時刻(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "なし"
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "指定した主催者のアカウントがありません。"
 
-#: calendar/gui/dialogs/meeting-page.c:444
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "主催者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:459
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "最低一名の出席者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "委任先(_D)..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "削除(_D)"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "削除(_R)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4704,6 +5232,7 @@ msgid "RSVP"
 msgstr "返信の有無"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
@@ -4712,21 +5241,30 @@ msgid "Status"
 msgstr "ステータス"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "出席者の追加(_T)"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>警告</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "出席者をアドレス帳から追加します"
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>その他</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "主催者の変更(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "主催者:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "連絡先"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "主催者の変更(_C)"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "主催者:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4793,146 +5331,137 @@ msgstr "これと将来のインスタンス"
 msgid "All Instances"
 msgstr "全てのインスタンス"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "この予定には Evolution が編集できない繰り返しがあります。"
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "繰り返しの日付が間違っています"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "最初の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "二番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "三番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "四番目の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "最後の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "その他の日"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "日"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "の"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "くりかえす"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "日付/時刻"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "毎"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "次の日は除く"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "プレビュー"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "繰り返しのルール"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "カスタマイズ(_C)"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "修正(_M)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>プレビュー</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "繰り返さない(_N)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "繰り返し"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "削除(_R)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "毎"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "簡易指定(_S)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "予定の編集(_E)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "間"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "以降"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "月"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "まで"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "週"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "転送先の選択"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "転送先(_D)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "タスク一覧"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">メッセージのフォント</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% 完了(_C)"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">警告</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4946,8 +5475,8 @@ msgstr "高い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "進行中"
@@ -4959,22 +5488,22 @@ msgid "Low"
 msgstr "低い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "普通"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "開始していない"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "進捗状況"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "達成率: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4997,36 +5526,42 @@ msgstr "ステータス(_S):"
 msgid "_Web Page:"
 msgstr "ウェブ・ページ(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "タスク"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "割当て"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' のタスクを開けません。"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "極秘(_F)"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">オプション</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">メールの削除</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:72
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "説明:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "フォルダ:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "開始日(_R):"
@@ -5035,52 +5570,58 @@ msgstr "開始日(_R):"
 msgid "_Due date:"
 msgstr "期日(_D):"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "HTTP サーバの認証証明"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "グループ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "公開するカレンダ"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>カレンダのオプション</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "毎日"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "公開の頻度"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "予定の有無エディタ"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "予定の有無を公開する場所"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "予定の有無を公開する場所"
+msgid "Free/Busy Editor"
+msgstr "予定の有無エディタ"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "ログイン名:"
+#, fuzzy
+msgid "_Daily"
+msgstr "毎日"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "パスワード:"
+#, fuzzy
+msgid "_Manual"
+msgstr "メール(_M)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "公開の頻度"
+#, fuzzy
+msgid "_Password:"
+msgstr "パスワード:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "このパスワードを記憶する"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "ユーザ名:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "手動"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "毎週"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5162,7 +5703,7 @@ msgstr "%s (%s の時点で)"
 msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "クリックすると %s を開きます"
@@ -5171,6 +5712,11 @@ msgstr "クリックすると %s を開きます"
 msgid "Untitled"
 msgstr "タイトルなし"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "サマリ:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5194,20 +5740,93 @@ msgstr "優先度:"
 msgid "Web Page:"
 msgstr "ウェブ・ページ:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "公開"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "終了日"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "非公開"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "極秘"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "サマリ"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "予定なし"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "予定あり"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "北"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "南"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "東"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "西"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理的な位置は書式に合わせて入力して下さい: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "はい"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "いいえ"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "不明"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "繰り返し"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "割当て済み"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5253,15 +5872,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "予定なし"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "予定あり"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
@@ -5272,7 +5882,7 @@ msgstr "オブジェクトの更新"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -5282,7 +5892,7 @@ msgstr "ウェブ・ページを開く(_W)"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
@@ -5305,7 +5915,7 @@ msgstr "切り取り(_U)"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5336,10 +5946,25 @@ msgstr "完了としてマーク(_M)"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "選択したタスクに完了マークを付与(_M)"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "削除(_D)"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "指定したタスクの削除(_D)"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "別名で保存..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5371,11 +5996,6 @@ msgstr "優先度"
 msgid "Start date"
 msgstr "開始日"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "サマリ"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "タスクの並び替え"
@@ -5452,95 +6072,13 @@ msgstr "指定日へ移動(_G)..."
 msgid "_Settings..."
 msgstr "設定(_S)..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "終了日"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "開始日"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1179
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1117
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "不明"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "繰り返し"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "割当て済み"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "はい"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "いいえ"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "北"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "南"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "東"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理的な位置は書式に合わせて入力して下さい: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5557,43 +6095,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "午前"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "午後"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%B%e日 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%B%e日"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分分割"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "午前"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "午後"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5727,7 +6258,7 @@ msgstr "更新"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -5944,51 +6475,35 @@ msgstr "添付した内容には表示可能なカレンダ情報がありませ
 msgid "Update complete\n"
 msgstr "更新が完了しました\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "オブジェクトが不正なので更新できません\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "不正なステータスのため出席状況が更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA システムでエラーが見つかりました\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "オブジェクトが見つかりませんでした\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "カレンダを更新する権限がありません\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "出席状況を更新できませんでした！\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "削除が完了しました"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "そのアイテムは送信できませんでした！\n"
 
@@ -6017,6 +6532,10 @@ msgstr "カレンダの読み込み中"
 msgid "Loading calendar..."
 msgstr "カレンダの読み込み中..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "主催者:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "サーバのメッセージ:"
@@ -6087,7 +6606,7 @@ msgid "Needs Action"
 msgstr "要アクション"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暫定"
 
@@ -6100,100 +6619,81 @@ msgstr "委任済"
 msgid "In Process"
 msgstr "進行中"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%Y年 %B %e日 %A"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 "%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:1604
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "外出中"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "情報なし"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "出席者をアドレス帳から追加する"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "オプション(_O)"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "オプション"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "仕事中の時間だけ表示する(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "縮小して表示する(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "予定の有無の更新(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "自動ピックアップ(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "全ての人達とリソース(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "全ての人達とひとつのリソース(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "必須な人達(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "必須な人達とひとつのリソース(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "会議の開始時間(_S):"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "会議の終了時間(_E):"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%Y年 %B %e日 %A"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 "%Y/%m/%d (%a)"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6212,9 +6712,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "タスクの読み込み"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s のタスクを開きます"
@@ -6231,15 +6729,6 @@ msgstr "指定したオブジェクトの削除..."
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "タスク"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "クエリの更新中"
@@ -6263,55 +6752,6 @@ msgstr "%s を開きます"
 msgid "Purging"
 msgstr "抹消中"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "[CTRL]+[F3]"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "[CTRL]+[F4]"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "カレンダとタスク"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "ここでお使いのタイムゾーンやカレンダ、タスク一覧を設定します"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution カレンダとタスク"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution カレンダの設定コントロール"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution カレンダ設定メッセージのビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution カレンダ/タスクのエディタ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution カレンダのコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution タスクのコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "カレンダ(_C)"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "タスク(_T)"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 月"
@@ -6657,10 +7097,6 @@ msgstr "月の指定 (%Y年 %B)"
 msgid "Selected year (%Y)"
 msgstr "年の指定 (%Y年)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "タスク"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6691,7 +7127,7 @@ msgid "Contacts: "
 msgstr "連絡先: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -6739,35 +7175,28 @@ msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開け
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"指定したタスク一覧は読み込み専用なのでイベントを作成できません。読み込み/書き"
-"込みモードのカレンダを指定して下さい。"
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "新しいタスク・グループ"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "タスク・グループ(_T)"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "新しいタスク・グループを作成します"
 
@@ -8529,41 +8958,6 @@ msgstr "(user-tag) に対する不正な引数"
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "サポートしていない操作: %s のメッセージの追加"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "サポートしていない操作: 式 %s による検索"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "サポートしていない操作: UID %s による検索"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "メッセージの移動中"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "メッセージのコピー中"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "ジャンクの学習中"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "非ジャンクの学習中"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "新しいメッセージのフィルタリング中"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8607,6 +9001,41 @@ msgstr "(match-threads) にはフォルダの組を必要とします"
 msgid "Performing query on unknown header: %s"
 msgstr "特定できないヘッダでクエリを実行しています: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "サポートしていない操作: %s のメッセージの追加"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "サポートしていない操作: 式 %s による検索"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "サポートしていない操作: UID %s による検索"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "メッセージの移動中"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "メッセージのコピー中"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "ジャンクの学習中"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "非ジャンクの学習中"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "新しいメッセージのフィルタリング中"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8726,6 +9155,26 @@ msgstr "暗号化された内容"
 msgid "Unable to parse message content"
 msgstr "メッセージの内容を解析できません"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
+
+#: 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' をロックできませんでした: lock-helper のプロトコル・エラーです"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' をロックできません"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8747,26 +9196,6 @@ msgstr "fcntl(2) を使ったロックに失敗しました: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) を使ったロックに失敗しました: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
-
-#: 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' をロックできませんでした: lock-helper のプロトコル・エラーです"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' をロックできません"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9222,7 +9651,7 @@ msgstr "暗号化証明書を追加できません"
 msgid "Cannot add CMS SignerInfo"
 msgstr "CMS SignerInfo を追加できません"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "エンコーダのコンテキストを作成できません"
 
@@ -9303,7 +9732,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "メッセージ、インポートして妥当な証明書のみ認証します"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "証明書のダイジェストが見つかりません"
 
 #: camel/camel-smime-context.c:651
@@ -9316,47 +9746,51 @@ msgid "Decoder failed"
 msgstr "デコーダのエラーです"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "'%s' の証明書が見つかりません"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "共通なバルク暗号化アルゴリズムが見つかりません"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "暗号化バルク鍵のスロットを確保できません"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "CMS Message を作成できません"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "CMS メッセージを作成できません"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "CMS EnvelopedData を作成できません"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "CMS EnvelopedData を添付できません"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "CMS データ・オブジェクトを添付できません"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "CMS RecipientInfo を作成できません"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "CMS RecipientInfo を追加できません"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "エンコーダ・コンテキストを作成できません"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "データのエンコーダへの追加に失敗しました"
@@ -9401,7 +9835,8 @@ msgstr "フォルダを作成できません: %s: フォルダが存在します
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダ名を変更できません: %s: 不正な操作です"
@@ -9411,7 +9846,7 @@ msgid "Trash"
 msgstr "ゴミ箱"
 
 #: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:96 ui/evolution-mail-message.xml.h:48
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ジャンク"
 
@@ -9647,7 +10082,7 @@ msgstr "メッセージの仮想フォルダへのコピーまたは移動がで
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
@@ -9666,8 +10101,8 @@ msgid "Checking for new mail"
 msgstr "新着メールのチェック"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "全てのフォルダの新着メールをチェックする"
 
@@ -9697,11 +10132,11 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise サーバ・アクセス用です"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:109
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "パスワード"
 
@@ -9718,331 +10153,6 @@ msgstr ""
 msgid "Checklist"
 msgstr "チェックリスト"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "IMAP サーバ %s へのコマンド送信に失敗しました: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP サーバ %s から予期しない応答がありました: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "IMAP サーバ %s から予期しない応答がありました"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' を選択できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "フォルダ '%s' を選択できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "突然 IMAP4 サーバ %s が接続を切りました: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "応答 BYE を受け取りました"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "フォルダ '%s' とフラグを同期できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:513
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "フォルダ '%s' とフラグを同期できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:650
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "フォルダ '%s' を抹消できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:655
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "フォルダ '%s' を抹消できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:845
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"メッセージ %s をフォルダ '%s' から取得できません: そのようなメッセージはあり"
-"ません"
-
-#: camel/providers/imap4/camel-imap4-folder.c:850
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"メッセージ %s をフォルダ '%s' から取得できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:975
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "フォルダ '%s' へメッセージを追加できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "フォルダ '%s' へメッセージを追加できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1083
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1087
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1095
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: コマンドが間"
-"違っています"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1099
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: コマンドが間"
-"違っています"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "フォルダ"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "購読するフォルダだけ表示する"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "サーバが提供するフォルダのネームスペースより優先する"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "ネームスペース"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-"IMAPv4rev1 サーバのメールを読んだり大切なメールを保存します (EXPERIMENTAL!!)"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバに接"
-"続します"
-
-#: camel/providers/imap4/camel-imap4-store.c:174
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP サーバ %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:176
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s の %s にある IMAP サービス"
-
-#: camel/providers/imap4/camel-imap4-store.c:217
-#: camel/providers/imap4/camel-imap4-store.c:234
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (ポート %d) へ接続できませんでした: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:219
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL は無効です"
-
-#: camel/providers/imap4/camel-imap4-store.c:231
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "接続をキャンセルしました"
-
-#: camel/providers/imap4/camel-imap4-store.c:270
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: サーバ"
-"は STARTTLS をサポートしていません"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:296
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "特定できないエラー"
-
-#: camel/providers/imap4/camel-imap4-store.c:382
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "IMAP サーバ %s に対して認証方式 %s を使って認証できませんでした"
-
-#: camel/providers/imap4/camel-imap4-store.c:427
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s%s@%s の IMAP パスワードを入力して下さい。"
-
-#: camel/providers/imap4/camel-imap4-store.c:501
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "IMAP サーバ %s で %s を使った認証を行えません"
-
-#: camel/providers/imap4/camel-imap4-store.c:732
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "フォルダ '%s' を IMAP サーバ %s から取得できません: 不明なエラー"
-
-#: camel/providers/imap4/camel-imap4-store.c:794
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
-
-#: camel/providers/imap4/camel-imap4-store.c:838
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' を作成できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-store.c:843
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "フォルダ '%s' を作成できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-store.c:871
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "フォルダ '%s' を削除できません: 特別なフォルダです"
-
-#: camel/providers/imap4/camel-imap4-store.c:904
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' を削除できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-store.c:909
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "フォルダ '%s' を削除できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-store.c:929
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "フォルダ名 '%s' を '%s' に変更できません: 特別なフォルダです"
-
-#: camel/providers/imap4/camel-imap4-store.c:961
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "フォルダ名 '%s' を '%s' に変更できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-store.c:966
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "フォルダ名 '%s' を '%s' に変更できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-store.c:1177
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"%s 情報 (パターン '%s' に対する IMAP サーバ %s: %s 上の) を取得できません"
-
-#: camel/providers/imap4/camel-imap4-store.c:1179
-msgid "Bad command"
-msgstr "コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-store.c:1241
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' を購読できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-store.c:1246
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "フォルダ '%s' を購読できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-store.c:1291
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "フォルダ '%s' の購読を解除できません: mailbox の名前が不正です"
-
-#: camel/providers/imap4/camel-imap4-store.c:1296
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "フォルダ '%s' の購読を解除できません: コマンドが間違っています"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP サーバ %s から予期しない応答がありました: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "データなし"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "突然 IMAP サーバ %s が接続を切りました: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -10056,6 +10166,15 @@ msgstr "処理がキャンセルされました"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "特定できないエラー"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10124,7 +10243,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10196,6 +10315,27 @@ msgstr "サーバへ接続する際にカスタム・コマンドを使用する
 msgid "Command:"
 msgstr "コマンド:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "フォルダ"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "購読するフォルダだけ表示する"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "サーバが提供するフォルダのネームスペースより優先する"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "ネームスペース"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
@@ -10216,13 +10356,63 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
 
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP サーバ %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s の %s にある IMAP サービス"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (ポート %d) へ接続できませんでした: %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL は無効です"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "接続をキャンセルしました"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
+
 #: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 拡張がサポートされていません。"
 
 #: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
@@ -10269,13 +10459,21 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
+
 #: camel/providers/imap/camel-imap-store.c:1939
 #: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
 #: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
@@ -10287,6 +10485,244 @@ msgstr "フォルダ '%s' を作成できません: フォルダが存在しま�
 msgid "Unknown parent folder: %s"
 msgstr "親フォルダを特定できません: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "IMAP サーバ %s へのコマンド送信に失敗しました: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP サーバ %s から予期しない応答がありました: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "IMAP サーバ %s から予期しない応答がありました"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' を選択できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "フォルダ '%s' を選択できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "突然 IMAP4 サーバ %s が接続を切りました: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "応答 BYE を受け取りました"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "フォルダ '%s' とフラグを同期できません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "フォルダ '%s' とフラグを同期できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "フォルダ '%s' を抹消できません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "フォルダ '%s' を抹消できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"メッセージ %s をフォルダ '%s' から取得できません: そのようなメッセージはあり"
+"ません"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"メッセージ %s をフォルダ '%s' から取得できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "フォルダ '%s' へメッセージを追加できません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "フォルダ '%s' へメッセージを追加できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージを移動できません: コマンドが間"
+"違っています"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"フォルダ '%s' からフォルダ '%s' へメッセージをコピーできません: コマンドが間"
+"違っています"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+"IMAPv4rev1 サーバのメールを読んだり大切なメールを保存します (EXPERIMENTAL!!)"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"このオプションはプレイン・テキストのパスワードを使って IMAPv4rev1 サーバに接"
+"続します"
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: サーバ"
+"は STARTTLS をサポートしていません"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "IMAP サーバ %s に対して認証方式 %s を使って認証できませんでした"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s%s@%s の IMAP パスワードを入力して下さい。"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "IMAP サーバ %s で %s を使った認証を行えません"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "フォルダ '%s' を IMAP サーバ %s から取得できません: 不明なエラー"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' を作成できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "フォルダ '%s' を作成できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "フォルダ '%s' を削除できません: 特別なフォルダです"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' を削除できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "フォルダ '%s' を削除できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "フォルダ名 '%s' を '%s' に変更できません: 特別なフォルダです"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "フォルダ名 '%s' を '%s' に変更できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "フォルダ名 '%s' を '%s' に変更できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"%s 情報 (パターン '%s' に対する IMAP サーバ %s: %s 上の) を取得できません"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' を購読できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "フォルダ '%s' を購読できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "フォルダ '%s' の購読を解除できません: mailbox の名前が不正です"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "フォルダ '%s' の購読を解除できません: コマンドが間違っています"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP サーバ %s から予期しない応答がありました: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "データなし"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "突然 IMAP サーバ %s が接続を切りました: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10457,18 +10893,26 @@ msgstr "サマリを保存できませんでした: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "メッセージをサマリへ追加できません: 理由は不明です"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "受信箱"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir 形式のメッセージ追加が取り消されました"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Maildir 形式のフォルダへメッセージを追加できません: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10484,48 +10928,48 @@ msgstr ""
 "メッセージ %s をフォルダ %s から取得できません\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "メッセージの内容は無効です"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "フォルダ '%s' を取得できません: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "フォルダ '%s' を取得できません: フォルダが存在しません"
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "フォルダ '%s' を取得できません: maildir フォルダが存在しません"
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "フォルダ '%s' を削除できませんでした: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11083,7 +11527,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:108
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11114,21 +11558,26 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "POP サーバ %s (ポート %d) に接続できませんでした: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "POP サーバ %s で認証に失敗しました: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "セキュリティ保護されたモードで POP サーバ %s への接続に失敗しました: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP サーバ %s へ接続できませんでした"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11136,28 +11585,28 @@ msgid ""
 msgstr ""
 "POP サーバ %s へ接続できません: 要求された認証方式をサポートしていません。"
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL '%s' の POP サーバ %s へのログインに失敗: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP サーバ %s へログインできません: SASL プロトコル・エラー"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP サーバ %s で認証に失敗しました: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s%s@%s の POP パスワードを入力して下さい。"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11166,13 +11615,22 @@ msgstr ""
 "POP サーバ %s に接続できません。\n"
 "パスワードの送信中にエラー: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"POP サーバ %s に接続できません。\n"
+"パスワードの送信中にエラー: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "そのようなフォルダ '%s' はありません"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11225,7 +11683,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:123
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11554,73 +12012,6 @@ msgstr "MIME タイプ:"
 msgid "Suggest automatic display of attachment"
 msgstr "添付した内容を自動的に表示するか提示する"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
-"トされていません"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
-"書がセットされていません"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "ファイルを開けませんでした"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "エディタからメッセージを取得できません"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "タイトルなしのメッセージ"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "ファイルを開く"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "自動生成"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "署名:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "添付ファイルが <b>%d</b> 個あります"
-msgstr[1] "添付ファイルが <b>%d</b> 個あります"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3212
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3104
-#: composer/e-msg-composer.c:3105
-msgid "Compose a message"
-msgstr "メッセージの作成"
-
-#: composer/e-msg-composer.c:4258
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "送信先を指定します"
@@ -11701,17 +12092,90 @@ msgstr "<ここをクリックして投稿するフォルダを選択して下�
 msgid "Attach file(s)"
 msgstr "ファイルの添付"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"送信メッセージに署名できません: このアカウントに対して署名付きの証明書がセッ"
+"トされていません"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"送信するメッセージを暗号化できません: このアカウントに対して暗号化された証明"
+"書がセットされていません"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "ファイルを開けませんでした"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "エディタからメッセージを取得できません"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "タイトルなしのメッセージ"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "ファイルを開く"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "自動生成"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "署名:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "添付ファイルが <b>%d</b> 個あります"
+msgstr[1] "添付ファイルが <b>%d</b> 個あります"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "メッセージの作成"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "転送されたメッセージ - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "オリジナルのメッセージを添付する"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "このメッセージにファイル `{0}' を添付できません"
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11733,18 +12197,32 @@ msgstr ""
 "このフォルダの内容を添付する場合は、このフォルダ内のファイルをそれぞれ個々に"
 "添付するか、フォルダに対する書庫を作成して添付して下さい。"
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "メッセージを作成できませんでした。"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "理由は \"{1}\" です。"
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "完成していないメッセージがあります"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "未完のメッセージを復旧しますか？"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11752,38 +12230,38 @@ msgstr ""
 "新しいメッセージを作成する際に Evolution が不意に終了しました。メッセージを復"
 "旧すると、作成していたところから続行できるかもしれません。"
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "復旧しない"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "復旧する"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "自動保存のファイル \"{0}\" を保存できませんでした。"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "\"{1}\" のため自動保存する際にエラーが発生しました。"
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "警告: 変更済みのメッセージ"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "本当に作成途中の件名 '{0}' のメッセージを破棄してもよろしいですか？"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11793,65 +12271,49 @@ msgstr ""
 "メッセージを永久に失うことになります。保存しておくと、後日、メッセージの作成"
 "を続行することができます。"
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "変更を破棄する"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "保存する"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "メッセージを作成できませんでした。"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 "\"{0}\" のため、別のメール・オプションを選択した方が良いかもしれません。"
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "署名ファイル \"{0}\" を読み込めませんでした。"
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "理由は \"{1}\" です。"
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "全てのアカウントが削除されています。"
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "メールを作成する前にアカウントを設定して下さい。"
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "メール作成ウィンドウを生成できませんでした。"
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "アドレス選択コントロールを開けません。"
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12012,16 +12474,12 @@ msgstr "カテゴリの同期:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
@@ -12073,31 +12531,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H時"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I時%M分%S秒"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H時%M分%S秒"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I時%M分"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12174,10 +12624,131 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "比較するもう一つの時間の選択"
 
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
+msgstr "日付がありません。"
+
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "日付を選択して下さい。"
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
+msgstr "ファイル名がありません。"
+
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "ファイル名を指定して下さい。"
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr ""
+"ファイル \"{0}\" は存在していないか、または通常のファイルではありません。"
+
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:14
+msgid "Bad regular expression \"{0}\"."
+msgstr "正規表現 \"{0}\" が間違っています。"
+
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:16
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "正規表現 \"{1}\" を展開できませんでした。"
+
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+msgid "Missing name."
+msgstr "名前がありません。"
+
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:20
+msgid "You must name this filter."
+msgstr "このフィルタに名前を付けて下さい。"
+
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:22
+msgid "Name \"{0}\" already used."
+msgstr "既に名前 \"{0}\" は使用されています。"
+
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:24
+msgid "Please choose another name."
+msgstr "別の名前を選択して下さい。"
+
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "ファイルの選択"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "重要"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "ToDo"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "保留"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "テスト"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "ルール名:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>条件</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "全ての条件が合った時"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "幾つかの条件が合った時"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "次の条件で実行する:"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "全て関係する"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "返信先"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "返信先と親フォルダ"
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "スレッドを含む"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "入力"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "出力"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>フィルタのルール(_F)</b>"
@@ -12226,7 +12797,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr " 秒"
 
@@ -12242,82 +12813,81 @@ msgstr "指定した時間"
 msgid "years"
 msgstr "年"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:94
-msgid "Important"
-msgstr "重要"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "ルールの追加"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:149
-msgid "To Do"
-msgstr "ToDo"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "ルールの編集"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:98
-msgid "Later"
-msgstr "保留"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "ルール名"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "テスト"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "[CTRL]+[F1]"
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "ルール名:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "コンポーザの設定"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>条件</b> "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "セキュリティとメッセージ表示を含む、メール設定"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "全ての条件が合った時"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "幾つかの条件が合った時"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "使用する E-メールアカウントをここで設定します。"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "次の条件で実行する:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution メール"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "全て関係する"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution メール・アカウント設定コントロール"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "返信先"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution メール・コンポーネント"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "返信先と親フォルダ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution メール・コンポーザ"
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "スレッドを含む"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution メール・コンポーザ設定コントロール"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "入力"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution メール設定コントロール"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "出力"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "メール"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "ルールの追加"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "メールのアカウント"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "ルールの編集"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "メールの設定"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "ルール名"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "メール(_M)"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12372,7 +12942,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "フィルタのルール(_F)"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:492
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "フォルダの選択"
@@ -12506,7 +13076,7 @@ msgstr "にフラグが付いていない"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -12611,8 +13181,8 @@ msgstr "次で開始する"
 msgid "Stop Processing"
 msgstr "読み込みを停止する"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -12656,7 +13226,7 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
@@ -12669,441 +13239,287 @@ msgstr "作成"
 msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "仮想フォルダ"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "該当しないもの"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "読み込み中..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダ %s の移動中"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "ドラッグのキャンセル(_D)"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "コピー(_O)"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "移動(_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "名前の変更(_R)..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "プロパティ(_P)"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "仮想フォルダ"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "該当しないもの"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "受信箱"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "読み込み中..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "メール"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "フォロー・アップ(_W)..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "既読としてマーク(_K)"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "ジャンクとしてマーク(_J)"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "ジャンクではないとしてマーク(_N)"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "フィルタの適用(_Y)"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "ジャンク・フィルタの適用(_I)"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:69
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s へのメッセージを作成します"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "差出人"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "返信先"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "宛先"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日付"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "ニュースグループ"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "添付ファイル: %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "サポートしていない S/MIME の暗号化の種類"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "サポートしていない署名の書式"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "署名を検証する際にエラーが発生しました"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "署名を検証する際に不明なエラーが発生しました"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "'%s' の取得中"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "署名なし"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "妥当な署名"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "不正な署名"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "署名は妥当ですが、差出人を検証できません"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "暗号化なし"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "暗号化済み (レベルは不十分)"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "暗号化済み"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "暗号化済み (レベルは強力)"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "おかしな external-body 部分です。"
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP サイト (%s) を指しています"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ローカル・ファイル (%s) にリンクしています"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "リモート・データ (%s) にリンクしています"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "メッセージの整形"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "メーラー"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%R %a %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "一致するもの: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "署名なし"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "妥当な署名"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13111,17 +13527,21 @@ msgstr ""
 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
 "のであることを意味します。"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "不正な署名"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "署名は妥当ですが、差出人を検証できません"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13129,7 +13549,11 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "暗号化なし"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13137,7 +13561,11 @@ msgstr ""
 "このメッセージは暗号化されていません。インターネットを介して閲覧される可能性"
 "があります。"
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "暗号化済み (レベルは不十分)"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13147,7 +13575,11 @@ msgstr ""
 "です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
 "性があります。"
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "暗号化済み"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13155,7 +13587,11 @@ msgstr ""
 "このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
 "ことは困難と思われます。"
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "暗号化済み (レベルは強力)"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13164,39 +13600,161 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M に完了"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M まで"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "'%s' の取得中"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "署名は妥当ですが、差出人を検証できません"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "おかしな external-body 部分です。"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP サイト (%s) を指しています"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ローカル・ファイル (%s) にリンクしています"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "リモート・データ (%s) にリンクしています"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "メッセージの整形"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "差出人"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "返信先"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "宛先"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "メーラー"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr "<I> (%R %a %Z)</I>"
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日付"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "ニュースグループ"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "添付ファイル: %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "サポートしていない S/MIME の暗号化の種類"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "サポートしていない署名の書式"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "署名を検証する際にエラーが発生しました"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "署名を検証する際に不明なエラーが発生しました"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
@@ -13306,7 +13864,7 @@ msgstr "メッセージの送信(_N)..."
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "%s の中を開きます..."
@@ -13353,7 +13911,7 @@ msgid "Add address"
 msgstr "住所の追加"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "%s からのメッセージ"
@@ -13362,11 +13920,11 @@ msgstr "%s からのメッセージ"
 msgid "Virtual _Folders"
 msgstr "仮想フォルダ(_F)"
 
-#: mail/em-vfolder-rule.c:492
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "追加(_A)"
 
-#: mail/em-vfolder-rule.c:572
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "仮想フォルダのソース"
 
@@ -13844,62 +14402,33 @@ msgstr "ユーザが起動した spamd のポート番号です。"
 msgid "spamd port"
 msgstr "spamd のポート番号"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "[CTRL]+[F1]"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "コンポーザの設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "セキュリティとメッセージ表示を含む、メール設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "使用する E-メールアカウントをここで設定します。"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution メール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution メール・アカウント設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution メール・コンポーネント"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm インポータ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution メール・コンポーザ"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape メール・インポータ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution メール・コンポーザ設定コントロール"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 インポータ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution メール設定コントロール"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine インポータ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "メールのアカウント"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox インポータ"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:100
-msgid "Mail Preferences"
-msgstr "メールの設定"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "メール(_M)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13957,34 +14486,6 @@ msgstr "'%s' のインポート"
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape メール・インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox インポータ"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14117,15 +14618,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "%s のライセンス同意書"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:152
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "ユーザ名:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:174
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "パス(_P):"
 
@@ -14230,15 +14731,7 @@ msgstr "新しいメール・フォルダを作成します"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "メールの設定または関連フォルダのアップグレードに失敗しました。"
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "サービスの確認"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "サーバへ接続中..."
-
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:93
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "身元情報"
 
@@ -14253,7 +14746,7 @@ msgstr ""
 "い。"
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
@@ -14269,7 +14762,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "オプションを以下から選択して下さい。"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:132
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "メールの送信"
 
@@ -14281,7 +14774,7 @@ msgstr ""
 "メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
 "者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:38
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "アカウント管理"
 
@@ -14297,7 +14790,15 @@ msgstr ""
 "の送信方法は Evolution メールアカウントと一緒にまとめられます。このアカウント"
 "の名前を下の空欄に入力して下さい。この名前は表示目的のみに使用されます。"
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "サービスの確認"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "サーバへ接続中..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
@@ -14305,10 +14806,6 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr " サポートしているかチェックする(_E) "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>プレビュー</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>この Evolution は SSL サポート付きでビルドされていません</b>"
@@ -14322,215 +14819,211 @@ msgid "<b>_Languages</b>"
 msgstr "<b>言語(_L)</b> "
 
 #: mail/mail-config.glade.h:8
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>仮想フォルダのソース</b>"
-
-#: mail/mail-config.glade.h:9
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr "<small>これは、より信頼性の高いフィルタですが、低速です</small>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">アカウント情報</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">認証方式の種類</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">認証</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">新着メールのチェック</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">メッセージの作成</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">設定</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">デフォルトの動作</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">メールの削除</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">表示するヘッダの項目(_H)</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">フィルタリングのオプション</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">全般</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">ラベルと色</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">画像の読み込み</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">メッセージの表示</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">メッセージのフォント</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新着メールの通知</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">追加情報</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">オプション</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">ちょっとしたプライバシー (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">印刷用フォント</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">必須情報</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">セキュアな MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">セキュリティ</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">送信メッセージと草案メッセージ</span>"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">サーバの設定</span>"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "暗号化したメールを送信する場合は、メール全体も暗号化する(_L)"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "アカウント・エディタ"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "新しい署名の追加(_W)..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "スクリプトの追加(_S)"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "暗号化したメールを送信する場合は、常にメールを暗号化する(_W)"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "常に使用する CC 先(_S):"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "常に使用する Bcc 先(_B):"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "このアカウントを使用する場合は、常に送信メッセージに署名を付与する(_S)"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "暗号解読時に常に信用キーを使用する(_T)"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "オリジナルのメッセージを添付する"
 
-#: mail/mail-config.glade.h:48 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "添付する"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "スマイリー・アイコンを自動的に挿入する(_I)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "新着メールを自動的にチェックする(_N)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "バルチック語 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "バルチック語 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "新着メールが届いたらビープ音を鳴らす(_H)"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "文字セット(_H):"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "サポートしているかチェックする(_E) "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Check _incoming mail for junk"
 msgstr "ジャンク・メールをチェックする(_I)"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "入力時にスペル・チェックする(_T)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 "受信したメール・メッセージがジャンク (SPAM; UCE, UBE) かどうかチェックします"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "スペルミスした文字の色(_M):"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "色"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "フォルダを抹消する前に確認する(_W)"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14546,241 +15039,241 @@ msgstr ""
 "\n"
 "\"適用\" をクリックして設定を保存して下さい。"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "デフォルト(_F)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "デフォルトの文字エンコード(_N): "
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "デフォルト"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "オリジナルのメッセージを引用しない"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "会議開催要求に合意しない (Outlook 互換)"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完了"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "草案フォルダ(_F):"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-メール・アカウント"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "E-メール・アドレス(_A):"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "終了時にゴミ箱フォルダを空にする(_X)"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "暗号化する証明書(_P):"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution アカウント・アシスタント"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "コマンドの実行..."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "固定幅(_X):"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "フォントのプロパティ"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "HTML の中のメッセージを整形する(_H)"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML 形式のメール"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "ヘッダ"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "引用を強調表示する(_Q)"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "I_nclude remote tests"
 msgstr "リモートのテストも含める(_N)"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "インラインにする"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "メールの設定"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "メールボックスの場所"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "メッセージ作成"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意: 最初に接続するまで、パスワードの入力は求められません"
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "組織(_G):"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鍵の ID(_K):"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "新着メールが届いたらサウンドを演奏する(_V)"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Bcc 受信者のみ指定されている場合は送信する前に確認する(_O)"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "オリジナルのメッセージを引用する"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "引用する"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "このパスワードを記憶する(_M)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "返信先(_P):"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "メールの受信"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "返信オプション"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "このパスワードを記憶する(_P)"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "標準フォント(_T):"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "セキュリティ"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "HTML 表示の固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "印刷時の HTML 固定幅フォントの選択"
 
-#: mail/mail-config.glade.h:128
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HtML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "印刷時の HTML 可変幅フォントの選択"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "選択..."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "メールの送信"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "送信済フォルダ(_M):"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "サーバ認証を行う(_V)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "サーバ種別(_T):"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "署名する証明書(_G):"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "署名(_U):"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "署名"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "ファイル名の指定(_F):"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "スペル・チェック"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "標準的な UNIX の mbox ファイル"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "端末のフォント(_E):"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "種別(_Y): "
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14789,7 +15282,7 @@ msgstr ""
 "このスクリプトの出力を署名として使用します。\n"
 "\"名前\" は表示の目的でのみ使用されます。"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:147
 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 "
@@ -14798,7 +15291,7 @@ msgstr ""
 "このページでは、スペル・チェックとその対象言語を設定します。インストールした"
 "辞書の言語のみ一覧に表示されます。"
 
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14806,11 +15299,11 @@ msgstr ""
 "このアカウントにお好みの名前を付けて下さい:\n"
 "(例: \"仕事\" とか \"プライベート\" とか)"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "可変幅(_A):"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -14820,99 +15313,199 @@ msgstr ""
 "\n"
 "[進む] ボタンをクリックして下さい。"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "署名の追加(_A)"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "常に画像を読み込む(_A)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "送信するメッセージにデジタル署名する (デフォルト)(_D)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "新着メールが届いても通知しない(_D)"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "有効(_E)"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "送信メッセージを暗号化する (デフォルト)(_E)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "転送方式(_F):"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "アドレス帳に登録された差出人の場合は画像を読み込む(_L)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "これをデフォルトのアカウントにする(_M)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "メッセージに\"既読\"マークを付与する時間(_M)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "二度と画像を読み込まない(_N)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML 形式を希望しない連絡先へ送信する場合は確認する(_P)"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "件名が空の場合は送信する前に確認する(_P)"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "返信方法(_R):"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "スクリプト(_S):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "アニメーションを表示する(_S)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "他のアプリと同じフォントを使う(_U)"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "色"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "説明"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"次に示す %s のライセンス同意書を\n"
+"注意深く読んで、同意する場合は\n"
+"チェック・ボックスにチェックを入れて下さい。\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>仮想フォルダのソース</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">デジタル署名</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">暗号化</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "受諾済"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "完了しました(_O)"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "大/小文字を区別する"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "メッセージの中を検索"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "検索:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "フォローアップするフラグ"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "フォルダの購読"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "%s のライセンス同意書"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "未選択です"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "サーバ(_E):"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "セキュリティ情報"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"フォローアップとして指定したメッセージが下記に一覧化されています。\n"
+"\"フラグ\" メニューからフォローアップの内容を選択して下さい。"
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "受諾したライセンスのリスト"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "期日(_D):"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "フラグ付き(_F):"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "購読(_S)"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "購読の停止(_U)"
+
+#: mail/mail-dialogs.glade.h:30
 msgid "specific folders only"
 msgstr "指定したフォルダだけ"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-dialogs.glade.h:31
 msgid "with all active remote folders"
 msgstr "有効な全てのリモート・フォルダ"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-dialogs.glade.h:32
 msgid "with all local and active remote folders"
 msgstr "全てのローカル・フォルダと有効なリモート・フォルダ"
 
-#: mail/mail-config.glade.h:189
+#: mail/mail-dialogs.glade.h:33
 msgid "with all local folders"
 msgstr "全てのローカル・フォルダ"
 
@@ -14937,6 +15530,7 @@ msgstr "サーバ \"{0}\" への (\"{0}\" としての) ログインに失敗し
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14964,8 +15558,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "送信する(_S)"
+msgstr "送信"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14982,7 +15577,6 @@ msgstr ""
 "やすくなります。"
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "BCC のみ付与してメッセージを送信してもよろしいですか？"
@@ -15060,7 +15654,6 @@ msgstr ""
 "よろしいですか？"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "続行すると、これらのメッセージを復旧することができなくなります。"
@@ -15089,6 +15682,7 @@ msgstr "送信していないメッセージがあります。それでも終了
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15133,21 +15727,6 @@ msgstr "操作を実行する際にエラーが発生しました。"
 msgid "{0}."
 msgstr "{0}。"
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15164,8 +15743,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "フォルダ \"{0}\" へ保存できません。"
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15202,7 +15779,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "システム・フォルダ \"{0}\" を削除できません。"
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15236,13 +15812,11 @@ msgstr ""
 "永久に削除されることになります。"
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" から \"{1}\" へ名前を変更できません。"
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "既に同名のフォルダ \"{1}\" があります。別の名前を使用して下さい。"
@@ -15253,25 +15827,21 @@ msgid "Because \"{2}\"."
 msgstr "理由は \"{2}\" です。"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "フォルダ \"{0}\" を \"{1}\" へ移動できません。"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "操作の対象先 \"{2}\" を開けません。"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "操作の対象元 \"{2}\" を開けません。"
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "フォルダ \"{0}\" を \"{1}\" へコピーできません。"
@@ -15287,7 +15857,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "ソース \"{1}\" を開けません。"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "アカウントの変更点を保存できません。"
@@ -15309,8 +15878,11 @@ msgstr "アカウントを削除しますか？"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "本当にこのアカウントを削除してもよろしいですか？"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15318,8 +15890,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "続行すると、アカウント情報が永久に削除されます。"
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "削除しない"
+msgstr "削除の取り消し(_U)"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15348,6 +15921,7 @@ msgstr "変更を破棄しますか？"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "変更を保存しますか？"
 
@@ -15429,11 +16003,6 @@ msgstr "フォルダがありません。"
 msgid "You must specify a folder."
 msgstr "フォルダを指定して下さい。"
 
-#. mail:no-name-vfolder primary
-#: mail/mail-errors.xml.h:214
-msgid "Missing name."
-msgstr "名前がありません。"
-
 #. mail:no-name-vfolder secondary
 #: mail/mail-errors.xml.h:216
 msgid "You must name this vFolder."
@@ -15667,30 +16236,6 @@ msgstr "%s からの接続はありません"
 msgid "Reconnecting to %s"
 msgstr "%s へ再接続"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "大/小文字を区別する"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "メッセージの中を検索"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "検索:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">デジタル署名</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">暗号化</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "セキュリティ情報"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "キャンセル中..."
@@ -15798,15 +16343,15 @@ msgstr "'%s:%s' の仮想フォルダの更新中"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' の仮想フォルダの更新中"
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "仮想フォルダの編集"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "新しい仮想フォルダ"
 
@@ -15938,49 +16483,57 @@ msgstr "全員へ返信"
 msgid "Review"
 msgstr "レビュー"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "フォローアップするフラグ"
+#: mail/searchtypes.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "本文"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "完了しました(_O)"
+#: mail/searchtypes.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "が次のものを含まない"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"フォローアップとして指定したメッセージが下記に一覧化されています。\n"
-"\"フラグ\" メニューからフォローアップの内容を選択して下さい。"
+#: mail/searchtypes.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "が次のものを含まない"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "期日(_D):"
+#: mail/searchtypes.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "本文"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "フラグ付き(_F):"
+#: mail/searchtypes.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "説明が次のものを含む"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "フォルダの購読"
+#: mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "サマリが次のものを含む"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "未選択です"
+#: mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "件名は %s です"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "サーバ(_E):"
+#: mail/searchtypes.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "が次のものを含まない"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "購読(_S)"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution シェル"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "購読の停止(_U)"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution のテスト"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution のテスト・コンポーネント"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16047,30 +16600,19 @@ msgstr "開発版を警告するダイアログをスキップするかどうか
 msgid "mail"
 msgstr "メール"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld Kバイト"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "特定できないシステム・エラーです。"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "不正な引数"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "OAF に登録できません"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>認証</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "データベースの設定がありません"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "次の条件で実行する:"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "一般的なエラー"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16254,27 +16796,6 @@ msgstr "フォルダ名には文字 \"#\" を含めることはできません�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' と '..' はフォルダ名として予約済みです。"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
-"て下さい)"
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution はオフラインのままで処理します"
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
-"て下さい)"
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "\"%s\" へ切り替えます"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16309,10 +16830,92 @@ msgstr "オフライン作業(_W)"
 msgid "Work Offline"
 msgstr "オフライン作業"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
+"て下さい)"
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution はオフラインのままで処理します"
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
+"て下さい)"
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "\"%s\" へ切り替えます"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld Kバイト"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "特定できないシステム・エラーです。"
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "不正な引数"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF に登録できません"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "データベースの設定がありません"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "一般的なエラー"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "新規"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution インポート・アシスタント"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "ファイルのインポート"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "タイムゾーン(_Z):"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新しいテスト"
@@ -16325,18 +16928,6 @@ msgstr "テスト(_T)"
 msgid "Create a new test item"
 msgstr "新しいタスク・アイテムを作成します"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution シェル"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution のテスト"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution のテスト・コンポーネント"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"インポート\" をクリックしてファイルの収集を開始して下さい。"
@@ -16396,7 +16987,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution は以下のファイルからデータ取込みが可能です:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:232
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16431,7 +17022,7 @@ msgstr ""
 "私たちの激務の結果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待っています！\n"
 
-#: shell/main.c:256
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16439,39 +17030,39 @@ msgstr ""
 "感謝します。\n"
 "Evolution 開発チーム\n"
 
-#: shell/main.c:263
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "このメッセージを二度と表示しない"
 
-#: shell/main.c:497
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "指定したコンポーネントを有効にして Evolution を起動する"
 
-#: shell/main.c:499
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "オフライン・モードで起動する"
 
-#: shell/main.c:501
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "オンライン・モードで起動する"
 
-#: shell/main.c:504
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "全ての Evolution コンポーネントを強制終了する"
 
-#: shell/main.c:508
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4系から関連ファイルを強制的に移行する"
 
-#: shell/main.c:511
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "全てのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:535
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16480,6 +17071,94 @@ msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は %s --help をご覧下さい。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "本文"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "wombat サーバを起動できませんでした"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution アカウント・アシスタント"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16722,6 +17401,11 @@ msgstr "ユーザの証明書"
 msgid "_Edit CA Trust"
 msgstr "CA トラストの編集(_E)"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "既に証明書があります"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
@@ -16921,11 +17605,6 @@ msgstr "件名の重複しない ID"
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "既に証明書があります"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
@@ -17065,8 +17744,8 @@ msgstr "現在の連絡先の表示"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "アクション(_A)"
@@ -17539,16 +18218,6 @@ msgstr "選択の反転(_I)"
 msgid "_Threaded Message List"
 msgstr "メッセージ一覧のスレッド化(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "このウィンドウを閉じます"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "閉じる(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳へ追加(_D)"
@@ -17949,6 +18618,16 @@ msgstr "ツール(_T)"
 msgid "_Undelete"
 msgstr "削除の取り消し(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "このウィンドウを閉じます"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "添付"
@@ -18031,10 +18710,6 @@ msgstr "現在のファイルを別名で保存します"
 msgid "Save the message in a specified folder"
 msgstr "指定のフォルダへメッセージを保存します"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "送信"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18738,39 +19413,175 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
 
-#~ msgid "Reflow Test"
-#~ msgstr "Reflow のテスト"
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "HTTP サーバの認証証明"
 
-#~ msgid "This should test the reflow canvas item"
-#~ msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "公開するカレンダ"
 
-#~ msgid "Missing date."
-#~ msgstr "日付がありません。"
+#~ msgid "Login name:"
+#~ msgstr "ログイン名:"
 
-#~ msgid "You must choose a date."
-#~ msgstr "日付を選択して下さい。"
+#~ msgid "URL:"
+#~ msgstr "URL:"
 
-#~ msgid "Missing file name."
-#~ msgstr "ファイル名がありません。"
+#~ msgid "User Publishes"
+#~ msgstr "手動"
 
-#~ msgid "You must specify a file name."
-#~ msgstr "ファイル名を指定して下さい。"
+#~ msgid "Could not start wombat"
+#~ msgstr "wombat を起動できませんでした"
 
-#~ msgid "File \"{0}\" does not exist or is not a regular file."
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
 #~ msgstr ""
-#~ "ファイル \"{0}\" は存在していないか、または通常のファイルではありません。"
+#~ "指定したカレンダは読み込み専用なのでイベントを作成できません。読み込み/書"
+#~ "き込みモードのカレンダを指定して下さい。"
+
+#~ msgid "C_alendar"
+#~ msgstr "カレンダ(_A)"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "オーディオ・アラームのオプション"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "メッセージ・アラームのオプション"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "E-メール・アラームのオプション"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "プログラム・アラームのオプション"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "不明なアラームのオプション"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "アラームの繰り返し"
+
+#~ msgid "Message to Display:"
+#~ msgstr "表示するメッセージ:"
+
+#~ msgid "Message to Send"
+#~ msgstr "送信するメッセージ"
+
+#~ msgid "Play sound:"
+#~ msgstr "サウンド再生:"
+
+#~ msgid "Run program:"
+#~ msgstr "プログラム実行:"
 
-#~ msgid "Bad regular expression \"{0}\"."
-#~ msgstr "正規表現 \"{0}\" が間違っています。"
+#~ msgid "With these arguments:"
+#~ msgstr "引き渡す引数:"
 
-#~ msgid "Could not compile regular expression \"{1}\"."
-#~ msgstr "正規表現 \"{1}\" を展開できませんでした。"
+#~ msgid "Basics"
+#~ msgstr "基本"
+
+#~ msgid "Date/Time:"
+#~ msgstr "日付/時刻:"
+
+#~ msgid "Reminders"
+#~ msgstr "リマインダ"
+
+#~ msgid "_Options..."
+#~ msgstr "オプション(_O)..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "アドレス帳..."
+
+#~ msgid "Reminder"
+#~ msgstr "リマインダ"
+
+#~ msgid "B_usy"
+#~ msgstr "予定あり(_U)"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "極秘(_N)"
+
+#~ msgid "Date & Time"
+#~ msgstr "日付と時刻"
+
+#~ msgid "F_ree"
+#~ msgstr "予定なし(_R)"
+
+#~ msgid "Pri_vate"
+#~ msgstr "非公開(_V)"
+
+#~ msgid "Pu_blic"
+#~ msgstr "公開(_B)"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "出席者の追加(_T)"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "出席者をアドレス帳から追加します"
+
+#~ msgid "Preview"
+#~ msgstr "プレビュー"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "繰り返しのルール"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "カスタマイズ(_C)"
+
+#~ msgid "_Modify"
+#~ msgstr "修正(_M)"
+
+#~ msgid "_No recurrence"
+#~ msgstr "繰り返さない(_N)"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "簡易指定(_S)"
+
+#~ msgid "% _Complete"
+#~ msgstr "% 完了(_C)"
+
+#~ msgid "Progress"
+#~ msgstr "進捗状況"
+
+#~ msgid "Con_fidential"
+#~ msgstr "極秘(_F)"
+
+#~ msgid "Folder:"
+#~ msgstr "フォルダ:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA システムでエラーが見つかりました\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "オブジェクトが見つかりませんでした\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "カレンダを更新する権限がありません\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "出席状況を更新できませんでした！\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "出席者をアドレス帳から追加する"
+
+#~ msgid "_Options"
+#~ msgstr "オプション(_O)"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "会議の開始時間(_S):"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "会議の終了時間(_E):"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "指定したタスク一覧は読み込み専用なのでイベントを作成できません。読み込み/"
+#~ "書き込みモードのカレンダを指定して下さい。"
 
-#~ msgid "You must name this filter."
-#~ msgstr "このフィルタに名前を付けて下さい。"
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "'%s' の証明書が見つかりません"
 
-#~ msgid "Name \"{0}\" already used."
-#~ msgstr "既に名前 \"{0}\" は使用されています。"
+#~ msgid "Can't create CMS Message"
+#~ msgstr "CMS Message を作成できません"
 
-#~ msgid "Please choose another name."
-#~ msgstr "別の名前を選択して下さい。"
+#~ msgid "Can't create encoder context"
+#~ msgstr "エンコーダ・コンテキストを作成できません"
diff --git a/po/ko.po b/po/ko.po
index de2e871dde..f6713c06a7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.3\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-04-21 02:15+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -22,17 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution 주소록"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "연락처:"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "evolution 알림"
-
 # command line help
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
@@ -57,34 +46,254 @@ msgstr "카드"
 msgid " card"
 msgstr "카드"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "연락처:"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "evolution 알림"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "항목을 보낼 수 없습니다!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "LDAP 서버에서 인증 실패"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "NNTP 서버에서 글 \"%s\"을(를) 가져올 수 없습니다."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "주소록을 읽어들일 수 없습니다"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "분류 편집기를 사용할 수 없습니다."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "주소록에 저장"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "기본 주소록 읽는 중 오류."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "스풀 폴더를 진행할 수 없습니다"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "바뀐 부분을 저장하시겠습니까?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "버리기(_D)"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "그리고 기타 연락처 %d개."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "메세지 내용을 파싱할 수 없습니다"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "연락처를 더하는 중 오류가 발생했습니다"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution 주소록 주소 뷰"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "주소록을 읽어들일 수 없습니다"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "익명으로 LDAP 서버 사용"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "인증하는 데 실패했습니다.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "자동 완성"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "연락처"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "인증서"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "여기서 자동 완성을 설정합니다"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "연락처"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution 주소록"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 주소록 주소 팝업"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 주소록 주소 뷰"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 주소록 카드 뷰"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution 주소록 컴포넌트"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution s/Mime 인증서 관리 컨트롤"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 폴더 설정 컨트롤"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "여기서 s/MIME 인증서를 관리합니다"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -117,7 +326,7 @@ msgstr "새 연락처"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "연락처(_C):"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -141,15 +350,15 @@ msgid "Migrating `%s':"
 msgstr "`%s' 옮기는 중:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "이 컴퓨터"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -158,19 +367,19 @@ msgid "Personal"
 msgstr "개인"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP 서버"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "자동 완성 설정"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,7 +390,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -192,7 +401,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -203,7 +412,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -214,36 +423,45 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "지우기"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "등록 정보..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "연락처"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "익명으로 LDAP 서버 사용"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "인증하는 데 실패했습니다.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -263,61 +481,6 @@ msgstr "자동 완성하기 전에 최소한 입력해야 하는 문자 개수"
 msgid "URI for the folder last used in the select names dialog"
 msgstr "이름 선택 대화 상자에 마지막으로 사용되었던 폴더의 URI"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "자동 완성"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "연락처"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "인증서"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "여기서 자동 완성을 설정합니다"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution 주소록"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 주소록 주소 팝업"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 주소록 주소 뷰"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 주소록 카드 뷰"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution 주소록 컴포넌트"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution s/Mime 인증서 관리 컨트롤"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 폴더 설정 컨트롤"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "여기서 s/MIME 인증서를 관리합니다"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -325,7 +488,7 @@ msgstr "여기서 s/MIME 인증서를 관리합니다"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -334,8 +497,7 @@ msgstr "여기서 s/MIME 인증서를 관리합니다"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -361,6 +523,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "SMTP 인증"
@@ -409,13 +572,11 @@ msgid "Anonymously"
 msgstr "익명으로"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "기본"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "자세히"
 
@@ -668,33 +829,26 @@ msgid "cards"
 msgstr "카드"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "분"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "전부 지우기"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "전부 지우기"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "연락처 목록 보기"
@@ -709,7 +863,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML 메일 보내기?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "연락처에 더하기"
 
@@ -717,16 +871,23 @@ 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 "이름"
+
 # FIXME - 무슨 뜻?
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "주소록에서 연락처를 선택하십시오"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -748,6 +909,11 @@ msgstr "분류(_A):"
 msgid "_Find"
 msgstr "찾기(_F)"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "찾기(_S)"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -792,9 +958,8 @@ msgid "<b>Work</b>"
 msgstr "<b>기한:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -819,7 +984,6 @@ msgid "Birthday:"
 msgstr "생일(_Y):"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "달력:"
 
@@ -834,15 +998,15 @@ msgid "Company:"
 msgstr "명령:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "연락처"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
@@ -947,8 +1111,8 @@ msgstr "웹 페이지(_W):"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -970,44 +1134,28 @@ msgid "_File under:"
 msgstr "파일 이름:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "서버(_E):"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"정말로 이 계정을\n"
-"지우시겠습니까?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"정말로 이 연락처를\n"
-"지우시겠습니까?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "주소"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "편집 가능"
 
@@ -1979,132 +2127,124 @@ msgstr "잠비아"
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 인스턴스 메신저"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "야후"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo 메신저"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "서비스"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "위치"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "사용자이름"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "집"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "기타"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "야후"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "바뀜"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "이 연락처는 다음 분류에 속합니다:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "니제르"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "되풀이되는 날짜가 잘못되었습니다"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "연락처 %d개"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "버리기(_D)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 인스턴스 메신저"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo 메신저"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "서비스"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "위치"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "사용자이름"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "연락처 빨리 더하기"
@@ -2122,6 +2262,22 @@ msgstr "전체 이름(_F):"
 msgid "E-_mail:"
 msgstr "전자메일(_M):"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"정말로 이 계정을\n"
+"지우시겠습니까?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"정말로 이 연락처를\n"
+"지우시겠습니까?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "주소 _2:"
@@ -2245,48 +2401,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "주소록에서 연락처를 선택하십시오"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "구성원"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "첨부파일 목록에서 선택한 항목을 지웁니다"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "선택됨"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "이 목록으로 메일을 보낼 때 주소를 숨깁니다(_H)"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "목록 이름(_N):"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌어 당기십시오(_T):"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "연락처 목록 편집기"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "북"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "새 목록"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "필수 참석자"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "VCard로 목록 저장"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "바뀐 연락처:"
@@ -2325,421 +2502,11 @@ msgstr ""
 "그래도 연락처를 더하시겠습니까?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "고급 찾기"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(지도)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "지도"
-
-# List는 여기서 Mailing List를 말한다
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "리스트 구성원"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "전자메일"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "조직"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "직위"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "화상 회의"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "전화"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "팩스"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "업무"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "블로그"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "휴대 전화"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "개인"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "메모"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "직함"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "전자메일"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "홈페이지"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "성공했습니다"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "저장고가 연결되지 않았습니다"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "주소록이 없습니다"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "새 연락처 목록"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "권한이 거부되었습니다"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "연락처를 찾을 수 없습니다"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "연락처 ID가 이미 있습니다"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "프로토콜이 지원되지 않습니다"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "취소됨"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "소스를 열 수 없습니다"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "인증이 실패했습니다"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "인증이 필요합니다"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS를 사용할 수 없습니다"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "그런 메세지 없음"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "다른 오류"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
-"지 확인하십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
-"할 수 없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"이 Evolution 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하"
-"려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
-"파일해야 합니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
-"없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"이 쿼리에, 서버에서 리턴하기로 설정된 것보다 많은 카드가 일치하거나,\n"
-"Evolution에서 표시하도록 설정된 것보다 많은 카드가 일치하였습니다.\n"
-"좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
-"결과의 한계치를 지정해 주십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"쿼리에 걸린 시간이 서버의 한계값 혹은 이 주소록에서 설정한 한계값을\n"
-"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
-"결과의 한계치를 지정해 주십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "이 질의가 성공적으로 끝나지 않았습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "목록을 더하는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "연락처를 더하는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "목록을 고치는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "연락처를 고치는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "목록을 지우는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "연락처를 지우는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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개를 열면 %d개의 새 창을 열게 됩니다.\n"
-"정말로 이 연락처를 전부 여시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s이(가) 이미 존재합니다\n"
-"이 파일을 덮어 쓰시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "덮어 쓰기"
-
-# 파일 이름
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "카드.vcf"
-
-# 파일 이름
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "목록"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "연락처 이동"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "연락처 복사"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "연락처 이동"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "연락처 복사"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "어디로 갈지 주소록을 선택하십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "여러 개 VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "%s에 대한 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:199
-msgid "(none)"
-msgstr "(없음)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "주요 전자메일"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "전자메일 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "전자메일 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "명령 선택"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "새로운 연락처 \"%s\"을(를) 만듭니다"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "주소를 기존 연락처 \"%s\"에 더합니다"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "주소록 질의중입니다..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "연락처 정보 고침"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "전자메일 주소 합침"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "그리고 기타 연락처 %d개."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "VCard 자세히 보기"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "VCard 간단히 보기"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "주소록에 저장"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "연락처 없음"
@@ -2752,9 +2519,9 @@ msgstr[0] "연락처 %d개"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "쿼리"
 
@@ -2770,130 +2537,130 @@ msgstr "모델"
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 데 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "이름 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "전자메일 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "분류"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "필드에 포함"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "고급..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "형태"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "주소록"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "VCard로 저장"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "새 연락처..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "새 연락처 목록..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "폴더로 가기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "가져오기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "연락처 찾기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "주소록 원본..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "파일롯 설정..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "주소 전달"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "연락처로 메세지 보내기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "봉투 인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "주소록으로 복사..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "주소록으로 옮기기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "잘라내기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "붙여 넣기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "현재 보기"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "모든 분류"
@@ -2927,6 +2694,8 @@ msgid "Car Phone"
 msgstr "카폰"
 
 #: 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:3
 msgid "Categories"
 msgstr "분류"
 
@@ -2934,6 +2703,21 @@ msgstr "분류"
 msgid "Company Phone"
 msgstr "회사 전화"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "전자메일"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "전자메일 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "전자메일 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "성"
@@ -2971,14 +2755,29 @@ msgstr "일지"
 msgid "Manager"
 msgstr "관리자"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "휴대 전화"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "별명"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "메모"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "사무실"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "조직"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "기타 팩스"
@@ -3031,29 +2830,21 @@ msgstr "구성 단위"
 msgid "Web Site"
 msgstr "웹 사이트"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "너비"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "높이"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "촛점이 있는 지"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "선택됨"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "커서가 있는 지"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "항목"
@@ -3070,7 +2861,11 @@ msgstr "텍스트 모델"
 msgid "Max field name length"
 msgstr "최대 필드 이름 길이"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "열 너비"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3084,7 +2879,7 @@ msgstr ""
 "\n"
 "새 연락처를 만드려면 마우스를 두번 누르십시오."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3095,13 +2890,391 @@ msgstr ""
 "여기에서 보여줄 수 있는 항목이 없습니다."
 
 # FIXME - 무슨 뜻?
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "어댑터"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "열 너비"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "선택됨"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "커서가 있는 지"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(지도)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "지도"
+
+# List는 여기서 Mailing List를 말한다
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "리스트 구성원"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "전자메일"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "직위"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "화상 회의"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "전화"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "팩스"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "업무"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "블로그"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "개인"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "직함"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "홈페이지"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "성공했습니다"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "저장고가 연결되지 않았습니다"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "주소록이 없습니다"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "새 연락처 목록"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "권한이 거부되었습니다"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "연락처를 찾을 수 없습니다"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "연락처 ID가 이미 있습니다"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "프로토콜이 지원되지 않습니다"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "취소됨"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "소스를 열 수 없습니다"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "인증이 실패했습니다"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "인증이 필요합니다"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS를 사용할 수 없습니다"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "그런 메세지 없음"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "다른 오류"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
+"지 확인하십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
+"할 수 없습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"이 Evolution 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하"
+"려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
+"파일해야 합니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
+"없습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"이 쿼리에, 서버에서 리턴하기로 설정된 것보다 많은 카드가 일치하거나,\n"
+"Evolution에서 표시하도록 설정된 것보다 많은 카드가 일치하였습니다.\n"
+"좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
+"결과의 한계치를 지정해 주십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"쿼리에 걸린 시간이 서버의 한계값 혹은 이 주소록에서 설정한 한계값을\n"
+"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
+"결과의 한계치를 지정해 주십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "이 질의가 성공적으로 끝나지 않았습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "목록을 더하는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "연락처를 더하는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "목록을 고치는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "연락처를 고치는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "목록을 지우는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "연락처를 지우는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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개를 열면 %d개의 새 창을 열게 됩니다.\n"
+"정말로 이 연락처를 전부 여시겠습니까?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s이(가) 이미 존재합니다\n"
+"이 파일을 덮어 쓰시겠습니까?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "덮어 쓰기"
+
+# 파일 이름
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "카드.vcf"
+
+# 파일 이름
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "목록"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "연락처 이동"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "연락처 복사"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "연락처 이동"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "연락처 복사"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "어디로 갈지 주소록을 선택하십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "여러 개 VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "%s에 대한 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:198
+msgid "(none)"
+msgstr "(없음)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "주요 전자메일"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "명령 선택"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "새로운 연락처 \"%s\"을(를) 만듭니다"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "주소를 기존 연락처 \"%s\"에 더합니다"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "주소록 질의중입니다..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "연락처 정보 고침"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "전자메일 주소 합침"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "그리고 기타 연락처 %d개."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "VCard 자세히 보기"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "VCard 간단히 보기"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "주소록에 저장"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3148,6 +3321,11 @@ msgstr "Evolution VCard 가져오기"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "vcard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "봉투 인쇄"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "연락처 인쇄"
@@ -3157,11 +3335,6 @@ msgstr "연락처 인쇄"
 msgid "Print contact"
 msgstr "연락처 인쇄"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "봉투 인쇄"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 포인트 Tahoma"
@@ -3346,6 +3519,22 @@ msgstr "연락처 인쇄 테스트"
 msgid "This should test the contact print code"
 msgstr "연락처 인쇄 코드를 테스트합니다"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "파일을 열 수 없습니다"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "주소록을 읽어들일 수 없습니다"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "주소록을 열 수 없습니다"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "표준 출력 대신에 출력할 파일을 지정합니다"
@@ -3403,22 +3592,6 @@ msgstr "일반 모드에서는, 크기 옵션이 필요 없습니다."
 msgid "Impossible internal error."
 msgstr "일어날 수 없는 내부 오류."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "파일을 열 수 없습니다"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "주소록을 읽어들일 수 없습니다"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "주소록을 열 수 없습니다"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "기본 주소록 읽는 중 오류."
@@ -3435,40 +3608,369 @@ msgstr "파일이름이 주어지지 않았습니다."
 msgid "Unnamed List"
 msgstr "이름 없는 목록"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "지우지 않음"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "보낼 사람:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "정말로 이 회의를 취소하고 지우시겠습니까?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "정말 작업 %d개를 지우시겠습니까?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "정말로 이 일지 항목을 취소하고 지우시겠습니까?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+# journal -> 일지, Microsoft Office XP 참고
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "정말 일지 항목 %d개를 지우시겠습니까?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "정말로 약속 `%s'을(를) 지우시겠습니까?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "정말 약속 %d개를 지우시겠습니까?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "정말로 작업 `%s'을(를) 지우시겠습니까?"
+
+# journal -> 일지, Microsoft Office XP 참고
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "정말로 일지 항목 `%s'을(를) 지우시겠습니까?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "정말로 약속 `%s'을(를) 지우시겠습니까?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "정말로 작업 `%s'을(를) 지우시겠습니까?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+# journal -> 일지, Microsoft Office XP 참고
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "정말로 일지 항목 `%s'을(를) 지우시겠습니까?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "약속"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "바뀐 부분을 저장하시겠습니까?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 업데이트하시겠습니"
+"까?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "바뀐 내용 버리기(_D)"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "메세지 저장..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "보내기"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar 가져오기"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "열쇠글을 입력하십시오"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "여러 날에 걸친 행사 분리:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "wombat 서버를 시작할 수가 없습니다"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "wombat을 시작할 수 없습니다"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "파일롯의 Calendar 프로그램 블록을 읽을 수 없습니다"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "기본 우선순위:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록을 읽을 수 없습니다"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "달력 및 작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "달력"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "여기서 시간대, 달력 및 작업 목록을 설정합니다"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 달력 및 작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 달력 설정 컨트롤"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 달력 계획 메세지 보기"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 달력/작업 편집"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution 달력 컴포넌트"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution 작업 컴포넌트"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "달력"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "작업(_T)"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#: 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:213
 msgid "Starting:"
 msgstr "시작:"
@@ -3573,11 +4075,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-# Alarm -> 알림, Microsoft Office XP 참고
-#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
@@ -3723,9 +4220,29 @@ msgstr "시간을 오전/오후가 아닌 24시간 모드로 표시할 것인지
 msgid "Whether to show week numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시할 지 여부"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "요약에 포함"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "설명에 포함"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "주석에 포함"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "위치에 포함"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "맞지 않음"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3749,8 +4266,8 @@ msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "일"
 
@@ -3761,7 +4278,7 @@ msgstr "%Y년 %b %e일 %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:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%b %e일 (%a)"
@@ -3812,62 +4329,52 @@ msgstr "행사와 회의를 만드는 데 달력 '%s'을(를) 열 수 없습니�
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 쓸 수 있는 달력이 없습니다"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "달력"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "새 약속"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "새 모임"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "하루 종일 약속(_D)"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "새 달력"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "달력(_A)"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "달력"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
@@ -3897,26 +4404,6 @@ msgstr "주별 보기"
 msgid "Month View"
 msgstr "월별 보기"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "요약에 포함"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "설명에 포함"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "주석에 포함"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "위치에 포함"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "맞지 않음"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
@@ -3934,228 +4421,135 @@ msgstr "달력을 열 허가가 거부되었습니다"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "오디오 알림 옵션"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "메세지 알림 옵션"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "전자메일 알림 옵션"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "프로그램 알림 옵션"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "알 수 없는 알림 옵션"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "알림 반복"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "표시할 메세지:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "보낼 메세지"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "소리 연주:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "알림 반복:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "프로그램 실행:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "보낼 사람:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "인자:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>기타</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "번, 주기:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>작업 목록 옵션</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "시간"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>기한:</b> "
 
-# Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "동작/시작 옵션"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "달력 더하기"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "더하기(_D)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "메일 메세지를 작성합니다"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "기본"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "날짜/시각:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "메세지(_M)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "소리 연주"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "미리 알림"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "프로그램 실행"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "보낼 사람:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "전자메일 보내기"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "요약:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "계정(_A):"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "프로그램 실행"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "옵션(_O)..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "알림 반복:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "보내기"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "뒤에:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "전에:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "일"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "약속 끝"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "번, 주기:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "시간"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "시간"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "분"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "약속의 시작"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "달력을 가져올 위치를 지정해야 합니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "원본 위치 '%s'이(가) 잘 구성된 형식이 아닙니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "원본 위치 '%s'이(가) webcal 원본이 아닙니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "이름이 '%s'인 원본이 이미 선택한 그룹에 있습니다"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "'%s' 그룹이 원격 그룹입니다. 달력을 어디서 가져올 지 지정해야 합니다"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "달력 더하기"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "작업 목록 그룹"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "색(_O):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "색을 고르십시오"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "새 달력 더하기"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "그룹"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "새로 고침"
+# Trigger -> 시작 옵션, Microsoft Office XP 참고
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "동작/시작 옵션"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "형태:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "더하기(_D)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+# Alarm -> 알림, Microsoft Office XP 참고
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "주"
+msgid "Alarms"
+msgstr "%s에 알림"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4272,7 +4666,7 @@ msgid "Free/Busy Publishing"
 msgstr "약속 있음/없음 게시(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "금요일"
@@ -4286,7 +4680,7 @@ msgid "Minutes"
 msgstr "분"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "월요일"
@@ -4296,7 +4690,7 @@ msgid "S_un"
 msgstr "일(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "토요일"
@@ -4312,7 +4706,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "일요일"
@@ -4326,7 +4720,7 @@ msgid "T_hu"
 msgstr "목(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "목요일"
@@ -4340,7 +4734,7 @@ msgid "Time format:"
 msgstr "시간 형식:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "화요일"
@@ -4350,7 +4744,7 @@ msgid "W_eek starts:"
 msgstr "시작 요일(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "수요일"
@@ -4383,7 +4777,8 @@ msgstr "한달씩 볼 때 토요일/일요일은 한 칸에 표시(_C)"
 msgid "_Day begins:"
 msgstr "하루의 시작(_D):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4435,6 +4830,78 @@ msgstr "수(_W)"
 msgid "before every appointment"
 msgstr "전에 미리 알려주기"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "달력을 가져올 위치를 지정해야 합니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "원본 위치 '%s'이(가) 잘 구성된 형식이 아닙니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "원본 위치 '%s'이(가) webcal 원본이 아닙니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "이름이 '%s'인 원본이 이미 선택한 그룹에 있습니다"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "'%s' 그룹이 원격 그룹입니다. 달력을 어디서 가져올 지 지정해야 합니다"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "달력 더하기"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "작업 목록 그룹"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "색(_O):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "색을 고르십시오"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "새 달력 더하기"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "그룹"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "새로 고침"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "형태:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "주"
+
 # event -> 행사, Microsoft Office XP 참고
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
@@ -4487,56 +4954,7 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
-msgid "Could not update object"
-msgstr "오브젝트를 업데이트할 수 없습니다"
-
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
-msgid "Edit Appointment"
-msgstr "약속 편집"
-
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
-#, c-format
-msgid "Appointment - %s"
-msgstr "약속 - %s"
-
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
-#, c-format
-msgid "Task - %s"
-msgstr "작업 - %s"
-
-# journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
-#, c-format
-msgid "Journal entry - %s"
-msgstr "일지 항목 - %s"
-
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
-msgid "No summary"
-msgstr "요약 없음"
-
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "다른 이름으로 저장..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
-
-#: calendar/gui/dialogs/comp-editor.c:1576
-msgid "Unable to use current version!"
-msgstr "현재 버전을 사용할 수 없습니다!"
-
-#: calendar/gui/dialogs/comp-editor-page.c:463
+#: calendar/gui/dialogs/comp-editor-page.c:464
 #, c-format
 msgid "Validation error: %s"
 msgstr "유효성 검사 오류: %s"
@@ -4566,6 +4984,49 @@ msgstr " (기한 "
 msgid "Due "
 msgstr "기한 "
 
+#: calendar/gui/dialogs/comp-editor.c:264
+msgid "Could not update object"
+msgstr "오브젝트를 업데이트할 수 없습니다"
+
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
+msgid "Edit Appointment"
+msgstr "약속 편집"
+
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
+#, c-format
+msgid "Appointment - %s"
+msgstr "약속 - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
+#, c-format
+msgid "Task - %s"
+msgstr "작업 - %s"
+
+# journal -> 일지, Microsoft Office XP 참고
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
+#, c-format
+msgid "Journal entry - %s"
+msgstr "일지 항목 - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
+msgid "No summary"
+msgstr "요약 없음"
+
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
+msgstr "업데이트가 도착하면 이 항목에 대해 바뀐 사항을 버립니다."
+
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
+msgstr "현재 버전을 사용할 수 없습니다!"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
@@ -4634,8 +5095,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "오류때문에 이 항목을 지울 수 없습니다"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "주소록..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "연락처"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4645,161 +5107,229 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "약속"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "미리 알림"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "방향"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "모임"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "행사에 시작 날짜가 없습니다"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "끝 날짜가 틀렸습니다"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "시작 시각이 틀렸습니다"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "끝 시각이 틀렸습니다"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "달력 '%s'을(를) 열 수 없습니다."
 
-# event -> 행사, Microsoft Office XP 참고
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "전에 미리 알려주기"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "약속 끝"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "전에 미리 알려주기"
+
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "하루 종일 행사(_L)"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "전에 미리 알려주기"
 
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "약속 있음(_U)"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "전에 미리 알려주기"
 
+# "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
+# Reminder -> 미리 알림, Microsoft Office XP
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "분류(_T)..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "전에 미리 알려주기"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>작업 목록 옵션</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "분류"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>기한:</b> "
 
+# event -> 행사, Microsoft Office XP 참고
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "비밀(_N)"
+msgid "A_ll day event"
+msgstr "하루 종일 행사(_L)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "날짜 및 시각"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "사용자 보기 저장..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "약속 없음(_R)"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "분류(_T)..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "위치(_O):"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "달력:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "개인(_V)"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "분류"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "공용(_B)"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "비밀"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "시간 표시 방법"
+msgid "L_ocation:"
+msgstr "위치(_O):"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "개인"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "공개"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "시간 표시 방법"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "요약(_M):"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "비우기(_C)"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "설명:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "마침 시각(_E):"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "시작 시각(_S):"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "없음"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "선택하신 주최자가 이제 계정이 없습니다."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "주최자가 필요합니다."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "대리인(_D)..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "지우기(_D)"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "지우기(_R)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4838,35 +5368,45 @@ msgid "Member"
 msgstr "구성원"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "초대장"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "상태"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "참석자 더하기(_T)"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>기타</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "보낸 사람을 주소록에 더하기"
+msgid "<b>Organizer</b>"
+msgstr "<b>기타</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "주최자 바꾸기(_C):"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "주최자:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "연락처"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "주최자 바꾸기(_C):"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "주최자:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4935,151 +5475,145 @@ msgstr "이 경우 및 앞으로의 경우"
 msgid "All Instances"
 msgstr "모든 경우"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "이 약속에는 Evolution에서 편집할 수 있는 되풀이가 들어 있습니다."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "되풀이되는 날짜가 잘못되었습니다"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "요일"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "첫번째"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "두번째"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "세번째"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "네번째"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "마지막"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "기타 날짜"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "일"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "on the <month_menu>"
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "달:"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "for ... occurrences"
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "번"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "날짜/시각"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "매"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "예외"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "미리 보기"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "반복 규칙"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "사용자 정의 반복(_C)"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "고치기(_M)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>미리 보기</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "반복 없음(_N)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "반복"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "지우기(_R)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "매"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "간단한 반복(_S)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "약속 편집(_E)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "횟수"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "영원히"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "달"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "마감"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "주"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "년"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "받을 %s을 선택하십시오"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "대상 폴더:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "작업 목록"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">보안</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% 완료(_C)"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">보안</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "완료됨"
 
@@ -5091,8 +5625,8 @@ msgstr "높음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "진행중"
@@ -5104,22 +5638,22 @@ msgid "Low"
 msgstr "낮음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "보통"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "시작 안함"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "진행"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "퍼센트 완료: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5143,36 +5677,42 @@ msgstr "상태(_S):"
 msgid "_Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "작업"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "할당"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'의 작업을 열 수 없습니다."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "비밀(_F)"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">보안</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">보안</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "설명:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "폴더:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "시작 날짜(_R):"
@@ -5181,54 +5721,60 @@ msgstr "시작 날짜(_R):"
 msgid "_Due date:"
 msgstr "마감 날짜(_D):"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "HTTP 서버를 위한 인증 증명서"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "그룹:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "게시하도록 선택한 달력"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>달력 옵션</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "매일"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "게시 주기"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "약속 있음/없음 편집기"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "약속 있음/없음 게시 위치"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "약속 있음/없음 게시 위치"
+msgid "Free/Busy Editor"
+msgstr "약속 있음/없음 편집기"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "로그인 이름:"
+#, fuzzy
+msgid "_Daily"
+msgstr "매일"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "열쇠글:"
+#, fuzzy
+msgid "_Manual"
+msgstr "메일(_M):"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "게시 주기"
+#, fuzzy
+msgid "_Password:"
+msgstr "열쇠글:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "열쇠글 기억"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "사용자이름(_N):"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "사용자 게시"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "매주"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5306,7 +5852,7 @@ msgstr "%s (%s)"
 msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션에 대한 %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "URL %s을(를) 열려면 누르십시오"
@@ -5315,6 +5861,11 @@ msgstr "URL %s을(를) 열려면 누르십시오"
 msgid "Untitled"
 msgstr "제목 없음"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "요약:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5326,7 +5877,7 @@ msgstr "마감 날짜:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "상태:"
 
@@ -5339,20 +5890,94 @@ msgstr "우선 순위:"
 msgid "Web Page:"
 msgstr "웹 페이지(_W):"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "공개"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "날짜"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "개인"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "시작 날짜"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "비밀"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "요약"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "약속 없음"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "약속 있음"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "북"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "남"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "동"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "서"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"지리적인 위치는 다음과 같은 형식으로 입력합니다:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "예"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "아니오"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "반복됨"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "예약됨"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5398,95 +6023,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "약속 없음"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "약속 있음"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 지우는 중입니다"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "붙여 넣기(_P)"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "작업 할당(_A)"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "iCalendar로 전달(_F)"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "작업 완료 표시(_M)"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "선택한 작업을 마친 작업으로 표시(_M)"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "지우기(_D)"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "선택한 작업 지우기(_D)"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "다른 이름으로 저장..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "작업을 더하려면 누르십시오"
 
@@ -5495,180 +6126,110 @@ msgstr "작업을 더하려면 누르십시오"
 msgid "% Complete"
 msgstr "% 완료"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "완료"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "완료 날짜"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "마감 날짜"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "우선순위"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "시작 날짜"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "요약"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "작업 정렬"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "메세지 옮기는 중입니다"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "메시지 복사하는 중입니다"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "새 모임"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "새 작업"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "글타래 선택(_T)"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "약속 있음/없음 정보 게시(_P)"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "폴더로 복사..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "폴더로 옮기기(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "이 경우를 지웁니다(_O)"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "모든 경우를 지웁니다(_A)"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "오늘로 이동(_T)"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "날짜로 이동(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "설정(_S)..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "날짜"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "시작 날짜"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "반복됨"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "예약됨"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "예"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "아니오"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "북"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "남"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "동"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "서"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"지리적인 위치는 다음과 같은 형식으로 입력합니다:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5692,36 +6253,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "오전"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "오후"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i분 단위"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%b %e일 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%m %d"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i분 단위"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "오전"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "오후"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5789,37 +6350,36 @@ msgid ", ending on "
 msgstr ", 끝: "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>시작:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>끝:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "상태"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>완료됨:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>기한:</b> "
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "기한 "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5827,313 +6387,293 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>없음</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "위치:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "거부"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "업데이트"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "확인"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 회의 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>님이 회의에 참석하시기를 요청했습니다."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>님이 기존 회의에 참석하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 회의 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 회의 요청에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>님이 회의를 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "모임 취소"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "잘못된 회의 메세지"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>님이 작업을 수행하길 요청하셨습니다."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "작업 제안"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "작업 취소"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "잘못된 작업 메세지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 게시했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 요청했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 요청에 회신했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "틀린 약속 있음/없음 메세지"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "첨부에 올바른 달력 메세지가 없습니다"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA 시스템에 오류가 있습니다\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "오브젝트를 찾을 수 없습니다\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "달력을 업데이트할 올바른 권한이 없습니다\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "참석자 상태를 업데이트할 수 없습니다!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "지우기를 끝마쳤습니다"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
@@ -6164,6 +6704,10 @@ msgstr "달력 불러들이기"
 msgid "Loading calendar..."
 msgstr "달력 불러오기..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "주최자:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "서버 메세지:"
@@ -6180,11 +6724,6 @@ msgstr "시작-날짜"
 msgid "Chair Persons"
 msgstr "의장"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "필수 참석자"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "선택 참석자"
@@ -6252,6 +6791,28 @@ msgstr "대리"
 msgid "In Process"
 msgstr "진행중"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%Y년 %b %e일 %A"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 "%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:1604
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "부재 중"
@@ -6260,100 +6821,66 @@ msgstr "부재 중"
 msgid "No Information"
 msgstr "정보 없음"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "보낸 사람을 주소록에 더하기"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "옵션(_O)"
+msgid "O_ptions"
+msgstr "옵션"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "근무 시간만 보기(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "축소해서 보기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
 # Autopick -> 빈 시간 찾기, Microsoft Office XP 참고
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "빈 시간 찾기(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "모임 시작 시각(_S):"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "모임 종료 시각(_E):"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%Y년 %b %e일 %A"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 "%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:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6362,116 +6889,51 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "작업을 읽어들이는 중입니다"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"%s 여는 데 오류가 밝생했습니다:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "작업을 읽어들이는 중입니다"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "작업"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "오브젝트를 업데이트하는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "비우는 중"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "달력 및 작업"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "여기서 시간대, 달력 및 작업 목록을 설정합니다"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 달력 및 작업"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 달력 설정 컨트롤"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 달력 계획 메세지 보기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 달력/작업 편집"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution 달력 컴포넌트"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution 작업 컴포넌트"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "달력"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "작업(_T)"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4월"
@@ -6822,10 +7284,6 @@ msgstr "선택된 달 (%Y년 %b)"
 msgid "Selected year (%Y)"
 msgstr "선택한 년도 (%Y년)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "작업"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6856,7 +7314,7 @@ msgid "Contacts: "
 msgstr "연락처:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "인쇄 미리 보기"
 
@@ -6883,7 +7341,7 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6904,35 +7362,29 @@ msgstr "행사와 회의를 만드는 데 쓸 작업 목록 '%s'을(를) 열 수
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "새 작업"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "뉴스그룹"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "작업 목록 그룹"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "새 작업을 만듭니다"
@@ -8614,69 +9066,69 @@ msgstr "오프라인 모드를 위한 '%s' 폴더를 준비하는 중입니다"
 msgid "You must be working online to complete this operation"
 msgstr "이 작업을 마치려면 온라인으로 실행해야 합니다"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "%s에서 잘못된 메세지 스트림을 받았습니다: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "폴더 동기중"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "거르게 분석 중 오류: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "거르게 실행 중 오류: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "스풀 폴더를 열 수 없습니다"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "스풀 폴더를 진행할 수 없습니다"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "메세지 %d개(%d%%)를 가져오는 중"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "메세지를 열 수 없음"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "메세지 %d개에서 실패"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "폴더 동기화"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%2$d개 중에서 메시지 %1$d 가져오는 중"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%2$d개 중에서 메시지 %1$d에서 실패"
@@ -8698,42 +9150,6 @@ msgstr "(user-flag)에 잘못된 인자"
 msgid "Error executing filter search: %s: %s"
 msgstr "거르게 찾기 실행 중 오류: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "지원하지 않는 동작: 메세지 추가: %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "지원되지 않는 동작: 표현식으로 찾기: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "지원되지 않는 동작: uid로 찾기: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "메세지 옮기는 중입니다"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "메시지 복사하는 중입니다"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "경고"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "새 메세지 거르는 중입니다"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8779,7 +9195,43 @@ msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
 msgid "Performing query on unknown header: %s"
 msgstr "알 수 없는 헤더에 대해 질의를 수행하는 중입니다: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "지원하지 않는 동작: 메세지 추가: %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "지원되지 않는 동작: 표현식으로 찾기: %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "지원되지 않는 동작: uid로 찾기: %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "메세지 옮기는 중입니다"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "메시지 복사하는 중입니다"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "경고"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "새 메세지 거르는 중입니다"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8790,15 +9242,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid 힌트를 파싱하는 데 실패했습니다."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg 암호 요청을 파싱하는 데 실패했습니다."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8807,28 +9259,28 @@ msgstr ""
 "다음 사용자에 대한 키를 열려면 열쇠글이 필요합니다:\n"
 "\"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "취소됨."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "비밀 키를 여는 데 실패했습니다: 열쇠글이 3번 틀렸습니다."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG로부터 예상치못한 답변: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "암호화하는 데 실패했습니다: 받는 사람이 올바르게 지정되지 않았습니다."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8839,61 +9291,81 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s에 실패했습니다: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "서명 데이터를 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg 실행에 실패했습니다: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg 실행에 실패했습니다."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "디지탈 서명된 메세지 부분입니다"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "메세지 서명을 확인할 수 없습니다; 메세지 형식이 틀렸습니다"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "메세지 서명을 확인할 수 없습니다; 임시 파일을 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "암호화 데이터를 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "디지탈 암호화된 메세지 부분입니다"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "암호화된 내용"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "메세지 내용을 파싱할 수 없습니다"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "잠금 도우미 프로그램의 파이프를 만들 수 없습니다: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "잠금 도우미 프로그램을 실행할 수 없습니다: %s"
+
+#: 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을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s'을(를) 잠글 수 없습니다"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8915,26 +9387,6 @@ msgstr "fcntl(2)로 파일 잠금을 얻어오는 데 실패했습니다: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)으로 파일 잠금을 얻어오는 데 실패했습니다: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "잠금 도우미 프로그램의 파이프를 만들 수 없습니다: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "잠금 도우미 프로그램을 실행할 수 없습니다: %s"
-
-#: 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을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s'을(를) 잠글 수 없습니다"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9187,7 +9639,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "서버에서 보낸 인증 응답이 틀렸습니다."
 
@@ -9269,55 +9721,55 @@ msgstr "POP이 아닌 원본을 사용해 SMTP 인증 전에 POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "정규식 컴파일이 실패했습니다: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s'에 사용자이름 부분이 필요합니다"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s'에 호스트 부분이 필요합니다"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s'에 경로 부분이 필요합니다"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "호스트 찾는 중입니다: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "호스트 이름을 찾는 데 실패했습니다: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "호스트 이름 찾기가 실패했습니다: 쓰레드를 만들 수 없습니다: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "호스트 이름 찾기가 실패했습니다: %s: 호스트를 찾을 수 없습니다"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "호스트 이름 찾기가 실패했습니다: %s: 알 수 없는 원인"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "주소 찾는 중"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "호스트 이름 찾기가 실패했습니다: 호스트 이름을 찾을 수 없습니다"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "호스트 이름 찾기가 실패했습니다: 알 수 없는 원인"
 
@@ -9393,7 +9845,7 @@ msgstr "암호화 인증서(_P):"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "%s의 폴더 잠금을 만들 수 없습니다: %s"
@@ -9483,7 +9935,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "올바른 서명"
 
 #: camel/camel-smime-context.c:651
@@ -9498,48 +9950,47 @@ msgstr "DATA 명령이 실패했습니다"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "`%s' 폴더를 만들 수 없습니다: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "메시지로부터 거르게 만들기(_T)"
+msgid "Cannot create CMS Message"
+msgstr "메세지를 열 수 없음"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "메세지를 열 수 없음"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "%s 파일을 첨부할 수 없습니다: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "%s 파일을 첨부할 수 없습니다: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "메세지를 열 수 없음"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "%s의 폴더 잠금을 만들 수 없습니다: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9586,7 +10037,8 @@ msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
@@ -9595,8 +10047,8 @@ msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
 msgid "Trash"
 msgstr "휴지통"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "정크메일"
 
@@ -9716,7 +10168,7 @@ msgstr "키 용도에서 인증서 서명을 지원하지 않습니다"
 msgid "Error in application verification"
 msgstr "애플리케이션 확인에 오류가 발생했습니다"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9729,11 +10181,11 @@ msgstr ""
 "핑거프린트:        %s\n"
 "서명:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "맞음"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "틀림"
 
@@ -9757,7 +10209,7 @@ msgstr ""
 "그래도 받아들이시겠습니까?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9772,7 +10224,7 @@ msgstr ""
 "\n"
 "받아들이시겠습니까?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9781,7 +10233,7 @@ msgstr ""
 "인증서 문제: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9790,7 +10242,7 @@ msgstr ""
 "잘못된 인증서 도메인: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9799,7 +10251,7 @@ msgstr ""
 "인증서 만료: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9808,7 +10260,7 @@ msgstr ""
 "인증서 취소 목록이 만료되었습니다: %s\n"
 "발급자: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "`%s' URL을 파싱할 수 없습니다"
@@ -9832,7 +10284,7 @@ msgstr "메세지를 가상 폴더에 복사할/옮길 수 없습니다"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "폴더 이름을 바꿀 수 없습니다: %s: 그런 폴더가 없습니다"
@@ -9851,8 +10303,8 @@ msgid "Checking for new mail"
 msgstr "새 메일 확인중"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "모든 폴더에서 새 메세지 확인"
 
@@ -9883,8 +10335,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise 서버에 접근하는 용도"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9902,322 +10354,28 @@ msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버
 msgid "Checklist"
 msgstr "확인목록"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP server로부터 예상치못한 답변: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "`%s' 폴더를 만들 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "MH 폴더에 메세지를 추가할 수 없습니다: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "MH 폴더에 메세지를 추가할 수 없습니다: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "폴더"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "구독하는 폴더만 보이기"
-
-# namespace -> 이름 공간, Microsoft Office XP 참고
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "서버에서 알려 주는 폴더의 이름 공간을 무시합니다"
-
-# namespace -> 이름 공간, Microsoft Office XP 참고
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "이름 공간"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAP서버에 메일을 읽고 저장."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 서버 %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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에 연결할 수 없습니다 (포트 %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL을 사용할 수 없습니다"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "연결이 취소됨"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "알 수 없는 오류가 발생했습니다"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"POP 서버 %s에 연결할 수 없습니다: 요청한 인증 방법을 지원하지 않습니다."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s사용자이름 %s, 호스트 %s의 SMTP 열쇠글을 입력하십시오"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%c\" 문자가 들어 있어 있습니다"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "`%s' 폴더를 만들 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "명령:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "`%s' 폴더를 만들 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "`%s' 폴더를 만들 수 없습니다: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP server로부터 예상치못한 답변: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "작업이 취소되었습니다"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "알 수 없는 오류가 발생했습니다"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10286,7 +10444,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10358,6 +10516,29 @@ msgstr "서버에 연결하는 데 사용자 설정 명령을 사용합니다"
 msgid "Command:"
 msgstr "명령:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "폴더"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "구독하는 폴더만 보이기"
+
+# namespace -> 이름 공간, Microsoft Office XP 참고
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "서버에서 알려 주는 폴더의 이름 공간을 무시합니다"
+
+# namespace -> 이름 공간, Microsoft Office XP 참고
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "이름 공간"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "이 서버의 받은 편지함에 있는 새 메세지에 거르게를 적용합니다"
@@ -10378,43 +10559,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP서버에 메일을 읽고 저장."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 서버 %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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에 연결할 수 없습니다 (포트 %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL을 사용할 수 없습니다"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "연결이 취소됨"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 확장 기능을 지원하지 않습니다."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL 협상이 실패했습니다"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" 명령으로 연결할 수 없습니다: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 서버 %s은(는) 요청한 인증형식 %s을(를) 지원하지 않습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s 인증 형식을 지원하지 않습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s에 대한 IMAP 열쇠글을 입력하십시오"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "열쇠글을 입력하지 않았습니다."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10425,30 +10655,279 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "%s(이)라는 폴더가 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%c\" 문자가 들어 있어 있습니다"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "상위 폴더를 알 수 없습니다: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP server로부터 예상치못한 답변: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "IMAP server로부터 예상치못한 답변: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "MH 폴더에 메세지를 추가할 수 없습니다: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "MH 폴더에 메세지를 추가할 수 없습니다: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAP서버에 메일을 읽고 저장."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"POP 서버 %s에 연결할 수 없습니다: 요청한 인증 방법을 지원하지 않습니다."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s사용자이름 %s, 호스트 %s의 SMTP 열쇠글을 입력하십시오"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "명령:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP server로부터 예상치못한 답변: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10617,18 +11096,26 @@ msgstr "요약을 저장할 수 없습니다: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "메세지를 요약에 더할 수 없습니다: 알 수 없는 이유"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "받은 편지함"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "메일폴더에 메세지 덧붙이기가 취소되었습니다"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "메일폴더에 메세지를 덧붙일 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10644,48 +11131,48 @@ msgstr ""
 "메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "잘못된 메세지 내용"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' 폴더를 얻을 수 없습니다: 폴더가 없습니다."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "`%s' 폴더를 만들 수 없습니다: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' 폴더를 얻을 수 없습니다: 메일 디렉토리가 아닙니다."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "메일폴더 디렉토리가 아닙니다"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11273,20 +11760,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "POP 서버 %s(포트 %d)에 연결할 수 없습니다: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "POP 서버 %s에 보안 모드로 연결하는 데 실패했습니다: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "POP 서버 %s에 연결할 수 없습니다"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11294,28 +11786,28 @@ msgid ""
 msgstr ""
 "POP 서버 %s에 연결할 수 없습니다: 요청한 인증 방법을 지원하지 않습니다."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "POP 서버 %2$s에 SASL `%1$s' 로그인이 실패했습니다: %3$s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "POP 서버 %s에 로그인할 수 없습니다: SASL 프로토콜 오류"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s사용자이름 %s, 호스트 %s에 대한 POP 열쇠글을 입력하십시오"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11324,7 +11816,16 @@ msgstr ""
 "POP 서버 %s에 연결하는 데 실패했습니다.\n"
 "열쇠글을 보내는 데 오류가 발생했습니다: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"POP 서버 %s에 연결하는 데 실패했습니다.\n"
+"열쇠글을 보내는 데 오류가 발생했습니다: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s'(이)라는 폴더가 없습니다."
@@ -11535,93 +12036,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 서버 %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s 서버를 통한 SMTP 메일"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "메세지를 보낼 수 없습니다: 서비스에 연결되지 않았습니다."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "메세지를 보낼 수 없습니다; 보내는 사람 주소가 올바르지 않습니다."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "메세지를 보냄"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "메세지를 보낼 수 없습니다: 받는 사람이 정의되지 않았습니다."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "메세지를 보낼 수 없습니다: 받는 사람 중에 한 명 이상이 잘못되었습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP 인사"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO 명령이 실패했습니다: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "HELO 명령이 실패했습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP 인증"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "SASL 인증 오브젝트를 만드는 데 오류가 발생했습니다."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH 명령이 실패했습니다: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "AUTH 명령이 실패했습니다: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "서버에서 인증 응답이 잘못되었습니다.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM 요청이 실패했습니다: %s: 메일을 보내지 않았습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM 명령이 실패했습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO 명령이 실패했습니다: %s: 메일을 보내지 않았습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 실패했습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA 명령이 실패했습니다: %s: 메일을 보내지 않았습니다"
@@ -11629,26 +12130,26 @@ msgstr "DATA 명령이 실패했습니다: %s: 메일을 보내지 않았습니�
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "DATA 명령이 실패했습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET 명령이 실패했습니다: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "RSET 명령이 실패했습니다"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT 명령이 실패했습니다: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "QUIT 명령이 실패했습니다"
 
@@ -11711,103 +12212,6 @@ msgstr "MIME 형식:"
 msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시를 권합니다"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"나가는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
-"았습니다"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
-"습니다"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "파일을 열 수 없습니다"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "제목 없는 메세지"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "파일 열기"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "자동으로 만들기"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "서명:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b>개의 파일이 첨부되었습니다"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "메일 메세지를 작성합니다"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"메일 작성 창을 만들 수 없습니다:\n"
-"주소 선택 컨트롤을 활성화할 수 없습니다."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"편집 작성 창을 만들 수 없습니다:\n"
-"HTML 편집기 컴포넌트를 활성화할 수 없습니다.\n"
-"올바른 버전의 gtkhtml과 libgtkhtml이\n"
-"설치되었는 지 확인하십시오.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"메일 작성 창을 만들 수 없습니다:\n"
-"HTML 편집기 컴포넌트를 활성화할 수 없습니다."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(메일 작성기에 텍스트가 아닌 메세지 본문이 들어 있습니다. 이 메세지 본문"
-"은 편집할 수 없습니다.)<b>"
-
 # post -> 게시, Microsoft Office XP 참고
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -11890,17 +12294,93 @@ msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"나가는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
+"았습니다"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
+"습니다"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "파일을 열 수 없습니다"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "편집기에서 메세지를 가져올 수 없습니다"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "제목 없는 메세지"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "파일 열기"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "자동으로 만들기"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "서명:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b>개의 파일이 첨부되었습니다"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "메일 메세지를 작성합니다"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "전달된 메시지 - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "원래 메세지 첨부"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(메일 작성기에 텍스트가 아닌 메세지 본문이 들어 있습니다. 이 메세지 본문"
+"은 편집할 수 없습니다.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "메세지에 파일을 첨부합니다"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11918,53 +12398,67 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "파이프를 만들 수 없습니다: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "읽지 않은 메세지"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "바뀐 부분을 저장하시겠습니까?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "지우지 않기"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "지우기"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "서명 파일을 저장할 수 없습니다: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "경고: 바뀐 메세지"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11972,57 +12466,74 @@ msgid ""
 msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "바뀐 내용 버리기(_D)"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "메세지 저장..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "파이프를 만들 수 없습니다: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "서명 파일을 저장할 수 없습니다: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "메일을 작성하기 전에 계정을 설정해야 합니다."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "파이프를 만들 수 없습니다: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"메일 작성 창을 만들 수 없습니다:\n"
+"주소 선택 컨트롤을 활성화할 수 없습니다."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"편집 작성 창을 만들 수 없습니다:\n"
+"HTML 편집기 컴포넌트를 활성화할 수 없습니다.\n"
+"올바른 버전의 gtkhtml과 libgtkhtml이\n"
+"설치되었는 지 확인하십시오.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution 그룹웨어 모음"
@@ -12322,10 +12833,6 @@ msgstr "%Y-%m-%d"
 msgid "Select a time to compare against"
 msgstr "비교할 시각을 선택하십시오"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "거르게 규칙(_F)"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12354,19 +12861,8 @@ msgstr "파일 이름을 지정해야 합니다."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "파일 `%s'이(가) 없거나 일반 파일이 아닙니다."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "%s 폴더를 옮기는 중"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "폴더를 지정해야 합니다."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12374,157 +12870,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "할당"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "이 거르게에 이름을 주어야 합니다."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "이 가상폴더의 이름을 지정해야 합니다."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "서버를 선택하지 않았습니다"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "파일을 선택하십시오"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>기한:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "폴더 선택"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>거르게 규칙(_F)</b>"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>가상 폴더 원본</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "비교할 시각:"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "들어오는 것"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"메세지 시각을 지정한 날짜의 오전 12:00를\n"
-"기준으로 비교합니다."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"메세지 시각을 거르는 시각까지 얼마나 지났나를\n"
-"기준으로 비교합니다."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"메세지 시각을 거르는 현재 시각을\n"
-"기준으로 비교합니다."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "현재 시각까지의 상대적인 시간"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "전에"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "달"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "초"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "지정된 폴더만"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "현재 시각"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "지정하는 시각"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "모든 활성화된 원격 폴더에"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "모든 로컬 폴더와 활성화된 원격 폴더에"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "모든 로컬 폴더에"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "연도"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "중요"
 
@@ -12593,6 +12969,70 @@ msgstr "받는 메일"
 msgid "outgoing"
 msgstr "보내는 메일"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>거르게 규칙(_F)</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "비교할 시각:"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "들어오는 것"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"메세지 시각을 지정한 날짜의 오전 12:00를\n"
+"기준으로 비교합니다."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"메세지 시각을 거르는 시각까지 얼마나 지났나를\n"
+"기준으로 비교합니다."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"메세지 시각을 거르는 현재 시각을\n"
+"기준으로 비교합니다."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "현재 시각까지의 상대적인 시간"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "전에"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "달"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "초"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "현재 시각"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "지정하는 시각"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "연도"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "규칙 더하기"
@@ -12605,62 +13045,70 @@ msgstr "규칙 편집"
 msgid "Rule name"
 msgstr "규칙 이름"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "점수 규칙(_S)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "점수"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "메일 작성기 기본 설정"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "본문에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "여기서 보안과 메세지 표시를 포함한, 메일 설정을 합니다"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "본문에 포함하지 않음"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을 합니다"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "본문이나 제목에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "여기서 전자메일 게정을 설정합니다"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "메세지에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution 메일"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "받는 사람에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 메일 계정 설정 컨트롤"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "보낸 사람에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution 메일 컴포넌트"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "제목에 포함"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution 메일 작성기"
 
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "제목에 포함하지 않음"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 메일 작성기 설정 컨트롤"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "가상 폴더(_F)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 메일 기본 설정 컨트롤"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "더하기(_A)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "메일"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "메일 기본 설정"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "메일(_M):"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12693,45 +13141,327 @@ msgstr "서명 더하기(_A)"
 msgid "Signature(s)"
 msgstr "서명"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 전달된 메시지 --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "거르게 규칙(_F)"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "폴더 선택"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "점수 조정"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "색 지정"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "점수 지정"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "첨부"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "삑 소리"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "포함"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "폴더로 복사"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "받은 날짜"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "보낸 날짜"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "지워짐"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "포함하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "끝나지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "없음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "리턴하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "비슷한 소리 아님"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "시작하지 않음"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "존재하지 않음"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "임시 보관함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "끝남"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "존재함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "존재함"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "표현"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "추가 작업"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "같음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "뒤 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "앞 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "플래그 지정"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "보다 큼"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "보다 적음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "다름"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "플래그 지정 아님"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "정크메일 테스트"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "꼬리표"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "메일링 리스트"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "메세지 본문"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "메세지 머리말"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "메세지가 정크메일"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "메세지가 정크메일 아님"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "폴더로 이동"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "프로그램을 끝냅니다"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "소리 연주"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "읽음"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "받는 사람"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "정규식"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "회신"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "더 큰 값 리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "더 작은 값 리턴"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "프로그램 실행"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "점수"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "보낸 사람"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "상태 설정"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "크기 (kB)"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "비슷한 소리"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "메일 온 계정"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "특정 헤더"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "시작함"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "처리 중지"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "제목"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "상태 설정 없애기"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>기한:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "찾은 것에서 가상 폴더 만들기(_V)..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "폴더 등록 정보"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "등록 정보"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "폴더 이름"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "전체 메세지"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "전체 메세지"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "읽지 않은 메세지"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "읽지 않은 메세지"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12741,458 +13471,298 @@ msgstr "<폴더를 고를려면 여기를 누르십시오>"
 msgid "Create New Folder"
 msgstr "새 폴더 만들기"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "폴더를 만듭니다"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "가상 폴더"
+
+# VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "해당 없음"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "읽어들이는 중..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "이동(_N)"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "작업 취소"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "복사"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' 폴더를 만드는 중입니다"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "폴더를 만듭니다"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "보기(_V)"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "복사(_C)"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "이동(_N)"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "이름 바꾸기(_R)"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "등록 정보(_P)..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "가상 폴더"
-
-# VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "해당 없음"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "받은 편지함"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "읽어들이는 중..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "메일"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "등록 정보"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 고침(_E)..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "리스트에 회신(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "전달(_F)"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "추가 작업(_W)..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "표시 비우기(_E)"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "읽은 것으로 표시(_K)"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "중요하지 않은 것으로 표시(_M)"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "정크메일로 표시(_J)"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "정크메일이 아닌 것으로 표시(_N)"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "되살리기(_N)"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "폴더로 옮기기(_V)..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "꼬리표"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "보낸 사람을 주소록에 더하기"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "거르게 적용(_Y)"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "정크메일 거르게(_I)"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 거르게 만들기(_T)"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "제목에따른 가상폴더(_S)"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "보낸 사람에 따른 가상폴더(_N)"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "받은 사람에 따른 가상폴더(_R)"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "메일링 리스트에 대한 가상폴더(_L)"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "제목에 대한 거르게(_J)"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "보낸 사람에 대한 거르게(_D)"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "받은이에 대한 거르게(_C)"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "메일링 리스트에 대한 거르게(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "기본값"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "메세지 인쇄"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s(으)로 보내려면 누르십시오"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "보낸 사람"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "회신 주소"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "받는이"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "참조"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "숨은 참조"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "제목"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "날짜"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "뉴스그룹"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s 첨부"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "지원하지 않는 서명 형식입니다"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "서명을 확인하는 중 오류가 발생했습니다"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' 가져오는 중"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "서명 없음"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "올바른 서명"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "잘못된 서명"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "암호화 안 됨"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "암호화됨, 약함"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "암호화됨"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "암호화됨, 강력"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "외부 본문 부분의 형식이 잘못되었습니다."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP 사이트(%s)를 가리킵니다"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "로컬 파일(%s)을 가리킵니다"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "원격 데이터(%s)을 가리킵니다"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "메세지를 포맷하는 중입니다"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "메일 프로그램"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "일치: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "서명 없음"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13200,7 +13770,11 @@ msgstr ""
 "이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "올바른 서명"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13208,7 +13782,11 @@ msgstr ""
 "이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "잘못된 서명"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13216,11 +13794,11 @@ msgstr ""
 "이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13228,7 +13806,11 @@ msgstr ""
 "이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "암호화 안 됨"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13237,7 +13819,11 @@ msgstr ""
 "메세지를 암호화하지 않았습니다.  이 메세지가 인터넷을 통해 전달되는 동안, 다"
 "른 사람이 메세지 내용을 볼 수도 있습니다."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "암호화됨, 약함"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13247,7 +13833,11 @@ msgstr ""
 "사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "암호화됨"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13255,7 +13845,11 @@ msgstr ""
 "메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "암호화됨, 강력"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13264,40 +13858,163 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %b %e일, %p %l:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %e일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "인라인으로 보기"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$d페이지"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' 가져오는 중"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "외부 본문 부분의 형식이 잘못되었습니다."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP 사이트(%s)를 가리킵니다"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "로컬 파일(%s)을 가리킵니다"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "원격 데이터(%s)을 가리킵니다"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "메세지를 포맷하는 중입니다"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "보낸 사람"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "회신 주소"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "받는이"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "참조"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "숨은 참조"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "메일 프로그램"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "날짜"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "뉴스그룹"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 첨부"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "지원하지 않는 서명 형식입니다"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "서명을 확인하는 중 오류가 발생했습니다"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (내부에 포함)"
@@ -13408,7 +14125,7 @@ msgstr "메세지 보내기(_N)..."
 msgid "_Add to Addressbook"
 msgstr "주소록에 더하기(_A)"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
@@ -13422,7 +14139,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "구독"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "폴더"
 
@@ -13456,11 +14173,23 @@ msgid "Add address"
 msgstr "주소 더하기"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "가상 폴더(_F)"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "더하기(_A)"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "가상 폴더 원본"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "바로가기 자동 인식"
@@ -13938,63 +14667,33 @@ msgstr "spamd를 시작할 포트"
 msgid "spamd port"
 msgstr "spamd 포트"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "메일 작성기 기본 설정"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "여기서 보안과 메세지 표시를 포함한, 메일 설정을 합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을 합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "여기서 전자메일 게정을 설정합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution 메일"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 메일 계정 설정 컨트롤"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution 메일 컴포넌트"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution ELM 가져오기"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution 메일 작성기"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 넷스케이프 메일 가져오기"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 메일 작성기 설정 컨트롤"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 가져오기"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 메일 기본 설정 컨트롤"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 가져오기"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "메일 계정"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 가져오기"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "메일 기본 설정"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "메일(_M):"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14052,34 +14751,6 @@ msgstr "%s 가져오는 중입니다"
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution ELM 가져오기"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution 넷스케이프 메일 가져오기"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 가져오기"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 가져오기"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 가져오기"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14243,77 +14914,76 @@ msgstr "%s 메일링 리스트"
 msgid "Add Filter Rule"
 msgstr "거르게 규칙을 더하기"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "지워짐"
+msgid_plural "%d deleted"
+msgstr[0] "지워짐"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d일"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d일"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d초"
+msgid_plural "%d sent"
+msgstr[0] "%d초"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d초"
+msgid_plural "%d unsent"
+msgstr[0] "%d초"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "연락처 %d개"
+msgid_plural "%d total"
+msgstr[0] "연락처 %d개"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "전체 %d개, %d개 안 읽음"
+msgid_plural ", %d unread"
+msgstr[0] "전체 %d개, %d개 안 읽음"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "서비스 확인중"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "서버에 연결중..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "신원"
@@ -14373,15 +15043,23 @@ msgstr ""
 "니다. 이 계정의 이름을 아래의 빈 칸에 입력하십시오. 이 이름은 표시할 목적으로"
 "만 사용됩니다."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "서비스 확인중"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "서버에 연결중..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_C) "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>미리 보기</b>"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14657,7 +15335,7 @@ msgstr "원래 메세지를 인용하지 않음"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "회의 요청에 대해 서명하지 않습니다 (Outlook 호환)(_M)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "완료"
 
@@ -15017,6 +15695,119 @@ msgstr "색상"
 msgid "description"
 msgstr "설명"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>가상 폴더 원본</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "수락"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "마침(_O)"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "대소문자 가리기"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "메세지에서 찾음"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "찾기:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "추가 작업 메세지 플래그"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "폴더 구독"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "키 계약"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "선택하지 않았습니다"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "서버(_E):"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "보안 정보"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"다음은 추가 작업 플래그를 표시하려고 선택한 메세지입니다.\n"
+"\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "계정 목록"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "마감(_D):"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "표시(_F):"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "구독(_S)"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "구독 중지(_U)"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "지정된 폴더만"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "모든 활성화된 원격 폴더에"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "모든 로컬 폴더와 활성화된 원격 폴더에"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "모든 로컬 폴더에"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15224,14 +16015,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15331,8 +16114,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "폴더를 만들 수 없습니다: %s: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15347,8 +16131,9 @@ msgstr ""
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "로컬 %s 폴더를 지울 수 없습니다."
 
 #. mail:no-move-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
@@ -15364,8 +16149,9 @@ msgstr "메세지를 열 수 없음"
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "폴더를 만들 수 없습니다: %s: %s"
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
@@ -15381,8 +16167,9 @@ msgstr "소스를 열 수 없습니다"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "그리고 기타 연락처 %d개."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15411,8 +16198,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "지우지 않음"
+msgstr "되살리기(_U)"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15476,8 +16264,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "로컬 %s 폴더를 지울 수 없습니다."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15519,13 +16308,44 @@ msgstr ""
 "    '%s'\n"
 "가 새로 고쳐졌습니다."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "%s 폴더를 옮기는 중"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "폴더를 지정해야 합니다."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "이 가상폴더의 이름을 지정해야 합니다."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "서버를 선택하지 않았습니다"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15533,16 +16353,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "덮어 쓰기"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "보내기"
@@ -15702,7 +16522,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15711,45 +16531,21 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이터를 쓸 수가 없습니다: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "대소문자 가리기"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "메세지에서 찾음"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "찾기:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "보안 정보"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "취소 중..."
@@ -15785,24 +16581,24 @@ msgstr "업데이트 중..."
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "열쇠글 입력"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "이 열쇠글 기억(_R)"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "이 세션에서 이 열쇠글을 기억합니다(_R)"
 
@@ -15857,15 +16653,15 @@ msgstr "가상폴더의 uri 새로 고침: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "가상폴더의 uri 새로 고침: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "가상폴더 편집"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "새 가상폴더"
 
@@ -15930,7 +16726,7 @@ msgstr "%b %e일 %p %l:%M"
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e일"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
@@ -15986,10 +16782,6 @@ msgstr "전달"
 msgid "No Response Necessary"
 msgstr "회신이 필요 없음"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "읽음"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "회신"
@@ -16002,50 +16794,53 @@ msgstr "전체 회신"
 msgid "Review"
 msgstr "다시 보기"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "추가 작업 메세지 플래그"
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "본문에 포함"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "마침(_O)"
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "본문에 포함하지 않음"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"다음은 추가 작업 플래그를 표시하려고 선택한 메세지입니다.\n"
-"\"플래그\" 메뉴에서 추가 작업 동작을 선택하십시오."
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "본문이나 제목에 포함"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "마감(_D):"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "메세지에 포함"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "표시(_F):"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "받는 사람에 포함"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "폴더 구독"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "보낸 사람에 포함"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "선택하지 않았습니다"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "제목에 포함"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "서버(_E):"
+# FIXME - hard to translate UI + string based on English grammar
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "제목에 포함하지 않음"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "구독(_S)"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 쉘"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "구독 중지(_U)"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 테스트"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 테스트 컴포넌트"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16108,31 +16903,18 @@ msgstr "개발 버전 경고를 건너 뛸지 여부"
 msgid "mail"
 msgstr "메일"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%b %e일"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "알 수 없는 오류가 발생했습니다"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "인자가 잘못되었습니다"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "OAF에 등록할 수 없습니다"
+msgid "<b>Active Connections</b>"
+msgstr "사용중인 연결"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "설정 데이터베이스를 찾을 수 없습니다"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "사용중인 연결"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "일반 오류"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16316,30 +17098,6 @@ msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution은 온라인 상태입니다.  오프라인 상태로 작업하려면 이 단추를 "
-"누르십시오."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution은 오프라인 상태입니다.  온라인 상태로 작업하려면 이 단추를 "
-"누르십시오."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "%s에 보내는 메일"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "이 시스템에 그놈 파일럿 툴이 설치되지 않았습니다."
@@ -16357,111 +17115,95 @@ msgstr "Bug buddy가 설치되지 않았습니다."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy를 실행할 수 없습니다."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "확인란"
-
-# FIXME: charset  picker에서 Western European, New 식으로 쓰인다
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "새로 만들기"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "새 테스트"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "테스트(_T)"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "새 테스트 항목을 만듭니다"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution은 온라인 상태입니다.  오프라인 상태로 작업하려면 이 단추를 "
+"누르십시오."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "사용중인 연결"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "사용중인 연결"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution은 오프라인 상태입니다.  온라인 상태로 작업하려면 이 단추를 "
+"누르십시오."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s에 보내는 메일"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "달력(_A):"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%b %e일"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "연락처:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "메일(_M):"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "작업(_T):"
+msgid "Uknown system error."
+msgstr "알 수 없는 오류가 발생했습니다"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "폴더 종류(_T):"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "인자가 잘못되었습니다"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "다른 사용자의 폴더 열기"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF에 등록할 수 없습니다"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "계정(_A):"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "설정 데이터베이스를 찾을 수 없습니다"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "폴더 이름(_F):"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "일반 오류"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "사용자(_U):"
+# FIXME: charset  picker에서 Western European, New 식으로 쓰인다
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "새로 만들기"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 설정 도우미"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "파일 가져오기"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "시간대 "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "환영합니다"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16475,7 +17217,7 @@ msgstr ""
 "\n"
 "계속하시려면 \"다음\" 단추를 누르십시오. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16486,17 +17228,17 @@ msgstr ""
 "\n"
 "이 설정을 저장하려면 \"적용\" 단추를 누르십시오."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 쉘"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "새 테스트"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 테스트"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "테스트(_T)"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 테스트 컴포넌트"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "새 테스트 항목을 만듭니다"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16557,7 +17299,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "다음 파일들을 Evolution으로 가져올 수 있습니다:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16591,7 +17333,7 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
 "주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16600,39 +17342,39 @@ msgstr ""
 "고맙습니다\n"
 "Ximian Evolution 팀\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "다시 물어보지 않습니다"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "강제로 모든 Evolution 컴포넌트를 끝냅니다"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 Evolution 1.4에서 다시 옮겨 옵니다"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16707,6 +17449,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16954,6 +17718,11 @@ msgstr "내 인증서"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "인증서가 이미 있습니다"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
@@ -17155,11 +17924,6 @@ msgstr "소유자 고유 ID"
 msgid "Certificate Signature Value"
 msgstr "인증서 서명 값"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "인증서가 이미 있습니다"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 파일 열쇠글"
@@ -17300,8 +18064,8 @@ msgstr "현재 연락처를 봅니다"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "실행(_A)"
@@ -17782,16 +18546,6 @@ msgstr "선택 반전(_I)"
 msgid "_Threaded Message List"
 msgstr "연관된 메세지 목록(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "이 창을 닫습니다"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "닫기(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "보낸 사람을 주소록에 더하기(_D)"
@@ -18196,6 +18950,16 @@ msgstr "도구(_T)"
 msgid "_Undelete"
 msgstr "되살리기(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "이 창을 닫습니다"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "닫기(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "첨부"
@@ -18278,10 +19042,6 @@ msgstr "현재 파일을 다른 이름으로 저장합니다"
 msgid "Save the message in a specified folder"
 msgstr "메세지를 지정한 폴더로 저장합니다"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "보내기"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18852,7 +19612,7 @@ msgid "Evolution Query"
 msgstr "Evolution 테스트"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19010,27 +19770,263 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "HTTP 서버를 위한 인증 증명서"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "게시하도록 선택한 달력"
+
+#~ msgid "Login name:"
+#~ msgstr "로그인 이름:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "사용자 게시"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "연락처 목록 편집기"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "VCard로 목록 저장"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "wombat을 시작할 수 없습니다"
+
+#~ msgid "C_alendar"
+#~ msgstr "달력(_A)"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Audio Alarm Options"
+#~ msgstr "오디오 알림 옵션"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Message Alarm Options"
+#~ msgstr "메세지 알림 옵션"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Email Alarm Options"
+#~ msgstr "전자메일 알림 옵션"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Program Alarm Options"
+#~ msgstr "프로그램 알림 옵션"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "알 수 없는 알림 옵션"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#~ msgid "Alarm Repeat"
+#~ msgstr "알림 반복"
+
+#~ msgid "Message to Display:"
+#~ msgstr "표시할 메세지:"
+
+#~ msgid "Message to Send"
+#~ msgstr "보낼 메세지"
+
+#~ msgid "Play sound:"
+#~ msgstr "소리 연주:"
+
+#~ msgid "Run program:"
+#~ msgstr "프로그램 실행:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "인자:"
+
+#~ msgid "Basics"
+#~ msgstr "기본"
+
+#~ msgid "Date/Time:"
+#~ msgstr "날짜/시각:"
+
+#~ msgid "Reminders"
+#~ msgstr "미리 알림"
+
+#~ msgid "_Options..."
+#~ msgstr "옵션(_O)..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "주소록..."
+
+#~ msgid "Reminder"
+#~ msgstr "미리 알림"
+
+#~ msgid "B_usy"
+#~ msgstr "약속 있음(_U)"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "비밀(_N)"
+
+#~ msgid "Date & Time"
+#~ msgstr "날짜 및 시각"
+
+#~ msgid "F_ree"
+#~ msgstr "약속 없음(_R)"
+
+#~ msgid "Pri_vate"
+#~ msgstr "개인(_V)"
+
+#~ msgid "Pu_blic"
+#~ msgstr "공용(_B)"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "참석자 더하기(_T)"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "보낸 사람을 주소록에 더하기"
+
+#~ msgid "Preview"
+#~ msgstr "미리 보기"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "반복 규칙"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "사용자 정의 반복(_C)"
+
+#~ msgid "_Modify"
+#~ msgstr "고치기(_M)"
+
+#~ msgid "_No recurrence"
+#~ msgstr "반복 없음(_N)"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "간단한 반복(_S)"
+
+#~ msgid "% _Complete"
+#~ msgstr "% 완료(_C)"
+
+#~ msgid "Progress"
+#~ msgstr "진행"
+
+#~ msgid "Con_fidential"
+#~ msgstr "비밀(_F)"
+
+#~ msgid "Folder:"
+#~ msgstr "폴더:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>시작:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>끝:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>완료됨:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>기한:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>없음</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA 시스템에 오류가 있습니다\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "오브젝트를 찾을 수 없습니다\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "달력을 업데이트할 올바른 권한이 없습니다\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "참석자 상태를 업데이트할 수 없습니다!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "보낸 사람을 주소록에 더하기"
+
+#~ msgid "_Options"
+#~ msgstr "옵션(_O)"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "모임 시작 시각(_S):"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "모임 종료 시각(_E):"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s 여는 데 오류가 밝생했습니다:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "메시지로부터 거르게 만들기(_T)"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "%s의 폴더 잠금을 만들 수 없습니다: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "메일 작성 창을 만들 수 없습니다:\n"
+#~ "HTML 편집기 컴포넌트를 활성화할 수 없습니다."
+
+#~ msgid "_Score Rules"
+#~ msgstr "점수 규칙(_S)"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
+
+#~ msgid "Folder Name"
+#~ msgstr "폴더 이름"
+
+#~ msgid "_Properties..."
+#~ msgstr "등록 정보(_P)..."
+
+#~ msgid "Checkbox"
+#~ msgstr "확인란"
+
+#~ msgid "C_alendar:"
+#~ msgstr "달력(_A):"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "연락처:"
+
+#~ msgid "_Mail:"
+#~ msgstr "메일(_M):"
+
+#~ msgid "_Tasks:"
+#~ msgstr "작업(_T):"
+
+#~ msgid "Folder _type:"
+#~ msgstr "폴더 종류(_T):"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "다른 사용자의 폴더 열기"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "폴더 이름(_F):"
+
+#~ msgid "_User:"
+#~ msgstr "사용자(_U):"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "LDAP 서버에 연결 실패"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "LDAP 서버에서 인증 실패"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "루트 DSE에 질의를 수행할 수 없습니다"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " 지원하는 기준 보기(_H) "
 
@@ -19109,9 +20105,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "item8"
 #~ msgstr "제목"
 
-#~ msgid "Category editor not available."
-#~ msgstr "분류 편집기를 사용할 수 없습니다."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19161,9 +20154,6 @@ msgstr "%s (%d%% 완료)"
 #~ "cancellation notice?"
 #~ msgstr "지금 지우는 행사는 회의입니다. 취소를 공지하시겠습니까?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "정말로 이 회의를 취소하고 지우시겠습니까?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19178,42 +20168,16 @@ msgstr "%s (%d%% 완료)"
 #~ "cancellation notice?"
 #~ msgstr "지금 지우는 일지 항목은 게시되었습니다. 취소를 공지하시겠습니까?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "정말로 이 일지 항목을 취소하고 지우시겠습니까?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "정말로 약속 `%s'을(를) 지우시겠습니까?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "정말로 작업 `%s'을(를) 지우시겠습니까?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "정말로 이 제목없는 작업을 지우시겠습니까?"
 
 # journal -> 일지, Microsoft Office XP 참고
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "정말로 일지 항목 `%s'을(를) 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "정말로 이 제목없는 일지 항목 지우시겠습니까?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "정말 약속 %d개를 지우시겠습니까?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "정말 작업 %d개를 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "정말 일지 항목 %d개를 지우시겠습니까?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "다른 이들을 초대(_I)..."
 
@@ -19261,9 +20225,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "정크메일과 정크메일이 아닌 메세지를 학습합니다"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "NNTP 서버에서 글 \"%s\"을(를) 가져올 수 없습니다."
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "뉴스 서버에서 게시를 허용하지 않습니다"
 
@@ -19300,197 +20261,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "알 수 없는 서버 응답: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "점수 조정"
-
-#~ msgid "Assign Color"
-#~ msgstr "색 지정"
-
-#~ msgid "Assign Score"
-#~ msgstr "점수 지정"
-
-#~ msgid "Attachments"
-#~ msgstr "첨부"
-
-#~ msgid "Beep"
-#~ msgstr "삑 소리"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "contains"
-#~ msgstr "포함"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "폴더로 복사"
-
-#~ msgid "Date received"
-#~ msgstr "받은 날짜"
-
-#~ msgid "Date sent"
-#~ msgstr "보낸 날짜"
-
-#~ msgid "Deleted"
-#~ msgstr "지워짐"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not contain"
-#~ msgstr "포함하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not end with"
-#~ msgstr "끝나지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not exist"
-#~ msgstr "없음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not return"
-#~ msgstr "리턴하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not sound like"
-#~ msgstr "비슷한 소리 아님"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "does not start with"
-#~ msgstr "시작하지 않음"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "존재하지 않음"
-
-#~ msgid "Draft"
-#~ msgstr "임시 보관함"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "ends with"
-#~ msgstr "끝남"
-
-#~ msgid "Exist"
-#~ msgstr "존재함"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "exists"
-#~ msgstr "존재함"
-
-#~ msgid "Expression"
-#~ msgstr "표현"
-
-#~ msgid "Follow Up"
-#~ msgstr "추가 작업"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is"
-#~ msgstr "같음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is after"
-#~ msgstr "뒤 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is before"
-#~ msgstr "앞 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is Flagged"
-#~ msgstr "플래그 지정"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is greater than"
-#~ msgstr "보다 큼"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is less than"
-#~ msgstr "보다 적음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is not"
-#~ msgstr "다름"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "is not Flagged"
-#~ msgstr "플래그 지정 아님"
-
-#~ msgid "Junk Test"
-#~ msgstr "정크메일 테스트"
-
-#~ msgid "Mailing list"
-#~ msgstr "메일링 리스트"
-
-#~ msgid "Message Body"
-#~ msgstr "메세지 본문"
-
-#~ msgid "Message Header"
-#~ msgstr "메세지 머리말"
-
-#~ msgid "Message is Junk"
-#~ msgstr "메세지가 정크메일"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "메세지가 정크메일 아님"
-
-#~ msgid "Move to Folder"
-#~ msgstr "폴더로 이동"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "프로그램을 끝냅니다"
-
-#~ msgid "Play Sound"
-#~ msgstr "소리 연주"
-
-#~ msgid "Recipients"
-#~ msgstr "받는 사람"
-
-#~ msgid "Regex Match"
-#~ msgstr "정규식"
-
-#~ msgid "Replied to"
-#~ msgstr "회신"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "returns"
-#~ msgstr "리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "returns greater than"
-#~ msgstr "더 큰 값 리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "returns less than"
-#~ msgstr "더 작은 값 리턴"
-
-#~ msgid "Run Program"
-#~ msgstr "프로그램 실행"
-
-#~ msgid "Sender"
-#~ msgstr "보낸 사람"
-
-#~ msgid "Set Status"
-#~ msgstr "상태 설정"
-
-#~ msgid "Size (kB)"
-#~ msgstr "크기 (kB)"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "sounds like"
-#~ msgstr "비슷한 소리"
-
-#~ msgid "Source Account"
-#~ msgstr "메일 온 계정"
-
-#~ msgid "Specific header"
-#~ msgstr "특정 헤더"
-
-# FIXME - hard to translate UI + string based on English grammar
-#~ msgid "starts with"
-#~ msgstr "시작함"
-
-#~ msgid "Stop Processing"
-#~ msgstr "처리 중지"
-
-#~ msgid "Unset Status"
-#~ msgstr "상태 설정 없애기"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "새 메일 확인(_I)"
 
@@ -19722,9 +20492,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Finished"
 #~ msgstr "끝"
 
-#~ msgid "Group:"
-#~ msgstr "그룹:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
diff --git a/po/lt.po b/po/lt.po
index db67988850..9a519d8ad6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-13 11:05+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@tuxfamily.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -25,16 +25,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Adresų Knyga"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontaktai: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution Aliarmas"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -59,34 +49,253 @@ msgstr "kortelės"
 msgid " card"
 msgstr "kortelės"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktai: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Aliarmas"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Elementas negalėjo būti išsiųstas!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nepavyko autentifikavimasis su LDAP serverių"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Serveris nepateikė tinkamų paieškos platformų"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Negalėjau gauti straipsnio %s iš NNTP serverio"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Serveris nepateikė tvarkingos schemų informacijos"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nepavyko įkelti adresų knygos"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategorijų redaktorius nepasiekiamas."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Išsaugoti adresų knygelėje"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Klaida įkeliant standartinę adresų knygą."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Negaliu apdoroti kaupo aplanko"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Ar nori išsaugoti pakeitimus?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Atsikratyti"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "ir likusį kontaktą."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nepavyko apdoroti laiško turinio"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Klaida įtraukiant kontaktą"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Adresų knygos adresų vaizduoklė"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Įprastas Sinchronizavimo Adresas:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nepavyko įkelti adresų knygos"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Susisiekiama su LDAP serveriu anonimiškai"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Autorizacija nepavyko.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Savaiminis pabaigimas"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikatai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nustatykite automatinį užbaigimą čia"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontaktai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Adresų Knyga"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Adresų Knygos iššokantis langas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adresų knygos adresų vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adresų Knygos kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Adresų Knygos komponentas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Sertifikatų Valdymo Nuostatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution aplankų nustatymų valdymas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -119,7 +328,7 @@ msgstr "Naujas kontaktas"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontaktai:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -143,15 +352,15 @@ msgid "Migrating `%s':"
 msgstr "Perkeliamas „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Šiame Kompiuteryje"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -160,20 +369,20 @@ msgid "Personal"
 msgstr "Asmeninis"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Tarp LDAP Serverių"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP Serveriai"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Savaiminis pabaigimas"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -185,7 +394,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -197,7 +406,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -209,7 +418,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -221,38 +430,47 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresų knygutė „%s“ bus pašalinta. Ar Jūs tikrai norite taip pasielgti?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Nauja Adresų Knyga"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Savybės..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktai"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Susisiekiama su LDAP serveriu anonimiškai"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Autorizacija nepavyko.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -275,61 +493,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Aplanko adresas paskutinį kartą panaudotas vardų pasirinkimo dialoge"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Savaiminis pabaigimas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontaktai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikatai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Nustatykite automatinį užbaigimą čia"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Adresų Knyga"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Adresų Knygos iššokantis langas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Adresų knygos adresų vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Adresų Knygos kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Adresų Knygos komponentas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Sertifikatų Valdymo Nuostatos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution aplankų nustatymų valdymas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -337,7 +500,7 @@ msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -346,8 +509,7 @@ msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -373,6 +535,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentikacija"
@@ -422,13 +585,11 @@ msgid "Anonymously"
 msgstr "Anonimiškai"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Esmė"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalės"
 
@@ -693,33 +854,26 @@ msgid "cards"
 msgstr "kortelės"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minučių"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Adresų Knygos vardų pasirinkimo sąsaja"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Pašalinti visus"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Pašalinti"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Pašalinti visus"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Peržiūrėti kontaktų sąrašą"
@@ -734,7 +888,7 @@ msgid "Send HTML Mail?"
 msgstr "Siųsti HTML paštą?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Pridėti prie kontaktų"
 
@@ -742,15 +896,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Šaltinis"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Adresų Knygos vardų pasirinkimo sąsaja"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -772,6 +933,11 @@ msgstr "K_ategorija:"
 msgid "_Find"
 msgstr "_Rasti"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Ieškoti"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -818,9 +984,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Darbo Savaitė</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -845,7 +1010,6 @@ msgid "Birthday:"
 msgstr "_Gimtadienis:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendorius:"
 
@@ -860,15 +1024,15 @@ msgid "Company:"
 msgstr "Komanda:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontaktas"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
@@ -979,8 +1143,8 @@ msgstr "_Tinklalapis:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -1002,44 +1166,28 @@ msgid "_File under:"
 msgstr "Bylos vardas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erveris:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ar Jūs tikrai norite\n"
-"ištrinti šiuos kontaktus?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ar tu tikrai nori\n"
-"ištrinti šį kontaktą?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Taisomas"
 
@@ -2011,136 +2159,128 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabvė"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Skubios žinutės"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Paslauga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 #, fuzzy
-msgid "GroupWise"
-msgstr "Novell GroupWise"
+msgid "Location"
+msgstr "Vieta:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Vartotojo _vardas:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Namų"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Kitas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Pradinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Tikslinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Tai Naujas Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Keičiami Laukai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Pakeista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontaktas priklauso šioms kategorijoms:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nigeris"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Pasikartojimo data klaidinga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d kontaktai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Atsikratyti"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Skubios žinutės"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Paslauga"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Vieta:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Vartotojo _vardas:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridėjimas"
@@ -2158,6 +2298,22 @@ msgstr "_Pilnas vardas:"
 msgid "E-_mail:"
 msgstr "El. paštas"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ar Jūs tikrai norite\n"
+"ištrinti šiuos kontaktus?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ar tu tikrai nori\n"
+"ištrinti šį kontaktą?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresas _2:"
@@ -2284,49 +2440,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Pasirinkti Lontaktus iš Adresų Knygos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Nariai"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Pašalinti pažymėtus elementus iš priedų sąrašo"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Parinkta"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Paslėpti adresus siunčiant laiškus šiam sąrašui"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Rodomas vardas:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Įrašyki_te el. pašto adresą arba nutempkite kontaktą į žemiau esantį sąrašą:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialogas1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Knyga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Tai Naujas Sąrašas"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Būtini dalyviai"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktų sąrašo redaktorius"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Išsaugoti Sąrašą tarp VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Pakeistas kontaktas:"
@@ -2365,431 +2542,11 @@ msgstr ""
 "aplanke.  Ar vis tiek norėtum jį pridėti?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Išsami paieška"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Parodyti Sąrašą"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "El. paštas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Aprašymas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupė"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-#, fuzzy
-msgid "Video Conferencing"
-msgstr "_Vaizdo Konferencijų Adresas:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Automobilio telefonas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Darbinis"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Žurnalas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobilus telefonas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Asmeninis"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Pastaba"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Pareigos"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "El. paštas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Namų puslapis"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Sėkmė"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Saugykla atsijungta"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adresų Knyga neegzistuoja"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Naujas kontaktų sąrašas"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Priėjimas uždraustas"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kontaktas nerastas"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Toks kontakto ID jau naudojamas"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokolas nepalaikomas"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Nutraukta"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nepavyko atidaryti „%s“: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Autentikacija Nepavyko"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Būtina Autentifikacija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS Negalimas"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nėra tokio laiško"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Kita klaida"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nepavyko atidaryti šios adresų knygelės. Patikrinkite, ar kelias egzistuoja "
-"ir ar Jūs turite teises jį pasiekti."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
-"neteisingą adresą arba nurodytas LDAP serveris yra nepasiekiamas."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Ši Evolution versija neturi įkompiliuoto LDAP palaikymo. Jei Jūs norite "
-"naudoti LDAP su Evolution, Jums teks sukompiliuoti programą iš pradinių "
-"tekstų prieš tai įdiegus OpenLDAP iš žemiau esančio adreso."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
-"neteisingą adresą arba nurodytas serveris yra nepasiekiamas."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Užklausa pateikė daugiau atsakymų nei serveriui ar Evolution\n"
-"yra leista pateikti. Sukonkretinkite vykdomą paiešką arba \n"
-"padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
-"adresų knygos katalogo serverio nustatymų."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Užklausa užtruko ilgiau nei nustatyta serverio ar adresų knygos \n"
-"apribojimuose. Sukonkretinkite vykdomos paieškos kriterijus arba\n"
-"padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
-"serverio nustatymuose."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Šios adresų knygos posistemė negali apdoroti pateiktos užklausos."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Šios adresų knygos posistemė atsisakė apdoroti pateiktą užklausą."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Ši užklausa nesibaigė sėkmingai."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Klaida pridedant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Klaida įtraukiant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Klaida modifikuojant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Klaida keičiant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Klaida pašalinant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Klaida šalinant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Bandymas atverti %d kontaktus sukurs %d naujų langų.\n"
-"Ar Jūs tikrai norite peržiūrėti visus šiuos kontaktus vienu metu?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s jau egzistuoja.\n"
-"Ar nori įrašyti vietoj jo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Perrašyti"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "kortele.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "sąrašas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Perkelti kontaktą į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Nukopijuoti kontaktą į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Perkelti kontaktus į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Nukopijuoti kontaktus į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Keletas VCard kortelių"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "%s 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:199
-msgid "(none)"
-msgstr "(jokio)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Pagrindinis el. paštas"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "El. paštas 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "El. paštas 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Pasirink veiksmą"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Sukurti naują kontaktą „%s“"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pridėti adresą prie esančio kontakto „%s“"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Užklausiama adresų knygelė..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Keisti kontakto informaciją"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Įlieti el. pašto adresą"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ir likusį kontaktą."
-msgstr[1] "ir likusį kontaktą."
-msgstr[2] "ir likusį kontaktą."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Rodyti Visą VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Rodyti Paprastą VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Išsaugoti adresų knygelėje"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nėra kontaktų"
@@ -2804,9 +2561,9 @@ msgstr[2] "%d kontaktai"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Užklausa"
 
@@ -2822,134 +2579,134 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortelę"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Vardas prasideda"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "El. paštas prasideda"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Išsami..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresų _Knyga:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Naujas Kontaktas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Naujas Kontaktų Sąrašas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Eiti į Aplanką..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Ieškoti Kontaktų..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adresų Knygos Šaltiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot Nustatymai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persiųsti kontaktą"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Spausdinti voką"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Įdėti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Esamas vaizdas"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
@@ -2983,6 +2740,8 @@ msgid "Car Phone"
 msgstr "Automobilio telefonas"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategorijos"
 
@@ -2990,6 +2749,21 @@ msgstr "Kategorijos"
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "El. paštas"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "El. paštas 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "El. paštas 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Pavardė"
@@ -3026,14 +2800,29 @@ msgstr "Žurnalas"
 msgid "Manager"
 msgstr "Vadybininkas"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobilus telefonas"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Pravardė"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Pastaba"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofisas"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Kitas faksas"
@@ -3085,29 +2874,21 @@ msgstr "Vienetas"
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Plotis"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Aukštis"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Turi Fokusavimą"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Parinkta"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Turi Žymeklį"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Laukas"
@@ -3124,7 +2905,11 @@ msgstr "Text Modelis"
 msgid "Max field name length"
 msgstr "Didžiausias lauko vardo ilgis"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Stulpelio plotis"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3138,7 +2923,7 @@ msgstr ""
 "\n"
 "Dukart spragtelėkite, kad sukurti naują Kontaktą."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3148,13 +2933,400 @@ msgstr ""
 "\n"
 "Šiame vaizde nėra nieko, ką būtų galima parodyti."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapteris"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Stulpelio plotis"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Parinkta"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Turi Žymeklį"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Parodyti Sąrašą"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "El. paštas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Aprašymas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+#, fuzzy
+msgid "Video Conferencing"
+msgstr "_Vaizdo Konferencijų Adresas:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Automobilio telefonas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Darbinis"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Žurnalas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Asmeninis"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Pareigos"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Namų puslapis"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Sėkmė"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Saugykla atsijungta"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Adresų Knyga neegzistuoja"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Naujas kontaktų sąrašas"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Priėjimas uždraustas"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontaktas nerastas"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Toks kontakto ID jau naudojamas"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokolas nepalaikomas"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Nutraukta"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nepavyko atidaryti „%s“: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autentikacija Nepavyko"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Būtina Autentifikacija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS Negalimas"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nėra tokio laiško"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Kita klaida"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nepavyko atidaryti šios adresų knygelės. Patikrinkite, ar kelias egzistuoja "
+"ir ar Jūs turite teises jį pasiekti."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
+"neteisingą adresą arba nurodytas LDAP serveris yra nepasiekiamas."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ši Evolution versija neturi įkompiliuoto LDAP palaikymo. Jei Jūs norite "
+"naudoti LDAP su Evolution, Jums teks sukompiliuoti programą iš pradinių "
+"tekstų prieš tai įdiegus OpenLDAP iš žemiau esančio adreso."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
+"neteisingą adresą arba nurodytas serveris yra nepasiekiamas."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Užklausa pateikė daugiau atsakymų nei serveriui ar Evolution\n"
+"yra leista pateikti. Sukonkretinkite vykdomą paiešką arba \n"
+"padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
+"adresų knygos katalogo serverio nustatymų."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Užklausa užtruko ilgiau nei nustatyta serverio ar adresų knygos \n"
+"apribojimuose. Sukonkretinkite vykdomos paieškos kriterijus arba\n"
+"padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
+"serverio nustatymuose."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Šios adresų knygos posistemė negali apdoroti pateiktos užklausos."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Šios adresų knygos posistemė atsisakė apdoroti pateiktą užklausą."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Ši užklausa nesibaigė sėkmingai."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Klaida pridedant sąrašą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Klaida įtraukiant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Klaida modifikuojant sąrašą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Klaida keičiant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Klaida pašalinant sąrašą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Klaida šalinant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Bandymas atverti %d kontaktus sukurs %d naujų langų.\n"
+"Ar Jūs tikrai norite peržiūrėti visus šiuos kontaktus vienu metu?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s jau egzistuoja.\n"
+"Ar nori įrašyti vietoj jo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Perrašyti"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "kortele.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "sąrašas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Perkelti kontaktą į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Nukopijuoti kontaktą į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Perkelti kontaktus į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Nukopijuoti kontaktus į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Keletas VCard kortelių"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "%s 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:198
+msgid "(none)"
+msgstr "(jokio)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Pagrindinis el. paštas"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Pasirink veiksmą"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sukurti naują kontaktą „%s“"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Pridėti adresą prie esančio kontakto „%s“"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Užklausiama adresų knygelė..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Keisti kontakto informaciją"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Įlieti el. pašto adresą"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ir likusį kontaktą."
+msgstr[1] "ir likusį kontaktą."
+msgstr[2] "ir likusį kontaktą."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Rodyti Visą VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Rodyti Paprastą VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Išsaugoti adresų knygelėje"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3201,6 +3373,11 @@ msgstr "Evolution vCalendar importas"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Spausdinti voką"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
@@ -3210,11 +3387,6 @@ msgstr "Spausdinti kontaktus"
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Spausdinti voką"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3400,6 +3572,22 @@ msgstr "Kontaktų Spausdinimo Testas"
 msgid "This should test the contact print code"
 msgstr "Čia turi būti patikrintas kontaktų spausdinimo kodas"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Nepavyko atidaryti bylos"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nepavyko įkelti adresų knygos"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Negaliu atidaryti adresų knygelės"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Nurodykite išvedimo bylą naudojamą vietoj standartinio išvedimo"
@@ -3458,22 +3646,6 @@ msgstr "Normaliam režimui nėra būtinas dydžio parametras."
 msgid "Impossible internal error."
 msgstr "Nenumatyta vidinė klaida."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Nepavyko atidaryti bylos"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nepavyko įkelti adresų knygos"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Negaliu atidaryti adresų knygelės"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Klaida įkeliant standartinę adresų knygą."
@@ -3490,39 +3662,364 @@ msgstr "Nenurodytas bylos vardas."
 msgid "Unnamed List"
 msgstr "Bevardis Sąrašas"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Neištrinti"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Siųsti Kam:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį susitikimą?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Ar tu tikrai nori ištrinti %d užduočių?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį žurnalo įrašą?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ar tu tikrai nori ištrinti %d įvykių?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Įvykis"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Ar nori išsaugoti pakeitimus?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Tu kažką pakeitei. Užmiršti tuos pakeitimus ir atnaujinti redaktorių?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Atsikratyti Pakeitimų"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Išsaugoti Laišką..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Siųsti"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importas"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Išskaidyti Kelių Dienų Įvykius:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Negalėjau paleisti wombat serverio"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Negalėjau paleisti wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Įprastas prioritetas:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negalėjau perskaityti piloto ToDo programos bloko"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendorius ir Užduotys"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendoriai"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Čia galima nustatyti savo laiko juostą, Kalendorių bei Užduočių Sąrašą "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalendorius ir Užduotys"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Kalendoriaus konfigūravimo priemonė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Kalendoriaus žinučių grafiko vaizduoklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Kalendoriaus/Užduočių redaktorius"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution Kalendoriaus komponentas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution Užduočių komponentas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Užduotys"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendoriai"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Užduotys"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Kalendoriaus Aliarmo pranešimo tarnyba"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pradžia:"
@@ -3624,10 +4121,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti apie šią programą."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Kalendoriaus Aliarmo pranešimo tarnyba"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Negalėjau inicializuoti Bonobo"
@@ -3770,9 +4263,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Ar rodyti savaičių numerius datos navigatoriuje"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Santrauka turi savyje"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Aprašymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentaras turi savyje"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Aprašymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Netinkantys"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3792,8 +4306,8 @@ msgid "Purge events older than"
 msgstr "Ištrinti įvykius senesnius nei"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dienų"
 
@@ -3804,7 +4318,7 @@ msgstr "%A, %Y m. %B %d d."
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
@@ -3853,62 +4367,52 @@ msgstr "Nepavyko atverti kalendoriaus „%s“ įvykių bei susitikimų įrašym
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nėra sukurta kalendoriaus naudojamo įvykių bei susitikimų saugojimui"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendoriai"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Naujas paskyrimas"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "P_askyrimas"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Sukurti naują įvykį"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Naujas susitikimas"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Susitikimas"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Sukurti naują susitikimo užklausimą"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nauji visos dienos paskyrimai"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Visos dienos praskyrimai"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Sukurti naują visos dienos paskyrimą"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Naujas kalendorius"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alendorius"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendorius"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
@@ -3938,27 +4442,6 @@ msgstr "Savaitės rodinys"
 msgid "Month View"
 msgstr "Mėnesio rodinys"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Santrauka turi savyje"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Aprašymas turi savyje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentaras turi savyje"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Aprašymas turi savyje"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Netinkantys"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Klaida atidarant kalendorių"
@@ -3976,225 +4459,132 @@ msgstr "Turimos priėjimo teisės neleidžia atidaryti kalendoriaus"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Perspėjimų garsu parinktys"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Perspėjimų pranešimu parinktys"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "El. pašto Aliarmų Nuostatos"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Perspėjimų programa parinktys"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Nežinomų perspėjimų parinktys"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Aliarmo pasikartojimas"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Rodoma žinutė:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Siunčiama Žinutė"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Groti garsą:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Kartoti perspėjimą"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Paleisti programą:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Siųsti Kam:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Su tokiais argumentais:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialogas1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Aliarmo Garsas</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "papildomai kiekvieną"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Aprašymas</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "valandų"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Priminimai</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Veiksmas/Jungiklis"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Perspėjimai"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Pri_dėti"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Sukurti laišką"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Pagrindai"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Laikas:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Laiškai"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Groti garsą"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Priminėjai"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Paleisti programą"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Siųsti Kam:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pasiųsti laišką"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Apžvalga:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Sąsk_aita:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Parinktys..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Paleisti programą:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Kartoti perspėjimą"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Siųsti"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "prieš"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dieną(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "įvykio pabaigą"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "papildomai kiekvieną"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "valandą(as)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "valandų"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutę(es)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "įvykio pradžią"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Jūs turite nurodyti vietą, iš kurios reikia paimti kalendorių."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Šaltinio adreso „%s“ formatas yra nepriimtinas."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Pateiktas šaltinis „%s“ nėra webcal formate."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Šaltinis pavadintas „%s“ jau yra tarp pasirinktos grupės"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupė „%s“ yra nutolusi. Jūs turi nurodyti vietą, iš kurios reikia paimti "
-"kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Sukurti Naują Kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Užduočių Sąrašo Grupė"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Spalv_os"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pasirink spalvą"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Sukurti Naują Kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Pridėti Grupę..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Atnaujinti"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipas:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Veiksmas/Jungiklis"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Pri_dėti"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "savaičių"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Perspėjimai"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4310,7 +4700,7 @@ msgid "Free/Busy Publishing"
 msgstr "Laisvas/užsiėmęs informacija"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Penktadienis"
@@ -4324,7 +4714,7 @@ msgid "Minutes"
 msgstr "Minučių"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pirmadienis"
@@ -4334,7 +4724,7 @@ msgid "S_un"
 msgstr "S_ek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Šeštadienis"
@@ -4348,7 +4738,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sekmadienis"
@@ -4362,7 +4752,7 @@ msgid "T_hu"
 msgstr "_Ket"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Ketvirtadienis"
@@ -4376,7 +4766,7 @@ msgid "Time format:"
 msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Antradienis"
@@ -4386,7 +4776,7 @@ msgid "W_eek starts:"
 msgstr "Savaitė prasideda:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Trečiadienis"
@@ -4419,7 +4809,8 @@ msgstr "_Suspausti savaitgalius mėnesio rodinyje"
 msgid "_Day begins:"
 msgstr "_Diena prasideda:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4469,6 +4860,82 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "prieš kiekvieną paskyrimą"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Jūs turite nurodyti vietą, iš kurios reikia paimti kalendorių."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Šaltinio adreso „%s“ formatas yra nepriimtinas."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Pateiktas šaltinis „%s“ nėra webcal formate."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Šaltinis pavadintas „%s“ jau yra tarp pasirinktos grupės"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupė „%s“ yra nutolusi. Jūs turi nurodyti vietą, iš kurios reikia paimti "
+"kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Sukurti Naują Kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Užduočių Sąrašo Grupė"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Spalv_os"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pasirink spalvą"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Sukurti Naują Kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Pridėti Grupę..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Atnaujinti"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipas:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "savaičių"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Šis įvykis buvo ištrintas."
@@ -4515,80 +4982,74 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Tikrinimo klaida: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " iki "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Užbaigta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Užbaigta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Iki "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Iki"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Keisti įvykį"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Išsaugoti kaip..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Pakeitimai padaryti šiame punkte bus prarasti, jei atsiras atnaujinimai"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Tikrinimo klaida: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " iki "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Užbaigta "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Užbaigta "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Iki "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Iki"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4652,8 +5113,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Klaida neleido ištrinti elemento"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresų knygelė..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontaktai"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4663,161 +5125,225 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Įvykis"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Užuomina"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientacija"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Susitikimas"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Galutinis terminas yra anksčiau už pradžią!"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Klaidinga pabaigos data"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Klaidingas pradžios laikas"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Klaidingas pabaigos laikas"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nepavyko atidaryti kalendoriaus „%s“."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "prieš kiekvieną paskyrimą"
+msgstr[1] "prieš kiekvieną paskyrimą"
+msgstr[2] "prieš kiekvieną paskyrimą"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "įvykio pabaigą"
+msgstr[1] "įvykio pabaigą"
+msgstr[2] "įvykio pabaigą"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "prieš kiekvieną paskyrimą"
+msgstr[1] "prieš kiekvieną paskyrimą"
+msgstr[2] "prieš kiekvieną paskyrimą"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Vis_os dienos įvykis"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "prieš kiekvieną paskyrimą"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Užimtas"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "prieš kiekvieną paskyrimą"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorijos..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "prieš kiekvieną paskyrimą"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Užduočių Sąrašas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikacija"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Data ir Laikas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Ko_nfidencialus"
+msgid "A_ll day event"
+msgstr "Vis_os dienos įvykis"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data ir laikas"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Išsaugoti Specialų Rodynį..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Laisvas"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorijos..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Vieta:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendorius:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "As_meniškas"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Viešas"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Slaptas"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Rodyti laiką kaip"
+msgid "L_ocation:"
+msgstr "_Vieta:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Asmeniškas"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Viešas"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Rodyti laiką kaip"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "S_uvestinė:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Perspėjimai"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Aprašymas:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Pradžios laikas:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Joks"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Pasirinktas organizatorius nebeturi sąskaitos."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Organizatorius yra būtinas."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Būtinas bent vienas dalyvis."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Ištrinti"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Pašalinti"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4856,35 +5382,45 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Būsena"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Pridė_ti Dalyvį"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Perspėjimai</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Įtraukti Siuntėją į Adresų _Knygą"
+msgid "<b>Organizer</b>"
+msgstr "<b>Laikas</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Keisti organizatorių:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizatorius:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktai"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Keisti organizatorių:"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizatorius:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4951,147 +5487,141 @@ msgstr "Šiuo ir vėlesniais atvejais"
 msgid "All Instances"
 msgstr "Visais atvejais"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šiame įvykyje yra pasikartojimų, kurių Evolution negali keisti."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Pasikartojimo data klaidinga"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "pirmas"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekundė"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trečias"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "ketvirtas"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "paskutinis"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Kita Data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "diena"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "kartą(us) pasitaikys"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/Laikas"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Aprašymas</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Peržiūra</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Pasikartojimas"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Kas"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Išimtys"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Peržiūra"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisyklė"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Kitoks pakartojimas"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Keisti"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Jokio pakartojimo"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Pašalinti"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Paprastas pakartojimas"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "K_eisti įvykį"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "kol"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "amžinai"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mėnesį(ius)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "iki"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "savaitę(es)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Nurodykite galutinį dokumentą"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Juodraščių _aplankas:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Užduočių sąrašas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Pabaigos data klaidinga"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>Rodomas Pranešimas</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Baigta"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<b>Rodomas Pranešimas</b>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Užbaigta"
 
@@ -5103,8 +5633,8 @@ msgstr "Aukštas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Vykdoma"
@@ -5116,22 +5646,22 @@ msgid "Low"
 msgstr "Žemas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normalus"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nepradėta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progresas"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Įvykdymo Procentas: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5155,36 +5685,42 @@ msgstr "_Būsena:"
 msgid "_Web Page:"
 msgstr "_Tinklalapis:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Užduotis"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Galutinio termino data klaidinga"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "S_laptas"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<b>Rodomas Pranešimas</b>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<b>Rodomas Pranešimas</b>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Aplankas:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5195,61 +5731,58 @@ msgstr "P_radžios data:"
 msgid "_Due date:"
 msgstr "_Kada reikia:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Blogas autentikacijos atsakymas iš serverio."
+msgid "_Group:"
+msgstr "Grupė:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalendoriaus Nuostatos</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Diena"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Laisvas/užsiėmęs informacija"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Laisvas/užsiėmęs informacija"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Rodomas vardas:"
+msgid "_Daily"
+msgstr "Diena"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Slaptažodis"
+msgid "_Manual"
+msgstr "_El. paštas:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Slaptažodis"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Prisiminti šį slaptažodį"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #, fuzzy
-msgid "URL:"
-msgstr "URL"
+msgid "_Username:"
+msgstr "Vartotojo _vardas:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Savaitė"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5336,7 +5869,7 @@ msgstr "%s tarp %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s yra skirtas nežinomam daviklio tipui"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Paspauskite, kad atidaryti %s"
@@ -5345,6 +5878,11 @@ msgstr "Paspauskite, kad atidaryti %s"
 msgid "Untitled"
 msgstr "Bevardė"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Apžvalga:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5356,7 +5894,7 @@ msgstr "Kada reikia:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Būsena:"
 
@@ -5369,20 +5907,94 @@ msgstr "Prioritetas:"
 msgid "Web Page:"
 msgstr "_Tinklalapis:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Viešas"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Data"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Asmeniškas"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Pradžios data"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Slaptas"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Apžvalga"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Laisvas"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Užimtas"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Š"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "P"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "R"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geografinė vietovė turi būti įvesta formatu:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Taip"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ne"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nežinomas"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Pasikartojantis"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Priskirtas"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5428,95 +6040,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Laisvas"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Užimtas"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Ati_daryti"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Atverti Tinklapį"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_pausdinti..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iškirpti"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Į_dėti"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Priskirti užduotį"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Persiųsti kaip iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Pažymėti užbaigta"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Pažymėti Pasirinktas Užduotis kaip Užbaigtas"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Ištrinti"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Ištrinti pažymėtas užduotis"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Išsaugoti kaip..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Spausk čia, kad pridėtum užduotį"
 
@@ -5525,182 +6143,112 @@ msgstr "Spausk čia, kad pridėtum užduotį"
 msgid "% Complete"
 msgstr "% Baigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Užbaigta"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Užbaigimo data"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Kada reikia"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Svarbumas"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Pradžios data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Apžvalga"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Perkeliami laiškai"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopijuojami pranešimai"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Naujas Susitikimas"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pažymėti _giją"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Pa_srinkite..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopijuoti į aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Perkelti į Aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti Susitikimą..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Eiti į šia_ndieną"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Eiti į datą..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Nuo_statos..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Data"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Pradžios data"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nežinomas"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Pasikartojantis"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Priskirtas"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Taip"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Š"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "P"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "R"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografinė vietovė turi būti įvesta formatu:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5724,36 +6272,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minučių padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %B %e"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minučių padalos"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr " "
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr " "
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5826,37 +6374,35 @@ msgid ", ending on "
 msgstr ", pabaigiant "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Pradžia:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Pabaiga:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Būsena"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Baigta:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Iki:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Iki"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar Informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar Klaida"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Nežinomas asmuo"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5864,311 +6410,291 @@ msgstr ""
 "<br> Peržiūrėkite žemiau esančią informaciją ir tada pasirinkite reikiamą "
 "apatinio meniu punktą."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Joks</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Vieta:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Negalutinis Sutikimas"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Pasirinkti veiksmą:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Gerai"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Priimti"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Sutikti, bet negarantuoti"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr " Atmesti "
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Siųsti Laisvas/Užimtas Informaciją"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Atnaujinti gavėjų statusą"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> paskelbė susitikimo informaciją."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> norėtų, kad %s dalyvautų susitikime."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> norėtų, kad Jūs dalyvautumėte susitikime."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Susitikimo Pasiūlymas"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> nori papildyti esamą susitikimą."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Susitikimo Atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> norėtų gauti paskutinę informaciją apie susitikimą."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Prašymas Pakeisti Susitikimo Informaciją"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> atsakė į susitikimo užklausą."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Susitikimo Atsakas"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> atšaukė susitikimą."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Susitikimo Atšaukimas"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> atsiuntė nesuprantamą atsakymą į užklausimą."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Blogas Susitikimo Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> paskelbė užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Užduoties informacija"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> prašo %s atlikti šią užduotį."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> prašo Jus atlikti užduotį."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Užduoties Pasiūlymas"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> nori papildyti esamą užduotį."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Užduoties Atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> nori gauti paskutinę užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Užduoties Atnaujinimo Užklausa"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> atsakė į užduoties priskyrimą."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Užduoties Atsakas"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> atšaukė užduotį."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Užduoties Atšaukimas"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Blogas Užduoties Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> paskelbė laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Laisvas/Užimtas Informacija"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> paprašė Jūsų pateikti laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Laisvas/Užimtas Prašymas"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> atsakė į laisvas/užimtas prašymą."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Laisvas/Užimtas Atsakas"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Blogas Laisvas/Užimtas Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Pranešimas nėra teisingai suformuotas"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Pranešime yra išvardinti tik nepalaikomi prašymai."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priede nėra tvarkingo kalendoriaus pranešimo"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Priede nėra peržiūrimų kalendoriaus elementų"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
-"nebeegzistuoja"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektas yra nepriimtinas ir negali būti atnaujintas\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Šis atsakymas yra ne nuo esamo dalyvio. Ar įtraukti siuntėją į dalyvių "
 "sąrašą?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes nurodytas neteisingas "
 "statusas!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Įvyko CORBA sistemos klaida\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objektas nerastas\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Jūs neturite teisių, būtinų atnaujinti kalendoriaus informaciją\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Dalyvio būsena negali būti atnaujinta!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
+"nebeegzistuoja"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elementas išsiųstas!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
@@ -6197,6 +6723,10 @@ msgstr "Įkeliamas kalendorius"
 msgid "Loading calendar..."
 msgstr "Įkeliamas kalendorius..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizatorius:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Serverio žinutė:"
@@ -6213,11 +6743,6 @@ msgstr "pradžios-data"
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Būtini dalyviai"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Nebūtini dalyviai"
@@ -6285,6 +6810,28 @@ msgstr "Pavestas"
 msgid "In Process"
 msgstr "Vykdomas"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y m. %B %e"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nesu darbe"
@@ -6293,98 +6840,64 @@ msgstr "Nesu darbe"
 msgid "No Information"
 msgstr "Nėra informacijos"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Įtraukti Siuntėją į Adresų _Knygą"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Parinktys"
+msgid "O_ptions"
+msgstr "Parinktys"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Rodyti tik _darbo valandas"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Rodyti _atitrauktą"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Atnaujinti Laisvas/Užimtas"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automatiškai parinkti"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Visi žmonės ir resursai"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Visi ž_monės ir vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Būtini žmonės"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Būtini žmonės ir _vienas resursas"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Susitikimo _pradžios laikas:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Susitikimo pa_baigos laikas:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y m. %B %e"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Įveskite „%s“ slaptažodį"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6393,117 +6906,51 @@ msgstr ""
 "Klaida tarp %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Įkeliamos užduotys"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys tarp %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Klaida atidarant %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Įkeliamos užduotys"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Išvaloma"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Užduotys"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Atnaujinami objektai"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Trinama"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendorius ir Užduotys"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Čia galima nustatyti savo laiko juostą, Kalendorių bei Užduočių Sąrašą "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalendorius ir Užduotys"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Kalendoriaus konfigūravimo priemonė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Kalendoriaus žinučių grafiko vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Kalendoriaus/Užduočių redaktorius"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution Kalendoriaus komponentas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution Užduočių komponentas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendoriai"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Užduotys"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -6853,10 +7300,6 @@ msgstr "Pasirinktas mėnuo (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Pasirinkti metai (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Užduotis"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6887,7 +7330,7 @@ msgid "Contacts: "
 msgstr "Kontaktai: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Spaudinio peržiūra"
 
@@ -6917,7 +7360,7 @@ msgstr[0] "%d kontaktai"
 msgstr[1] "%d kontaktai"
 msgstr[2] "%d kontaktai"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6939,35 +7382,29 @@ msgstr "Nepavyko atverti užduočių sąrašo „%s“ įvykių ir susitikimų k
 msgid "There is no calendar available for creating tasks"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Užduočių Sąrašo Grupė"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sukurti naują užduotį"
@@ -8646,69 +9083,69 @@ msgstr "Aplankas „%s“ ruošiamas atsijungusiam darbui"
 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:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Nepavyko sukurti nukreipimo į „%s“: %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Nepavyko paleisti antrinio proceso „%s“: %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Iš %s gautas netinkamai suformuotas laiškas: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sinchronizuojami aplankai"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Klaida nagrinėjant filtrą: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Klaida vykdant filtrą: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Negaliu atidaryti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Negaliu apdoroti kaupo aplanko"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Gaunamas laiškas %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Negaliu atidaryti laiško"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nesėkmė ties laišku %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sinchronizuojamas aplankas"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Gaunamas laiškas %d iš %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Nesėkmė ties laišku %d iš %d"
@@ -8730,42 +9167,6 @@ msgstr "Netinkami argumentai pateikti tarp (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paiešką: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepalaikoma operacija: įterpti laišką: dėl %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepalaikoma operacija: paieška pagal išraiška: skirta %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepalaikoma operacija: paieška pagal uid: skirta %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Perkeliami laiškai"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopijuojami pranešimai"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Keičiama šiukšlių žymė"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtruojami nauji pranešimai"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8811,7 +9212,43 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepalaikoma operacija: įterpti laišką: dėl %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepalaikoma operacija: paieška pagal išraiška: skirta %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepalaikoma operacija: paieška pagal uid: skirta %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Perkeliami laiškai"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopijuojami pranešimai"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Keičiama šiukšlių žymė"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtruojami nauji pranešimai"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8822,15 +9259,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepavyko apdoroti gpg userid patarimo."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepavyko apdoroti gpg slaptažodžio užklausos."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8839,30 +9276,30 @@ msgstr ""
 "Jūs turi pateikti slaptažodį, kuris atblokuoja raktą, skirtą\n"
 "vartotojui: „%s“"
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Nepavyko atblokuoti privataus rakto: tris kartus pateiktas blogas "
 "slaptažodis."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netikėtas atsakymas iš GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nepavyko užkoduoti: Nenurodyti tinkamo gavėjai."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8873,81 +9310,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG klaida %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nepavyko sukurti parašo duomenų: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepavyko paleisti gpg programos: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Nepavyko paleisti gpg programos."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ši laiško dalis yra pasirašyta skaitmeniniu būdu"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nepavyko patikrinti laiško parašo: Klaidingas laiško formatas"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nepavyko patikrinti laiško parašo: negalima sukurti laikinos bylos: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nepavyko sukurti užkoduojančių duomenų: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ši laiško dalis yra užkoduota skaitmeniu būdu"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Koduotas turinys"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Nepavyko apdoroti laiško turinio"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Negalėjau sukurti %s užrakto bylos: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Baigėsi laikas, belaukiant %s užrakto bylos. Bandyk vėliau."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nepavyko gauti užrakto naudojant fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nepavyko gauti užrakto naudojant flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8968,6 +9385,26 @@ msgstr "Nepavyko rezervuoti „%s“: rezervavimo pagalbininko protokolo klaida"
 msgid "Could not lock '%s'"
 msgstr "Negalėjau užrakinti '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Negalėjau sukurti %s užrakto bylos: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Baigėsi laikas, belaukiant %s užrakto bylos. Bandyk vėliau."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Nepavyko gauti užrakto naudojant fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Nepavyko gauti užrakto naudojant flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9222,7 +9659,7 @@ msgstr "Pateiktas mandatas yra pasenęs."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iš serverio."
 
@@ -9309,55 +9746,55 @@ msgstr "POP prieš SMTP auth naudoja ne pop šaltinį"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nepavyko sukompiliuoti reguliarios išraiškos: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL „%s“ turi būti su vartotojo vardu"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL „%s“ turi būti su hostu"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL „%s“ turi būti su keliu"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Atpažystamas: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nepavyko atpažinti vardo: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Adreso atpažinimas nepavyko: negalima sukurti jungties: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Adreso atpažinimo klaida: %s: adresas nerastas"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Adreso atpažinimo klaida: %s: nežinoma priežastis"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Atpažystamas adresas"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Adreso atpažinimo klaida: adresas nerastas"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Adreso atpažinimo klaida: nežinoma priežastis"
 
@@ -9433,7 +9870,7 @@ msgstr "Kodavimo sertifikatas:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
@@ -9523,7 +9960,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Tvarkingas parašas"
 
 #: camel/camel-smime-context.c:651
@@ -9538,48 +9975,47 @@ msgstr "Nepavyko IMAP komanda: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Sukur_ti Filtrą pagal Laišką"
+msgid "Cannot create CMS Message"
+msgstr "Negaliu atidaryti laiško"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Negaliu atidaryti laiško"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Negalėjau prisegti bylos %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Negalėjau prisegti bylos %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Negaliu atidaryti laiško"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9626,7 +10062,8 @@ msgstr "Negalima sukurti aplanko: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
@@ -9635,8 +10072,8 @@ msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 msgid "Trash"
 msgstr "Šiukšlės"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Šiukšlės"
 
@@ -9756,7 +10193,7 @@ msgstr "Raktas nepalaiko sertifikatų pasirašymo"
 msgid "Error in application verification"
 msgstr "Klaida tikrinant programą"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9769,11 +10206,11 @@ msgstr ""
 "Požymis:       %s\n"
 "Parašas:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GERAS"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "BLOGAS"
 
@@ -9797,7 +10234,7 @@ msgstr ""
 "Ar vis tiek norite priimti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9812,7 +10249,7 @@ msgstr ""
 "\n"
 "Ar vis tiek norite priimti?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9821,7 +10258,7 @@ msgstr ""
 "Sertifikato problema: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9830,7 +10267,7 @@ msgstr ""
 "Blogas sertifikato domenas: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9839,7 +10276,7 @@ msgstr ""
 "Sertifikatas pasenęs: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9848,7 +10285,7 @@ msgstr ""
 "Paseno sertifikatų atšaukimo sąrašas: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Negalėjau išnagrinėti URL „%s“"
@@ -9872,7 +10309,7 @@ msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
@@ -9893,8 +10330,8 @@ msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Patikrinti, ar yra naujų laiškų visuose aplankuose"
 
@@ -9926,8 +10363,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Skirtas pasiekti Novel Groupwise serverius"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9948,323 +10385,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "sąrašas"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Negalėjau gauti aplanko „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Serveris netikėtai atsijungė: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Negalėjau gauti aplanko „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Negalima sukurti aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Negalėjau gauti aplanko „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Negalėjau gauti aplanko „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Aplankai"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Rodyti tik užsakytus aplankus"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Pakeisti serverio pateiktą aplankų vardų zoną"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vardų zona"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
-"teksto slaptažodis."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP serveris %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP tarnyba, skirta %s tarp %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Negalėjau prisijungti prie %s (prievadas %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nepasiekiamas"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Jungtis nutraukta"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nežinoma klaida"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nepavyko prisijungti prie POP serverio %s. Nepalaikomas reikiamas "
-"autentifikacijos mechanizmas."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPrašom įvesti SMTP slaptažodį dėl %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Negalėjau gauti aplanko „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Negalima sukurti aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Komanda:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Negalima sukurti aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Negalima sukurti aplanko: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Nepateikta jokių duomenų"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serveris netikėtai atsijungė: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netikėtai atsijungė: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nežinoma klaida"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10333,7 +10475,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10405,6 +10547,27 @@ msgstr "Naudoti specialią jungties prie serverio komandą"
 msgid "Command:"
 msgstr "Komanda:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Aplankai"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Rodyti tik užsakytus aplankus"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Pakeisti serverio pateiktą aplankų vardų zoną"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Vardų zona"
+
 #: 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"
@@ -10427,43 +10590,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP serveris %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP tarnyba, skirta %s tarp %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Negalėjau prisijungti prie %s (prievadas %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nepasiekiamas"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Jungtis nutraukta"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS išplėtimas nepalaikomas."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL komunikacijų klaida"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nepavyko prisijungti naudojant komandą „%s“: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s nepalaiko prašyto autentikacijos tipo %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPrašom įvesti IMAP slaptažodį dėl %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Tu neįvedei slaptažodžio."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10473,30 +10685,282 @@ msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nėra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Tėvinis aplankas negali turėti vaikinių aplankų"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nežinomas aukštesnysis aplankas: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Serveris netikėtai atsijungė: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
+"teksto slaptažodis."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nepavyko prisijungti prie POP serverio %s. Nepalaikomas reikiamas "
+"autentifikacijos mechanizmas."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPrašom įvesti SMTP slaptažodį dėl %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Komanda:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Nepateikta jokių duomenų"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serveris netikėtai atsijungė: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10668,18 +11132,26 @@ msgstr "Negalėjau išsaugoti santraukos: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nepavyko pridėti laiško į santrauką: nežinoma priežastis"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Gauti laiškai"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Laiško patalpinimas tarp maildir atšauktas"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Negalėjau pridurti laiško prie maildir aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10695,48 +11167,48 @@ msgstr ""
 "Negaliu gauti laiško: %s iš aplanko %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Blogas laiško turinys"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Negalėjau gauti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nėra tokio aplanko „%s“."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "„%s“ nėra maildir katalogas."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Negalėjau ištrinti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11323,20 +11795,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nepavyko prisijungti prie POP serverio %s (prievadas %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nepavyko prisijungti prie POP serverio %s saugiu režimu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nepavyko prisijungti prie POP serverio %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11345,28 +11822,28 @@ msgstr ""
 "Nepavyko prisijungti prie POP serverio %s. Nepalaikomas reikiamas "
 "autentifikacijos mechanizmas."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL „%s“ prisijungimas prie POP serverio %s nepavyko: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Nepavyko prisijungti prie POP serverio %s: SASL protokolo klaida"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sĮveskite POP slaptažodį, skirtą %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11375,7 +11852,16 @@ msgstr ""
 "Nepavyko prisijungti prie POP serverio %s.\n"
 "Klaida siunčiant slaptažodį: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nepavyko prisijungti prie POP serverio %s.\n"
+"Klaida siunčiant slaptažodį: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nėra tokio aplanko „%s“."
@@ -11589,97 +12075,97 @@ msgstr ""
 "Negalėjau autentikuotis į SMTP serverį.\n"
 "%s\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pašto siuntimas per %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Negaliu siųsti laiško: neapibrėžti jokie gavėjai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Siunčiamas laiškas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Negaliu siųsti laiško: neapibrėžti jokie gavėjai."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nepavyko išsiųsti laiško: dalis adresatų yra neteisingi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP pasveikinimas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP autentikacija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Klaida sukuriant SASL autentikacijos objektą."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Blogas autentikacijos atsakymas iš serverio.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Baigėsi MAIL FROM užklausos laiko riba: %s: paštas neišsiųstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Baigėsi RCPT TO užklausos laiko riba: %s: paštas neišsiųstas"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> klaida"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Baigėsi DATA užklausos laiko riba: %s: paštas neišsiųstas"
@@ -11687,28 +12173,28 @@ msgstr "Baigėsi DATA užklausos laiko riba: %s: paštas neišsiųstas"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Nepavyko IMAP komanda: %s"
@@ -11772,105 +12258,6 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasiūlyti automatinį priedo parodymą"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Negalima pasirašyti išsiunčiamo laiško: Nenustatytas šios sąskaitos parašo "
-"sertifikatas"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
-"sertifikatas"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nepavyko atidaryti bylos"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nepavyko gauti laiško iš redaktoriaus"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Keletas laiškų"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Atidaryti bylą"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogeneruotas"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Parašas:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Prikabinta Byla"
-msgstr[1] "<b>%d</b> Prikabintos Bylos"
-msgstr[2] "<b>%d</b> Prikabinta Bylų"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Rodyti _Priedų Juostą (meskite priedus čia)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Sukurti laišką"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Nepavyko sukurti laiškų rašymo lango:\n"
-"Nepavyko aktyvuoti adresų pasirinkimo valdymo."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Negalėjau sukurti rašyklės lango:\n"
-"Nepavyko aktyvuoti HTML redaktoriaus komponento.\n"
-"Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
-"libgtkhtml versijos.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Negalėjau sukurti rašyklės lango:\n"
-"Nepavyko aktyvuoti HTML redaktoriaus komponento."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Laiško rašymo langas turi netekstinį neredaguotiną laiško tekstą.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Paskirties vieta"
@@ -11951,17 +12338,97 @@ msgstr "Spausk čia, kad pasirinktum aplanką"
 msgid "Attach file(s)"
 msgstr "Prisegti bylą(as)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Negalima pasirašyti išsiunčiamo laiško: Nenustatytas šios sąskaitos parašo "
+"sertifikatas"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
+"sertifikatas"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nepavyko atidaryti bylos"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nepavyko gauti laiško iš redaktoriaus"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Keletas laiškų"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Atidaryti bylą"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogeneruotas"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Parašas:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Prikabinta Byla"
+msgstr[1] "<b>%d</b> Prikabintos Bylos"
+msgstr[2] "<b>%d</b> Prikabinta Bylų"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Rodyti _Priedų Juostą (meskite priedus čia)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sukurti laišką"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Persiųstas laiškas - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Pridėti originalų laišką"
+msgstr[1] "Pridėti originalų laišką"
+msgstr[2] "Pridėti originalų laišką"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Laiško rašymo langas turi netekstinį neredaguotiną laiško tekstą.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Prisegti bylą prie šio laiško"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11979,54 +12446,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Negalėjau sukurti pipe: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Neskaitytos žinutės"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Ar nori išsaugoti pakeitimus?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Neimportuoti"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Pašalinti"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Klaida išsaugant trumpes."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Įspėjimas: Pakeistas laiškas"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12034,59 +12515,76 @@ msgid ""
 msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Atsikratyti Pakeitimų"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Išsaugoti Laišką..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Negalėjau sukurti pipe: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Jūs turite nustatyti savo pašto sąskaitos parametrus prieš pradėdami kurti "
 "laiškus."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Negalėjau sukurti pipe: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nepavyko sukurti laiškų rašymo lango:\n"
+"Nepavyko aktyvuoti adresų pasirinkimo valdymo."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Negalėjau sukurti rašyklės lango:\n"
+"Nepavyko aktyvuoti HTML redaktoriaus komponento.\n"
+"Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
+"libgtkhtml versijos.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Ximian Evolution Grupinio Darbo Programa"
@@ -12392,11 +12890,6 @@ msgstr "%Y %m %d"
 msgid "Select a time to compare against"
 msgstr "Pasirink laiką, su kuriuo palyginti"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Filtravimo taisyklės"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12425,19 +12918,8 @@ msgstr "Jūs turite nurodyti bylos vardą."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Byla „%s“ neegzistuoja arba nėra standartinė byla."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Trinamas aplankas %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Jūs turite nurodyti aplanką."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12445,158 +12927,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Priskyrimas"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Jūs turite suteikti šiam filtrui vardą."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Jūs turite įvardinti ši virtualų aplanką."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Joks serveris nepasirinktas"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Pasirinkite bylą"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Laikas</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Pasirink aplanką"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Filtravimo taisyklės"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "vAplankų šaltiniai"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Palyginti su"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Gaunamas"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Laiško data bus palyginta su nurodytos datos\n"
-"vidurdieniu."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Laiško data bus palyginta su laiku, santykiniu\n"
-"filtro paleidimo laikui."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Laiško data filtravimo metu bus palyginta su \n"
-"dabar esančiu laiku."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "laikas, santykinis esamam laikui"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr " "
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mėnesių"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekundžių"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "tik nurodyti aplankai"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "esamas laikas"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "Jūsų nurodytas laikas"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "su visais aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "su visais vietiniais aplankais"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "metų"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Svarbus"
 
@@ -12666,6 +13027,71 @@ msgstr "gaunamas"
 msgid "outgoing"
 msgstr "siunčiamas"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtravimo taisyklės"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Palyginti su"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Gaunamas"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Laiško data bus palyginta su nurodytos datos\n"
+"vidurdieniu."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Laiško data bus palyginta su laiku, santykiniu\n"
+"filtro paleidimo laikui."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Laiško data filtravimo metu bus palyginta su \n"
+"dabar esančiu laiku."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "laikas, santykinis esamam laikui"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr " "
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mėnesių"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekundžių"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "esamas laikas"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "Jūsų nurodytas laikas"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "metų"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pridėti taisyklę"
@@ -12678,60 +13104,74 @@ msgstr "Keisti taisyklę"
 msgid "Rule name"
 msgstr "Taisyklės pavadinimas"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Įverčio taisyklės"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Įvertis"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Rašymo Nuostatos"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Laiške yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Čia gali valdyti įvairius pašto nustatymus, įskaitant saugumą bei laiškų "
+"rodymą"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Laiške nėra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Čia galima valdyti rašybos tikrinimą, parašus ir kitus laiškų rašymo "
+"nustatymus"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Laiške arba temoje yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Čia galite nustatyti savo turimas pašto sąskaitas"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Žinutėje yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Paštas"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Gavėjų sąraše yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Pašto sąskaitų nustatymų valdyklė"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Siuntėjo lauke yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Pašto komponentas"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Temoje yra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Pašto rašyklė"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Temoje nėra"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Pašto rašymo nustatymų valdymas"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtualūs aplankai"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Pašto nustatymų valdymas"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Pridėti"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Paštas"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder išeities tekstas"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Pašto Sąskaitos"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Pašto Nustatymai"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_El. paštas:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12764,45 +13204,314 @@ msgstr "_Pridėti Parašą"
 msgid "Signature(s)"
 msgstr "Parašas(ai)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas Laiškas --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y %m %d %H:%M %%+05d, %%s rašė:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Filtravimo taisyklės"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Pasirink aplanką"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Adjust Score"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Priskirti spalvą"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Priskirti įvertį"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Priedai"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Signalas"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "turi savyje"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopijuoti į aplanką"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Gavimo data"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Siuntimo data"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Ištrintas"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "neturi savyje"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "nesibaigia"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "neegzistuoja"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "negražina"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "neskamba panašiai į"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "neprasideda su"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "neegzistuoja"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Juodraštis"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "baigiasi su"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Egzistuoja"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "egzistuoja"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Išraiška"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Tęsinys"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "yra"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "yra po"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "yra prieš"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "yra pažymėtas"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "yra didesnis už"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "yra mažesnis už"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nėra"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nėra pažymėtas"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Birželis"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Užrašas"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Konferencija"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Laiško tekstas"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Laiško antraštė"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Laiškai"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Atšaukti Šiukšlės _Pažymėjimą"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Perkelti į aplanką"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Išeiti iš programos"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Groti garsą"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Skaitytas"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Gavėjai"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regex tenkina"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Atsakytas"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "gražina"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "gražina reikšmę didesnę už"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "gražina reikšmę mažesnę už"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Paleisti programą:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Įvertis"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Siuntėjas"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Priskirti būseną"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Dydis (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "skamba panašiai į"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Šaltinio sąskaita"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Savita antraštė"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "prasideda su"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Sustabdyti vykdymą"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Tema"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Atšaukti Būseną"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Laikas</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _Virtualų Aplanką pagal Paiešką..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Aplanko savybės"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Savybės"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Aplanko Vardas"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Viso žinučių"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Viso žinučių"
+msgstr[1] "Viso žinučių"
+msgstr[2] "Viso žinučių"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Neskaitytos žinutės"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Neskaitytos žinutės"
+msgstr[1] "Neskaitytos žinutės"
+msgstr[2] "Neskaitytos žinutės"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12812,459 +13521,298 @@ msgstr "<spausk čia, kad pasirinktum aplanką>"
 msgid "Create New Folder"
 msgstr "Sukurti Naują Aplanką"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplanką:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "vAplankai"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Įkeliama..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti į aplanką"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Perkelti į aplanką"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Atšaukti užduotį"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopijuoti"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Pervadinti Aplanką"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Rodyti"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Atidaryti _Naujame Lange"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopijuoti"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Perkelti"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Naujas Aplankas..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "Pe_rvadinti"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Savybės..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "vAplankai"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Gauti laiškai"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Įkeliama..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Paštas"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Tęsinys..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Pažymėti Bai_gtu"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Atša_ukti Pažymėjimą"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Pažymėti s_kaitytu"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Pažymėti _Neskaitytu"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Pažymėti Nes_varbiu"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Pažymėti kaip _Šiukšlę"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Atšaukti Šiukšlės _Pažymėjimą"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti į Aplanką..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Užrašas"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Įtraukti Siuntėją į Adresų _Knygą"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Pritaik_yti Filtrus"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtravimo taisyklės"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Sukur_ti Filtrą pagal Laišką"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Temą"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntėją"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gavėjus"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferenciją"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emą"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untėją"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vėjus"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Įprastas"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Kopijuoti Nuorodą"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Paspauskite, kad išsiųsti %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Nuo"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Atsakyti-kam"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kam"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Tema"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s priedas"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Nepalaikomas parašo formatas"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Nežinoma klaida tikrinant parašą"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nežinoma klaida tikrinant parašą"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Gaunama „%s“"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Nepasirašytas"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Tvarkingas parašas"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Netvarkingas parašas"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Nekoduotas"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Silpnai koduotas"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Koduotas"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Smarkiai užkoduotas"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Blogai suformuota išorinio kūno dalis."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Rodyklė į FTP svetainę (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Rodyklė į vietinę bylą (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Rodyklė į nutolusius duomenis (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Laiškas formatuojamas"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Pašto programa"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Atitinka: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Nepasirašytas"
+
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13273,7 +13821,11 @@ msgstr ""
 "Šis laiškas nėra pasirašytas. Nėra jokių garantijų, kad laiško siuntėjas yra "
 "būtent tas asmuo, kurio vardas įrašytas laiške."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Tvarkingas parašas"
+
+#: mail/em-format-html-display.c:642
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13282,7 +13834,11 @@ msgstr ""
 "Šis laiškas yra tvarkingai pasirašytas. Laiško siuntėjas turėtų būti būtent "
 "tas, kuo teigia esąs."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Netvarkingas parašas"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13290,11 +13846,11 @@ msgstr ""
 "Laiško parašas negali būti patikrintas, laiškas galėjo būti pakeistas "
 "persiuntimo metu."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13302,7 +13858,11 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Nekoduotas"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13311,7 +13871,11 @@ msgstr ""
 "Šis laiškas nėra koduotas. Jo turinys galėjo būti perskaitytas siuntimo "
 "tinkle metu."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Silpnai koduotas"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13320,7 +13884,11 @@ msgstr ""
 "Laiškas yra užkoduotas, bet naudoja silpną kriptografinį algoritmą. "
 "Įsilaužėlis gali per pakankamai trumpą laiką atkoduoti laiško turinį."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Koduotas"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13328,7 +13896,11 @@ msgstr ""
 "Šis laiškas yra užkoduotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Smarkiai užkoduotas"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13338,41 +13910,165 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Peržiūrėti Sertifikatą"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Praleistos užduotys:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Žiūrėti Kontekste"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Slėpti"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Puslapis %d iš %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Gaunama „%s“"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Blogai suformuota išorinio kūno dalis."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Rodyklė į FTP svetainę (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Rodyklė į vietinę bylą (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Rodyklė į nutolusius duomenis (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Laiškas formatuojamas"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Nuo"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Atsakyti-kam"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kam"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Pašto programa"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s priedas"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepalaikomas parašo formatas"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nežinoma klaida tikrinant parašą"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nežinoma klaida tikrinant parašą"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (vidinis)"
@@ -13487,7 +14183,7 @@ msgstr "Siųsti laišką _kitam..."
 msgid "_Add to Addressbook"
 msgstr "Įtraukti į Adresų Knygą"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
@@ -13501,7 +14197,7 @@ msgstr "Ši saugykla nepalaiko užsakymų arba jie yra neįjungti."
 msgid "Subscribed"
 msgstr "Užsakytos"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Aplankas"
 
@@ -13535,11 +14231,24 @@ msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtualūs aplankai"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Pridėti"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder išeities tekstas"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatinis nuorodų atpažinimas"
@@ -14026,67 +14735,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importuoti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Rašymo Nuostatos"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Čia gali valdyti įvairius pašto nustatymus, įskaitant saugumą bei laiškų "
-"rodymą"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Čia galima valdyti rašybos tikrinimą, parašus ir kitus laiškų rašymo "
-"nustatymus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Čia galite nustatyti savo turimas pašto sąskaitas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution Paštas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Pašto sąskaitų nustatymų valdyklė"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution Pašto komponentas"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importavimo priemonė"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Pašto rašyklė"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importavimo priemonė"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Pašto rašymo nustatymų valdymas"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importavimo priemonė"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Pašto nustatymų valdymas"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importavimo priemonė"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Pašto Sąskaitos"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importavimo priemonė"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Pašto Nustatymai"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_El. paštas:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14148,34 +14823,6 @@ msgstr "Importuojama"
 msgid "Importing mailbox"
 msgstr "Importuojamos bylos"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importavimo priemonė"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14342,80 +14989,93 @@ msgstr "%s konferencija"
 msgid "Add Filter Rule"
 msgstr "Pridėti filtro taisyklę"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Ištrintas"
+msgid_plural "%d deleted"
+msgstr[0] "Ištrintas"
+msgstr[1] "Ištrintas"
+msgstr[2] "Ištrintas"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d dienų"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d dienų"
+msgstr[1] "%d dienų"
+msgstr[2] "%d dienų"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d sekundžių"
+msgid_plural "%d sent"
+msgstr[0] "%d sekundžių"
+msgstr[1] "%d sekundžių"
+msgstr[2] "%d sekundžių"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d sekundžių"
+msgid_plural "%d unsent"
+msgstr[0] "%d sekundžių"
+msgstr[1] "%d sekundžių"
+msgstr[2] "%d sekundžių"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "%d kontaktai"
+msgid_plural "%d total"
+msgstr[0] "%d kontaktai"
+msgstr[1] "%d kontaktai"
+msgstr[2] "%d kontaktai"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Naujas vAplankas"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pašto Filtrai"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sukurti naują kalendorių"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Tikrinama paslauga"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Jungiamasi prie serverio..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Asmenybė"
@@ -14478,15 +15138,23 @@ msgstr ""
 "sąskaitą. Prašome įvesti šios sąskaitos pavadinimą žemiau esančiame "
 "laukelyje. Šis pavadinimas bus naudojamas tik vaizdavimui."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tikrinama paslauga"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Jungiamasi prie serverio..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Peržiūra</b>"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14761,7 +15429,7 @@ msgstr "Necituoti pradinio laiško"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Nepasirašyti susitiki_mų užklausimų (dėl suderinamumo su Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Baigta"
 
@@ -15122,6 +15790,119 @@ msgstr "spalva"
 msgid "description"
 msgstr "aprašymas"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vAplankų šaltiniai"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Priimtas"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Užbaigta"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Skirti raidžių dydį"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Ieškoti laiške"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Rasti:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Pažymėti kaip Tęsinį"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Aplankų Užsakymai"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Rakto Sutartis"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Niekas Nepasirinkta"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erveris:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Saugumo Informacija"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Laiškai, kuriuos Jūs pažymėjote kaip tęsinius, yra išvardinti žemiau.\n"
+"Pasirinkite tęsiniams galiojančius veiksmus iš „Žymių“ meniu."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Sąskaitų sąrašas"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Baigiasi:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Žymė:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Užsakyti"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Atsisakyti"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "tik nurodyti aplankai"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "su visais aktyviais nutolusiais aplankais"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "su visais vietiniais ir aktyviais nutolusiais aplankais"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "su visais vietiniais aplankais"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15330,14 +16111,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15440,8 +16213,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Nepavyko perkelti aplanko: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15492,8 +16266,9 @@ msgstr "Nepavyko atidaryti „%s“: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "ir likusį kontaktą."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15522,8 +16297,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Neištrinti"
+msgstr "S_ugrąžinti"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15587,8 +16363,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Negalėjau ištrinti aplanko:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15630,13 +16409,44 @@ msgstr ""
 "    '%s'\n"
 "Ir buvo atnaujinti."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Trinamas aplankas %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Jūs turite nurodyti aplanką."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Jūs turite įvardinti ši virtualų aplanką."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Joks serveris nepasirinktas"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15644,16 +16454,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Perrašyti"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Siųsti"
@@ -15817,7 +16627,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15826,45 +16636,21 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Skirti raidžių dydį"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Ieškoti laiške"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Rasti:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Saugumo Informacija"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Nutraukiama..."
@@ -15900,24 +16686,24 @@ msgstr "Atnaujinama..."
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Įvesk slaptažodį"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "P_risiminti šį slaptažodį iki šios sesijos galo"
 
@@ -15974,15 +16760,15 @@ msgstr "Atnaujinami vAplankai pagal uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
@@ -16046,7 +16832,7 @@ msgstr "%b %d %H:%M"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -16102,10 +16888,6 @@ msgstr "Persiųsti"
 msgid "No Response Necessary"
 msgstr "Atsakymas Nebūtinas"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Skaitytas"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atsakyti"
@@ -16118,50 +16900,49 @@ msgstr "Atsakyti visiems"
 msgid "Review"
 msgstr "Peržiūra"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Pažymėti kaip Tęsinį"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Laiške yra"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Užbaigta"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Laiške nėra"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Laiškai, kuriuos Jūs pažymėjote kaip tęsinius, yra išvardinti žemiau.\n"
-"Pasirinkite tęsiniams galiojančius veiksmus iš „Žymių“ meniu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Laiške arba temoje yra"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Baigiasi:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Žinutėje yra"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Žymė:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Gavėjų sąraše yra"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Aplankų Užsakymai"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Siuntėjo lauke yra"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Niekas Nepasirinkta"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Temoje yra"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erveris:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Temoje nėra"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Užsakyti"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Apvalkalas"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Atsisakyti"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution bandymas"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Testavimo komponentas"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16228,31 +17009,18 @@ msgstr "Ar nerodyti bandomosios versijos perspėjimų lango"
 msgid "mail"
 msgstr "paštas"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%B %d"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Nežinoma klaida"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Blogi argumentai"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Negaliu užsiregistruoti OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Esamos Jungtys"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Konfigūracijos duombazė nerasta"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Esamos Jungtys"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Bendroji klaida"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Paspausk Gerai, kad uždarytum šias jungtis ir atsijungtum"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16440,30 +17208,6 @@ msgstr "Aplanko varde negali būti simbolio „#“."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalogų vardai."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution dabar yra atsijungimo procese."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Laiškai į %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Atrodo, kad GNOME Pilot įrankiai nėra įdiegti į šią sistemą"
@@ -16481,110 +17225,94 @@ msgstr "Bug buddy neįdiegtas."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalėjo būti paleistas."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupė"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Pasirinkimo laukas"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nauja"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Naujas bandymas"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Bandyti"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
+"Ximian Evolution dabar yra prisijungusi.  Paspausk šį mygtuką, kad dirbtum "
+"atsijungus."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Esamos Jungtys"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Esamos Jungtys"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution dabar yra atsijungusi.  Paspausk šį mygtuką, kad dirbtum "
+"prisijungus."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Paspausk Gerai, kad uždarytum šias jungtis ir atsijungtum"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Laiškai į %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendorius:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontaktai: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_El. paštas:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Užduotys:"
+msgid "Uknown system error."
+msgstr "Nežinoma klaida"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Aplanko _tipas:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Blogi argumentai"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Atidaryti Kito Vartotojo Aplanką"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Negaliu užsiregistruoti OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Sąsk_aita:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfigūracijos duombazė nerasta"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Aplanko Vardas:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Bendroji klaida"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Vartotojas:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nauja"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Nustatymo Pagalbininkas"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importuojamos bylos"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Laiko juosta"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Sveiki"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16598,7 +17326,7 @@ msgstr ""
 "\n"
 "Pasirinkite „Tęsti“ mygtuką, norėdami pratęsti. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16610,17 +17338,17 @@ msgstr ""
 "\n"
 "Pasirinkite „Pritaikyti“ mygtuką, kad išsaugoti savo nustatymus. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Apvalkalas"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Naujas bandymas"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution bandymas"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Bandyti"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Testavimo komponentas"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr ""
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16685,7 +17413,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis iš žemiau nurodytų bylų:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16721,7 +17449,7 @@ msgstr ""
 "Mes tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir\n"
 "laukiame Jūsų prisidėjimo prie šio produkto tobulinimo!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16730,39 +17458,39 @@ msgstr ""
 "Ačiū\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Kitą kartą nebeklausti"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution paleidimas aktyvuoja nurodytą komponentą"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Paleisti neprisijungiant"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Paleisti prisijungiant"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Priverstinai uždaryti visus Evolution komponentus"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į bylą."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16837,6 +17565,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -17083,6 +17833,11 @@ msgstr "Jūsų Sertifikatai"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Toks sertifikatas jau yra"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y %m %d"
@@ -17284,11 +18039,6 @@ msgstr "Unikalus Temos ID"
 msgid "Certificate Signature Value"
 msgstr "Sertifikato Parašo Vertė"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Toks sertifikatas jau yra"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bylos Slaptažodis"
@@ -17429,8 +18179,8 @@ msgstr "Rodyti esamą kontaktą"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Veiksmai"
@@ -17907,16 +18657,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:5
-msgid "Close this window"
-msgstr "Uždaryti šį langą"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Uždaryti"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18322,6 +19062,16 @@ msgstr "Įran_kiai"
 msgid "_Undelete"
 msgstr "S_ugrąžinti"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Uždaryti šį langą"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Uždaryti"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
@@ -18404,10 +19154,6 @@ msgstr "Išsaugoti esamą bylą kitokiu vardu"
 msgid "Save the message in a specified folder"
 msgstr "Išsaugoti laišką į nurodytą aplanką"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Siųsti"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18979,7 +19725,7 @@ msgid "Evolution Query"
 msgstr "Evolution bandymas"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19137,27 +19883,259 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% užbaigta)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Blogas autentikacijos atsakymas iš serverio."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Rodomas vardas:"
+
+#, fuzzy
+#~ msgid "URL:"
+#~ msgstr "URL"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Išsaugoti Sąrašą tarp VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Grupė"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Negalėjau paleisti wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alendorius"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Perspėjimų garsu parinktys"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Perspėjimų pranešimu parinktys"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "El. pašto Aliarmų Nuostatos"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Perspėjimų programa parinktys"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Nežinomų perspėjimų parinktys"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Aliarmo pasikartojimas"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Rodoma žinutė:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Siunčiama Žinutė"
+
+#~ msgid "Play sound:"
+#~ msgstr "Groti garsą:"
+
+#~ msgid "Run program:"
+#~ msgstr "Paleisti programą:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Su tokiais argumentais:"
+
+#~ msgid "Basics"
+#~ msgstr "Pagrindai"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Laikas:"
+
+#~ msgid "Reminders"
+#~ msgstr "Priminėjai"
+
+#~ msgid "_Options..."
+#~ msgstr "_Parinktys..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresų knygelė..."
+
+#~ msgid "Reminder"
+#~ msgstr "Užuomina"
+
+#~ msgid "B_usy"
+#~ msgstr "_Užimtas"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Ko_nfidencialus"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data ir laikas"
+
+#~ msgid "F_ree"
+#~ msgstr "_Laisvas"
+
+#~ msgid "Pri_vate"
+#~ msgstr "As_meniškas"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Viešas"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Pridė_ti Dalyvį"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Įtraukti Siuntėją į Adresų _Knygą"
+
+#~ msgid "Exceptions"
+#~ msgstr "Išimtys"
+
+#~ msgid "Preview"
+#~ msgstr "Peržiūra"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pakartojimo taisyklė"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Kitoks pakartojimas"
+
+#~ msgid "_Modify"
+#~ msgstr "_Keisti"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Jokio pakartojimo"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Paprastas pakartojimas"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Baigta"
+
+#~ msgid "Progress"
+#~ msgstr "Progresas"
+
+#~ msgid "Con_fidential"
+#~ msgstr "S_laptas"
+
+#~ msgid "Folder:"
+#~ msgstr "Aplankas:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Pradžia:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Pabaiga:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Baigta:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Iki:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Joks</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Įvyko CORBA sistemos klaida\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objektas nerastas\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Jūs neturite teisių, būtinų atnaujinti kalendoriaus informaciją\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Dalyvio būsena negali būti atnaujinta!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Įtraukti Siuntėją į Adresų _Knygą"
+
+#~ msgid "_Options"
+#~ msgstr "_Parinktys"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Susitikimo _pradžios laikas:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Susitikimo pa_baigos laikas:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Klaida atidarant %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Negalima sukurti aplanko: %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Sukur_ti Filtrą pagal Laišką"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Negalėjau sukurti rašyklės lango:\n"
+#~ "Nepavyko aktyvuoti HTML redaktoriaus komponento."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Įverčio taisyklės"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%Y %m %d %H:%M %%+05d, %%s rašė:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Aplanko Vardas"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Savybės..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Pasirinkimo laukas"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendorius:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontaktai: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_El. paštas:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Užduotys:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Aplanko _tipas:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Atidaryti Kito Vartotojo Aplanką"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Aplanko Vardas:"
+
+#~ msgid "_User:"
+#~ msgstr "_Vartotojas:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nepavyko susisiekti su LDAP serveriu"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Nepavyko autentifikavimasis su LDAP serverių"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Negalima daryti užklausos tarp pagrindinio DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Serveris nepateikė tinkamų paieškos platformų"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Klaida gaunant schemų informaciją"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Serveris nepateikė tvarkingos schemų informacijos"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  _Rodyti Palaikomas Bazes "
 
@@ -19230,9 +20208,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Webcam:"
 #~ msgstr "Tinklalapis:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategorijų redaktorius nepasiekiamas."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19282,9 +20257,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ "Trinamas įvykis yra susitikimas. Ar Jūs norite pasiųsti atšaukimo "
 #~ "pranešimą?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį susitikimą?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19302,48 +20274,15 @@ msgstr "%s (%d%% užbaigta)"
 #~ "Trinamas žurnalo įrašas yra viešai paskelbtas. Ar norite pasiųsti "
 #~ "atšaukimo pranešimą?"
 
-#~ 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šą?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Ar tu tikrai nori ištrinti šią bevardę užduotį?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Ar tu tikrai nori ištrinti šį bevardį žurnalo įrašą?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Ar tu tikrai nori ištrinti %d įvykių?"
-#~ msgstr[1] "Ar tu tikrai nori ištrinti %d įvykių?"
-#~ msgstr[2] "Ar tu tikrai nori ištrinti %d įvykių?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Ar tu tikrai nori ištrinti %d užduočių?"
-#~ msgstr[1] "Ar tu tikrai nori ištrinti %d užduočių?"
-#~ msgstr[2] "Ar tu tikrai nori ištrinti %d užduočių?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-#~ msgstr[1] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-#~ msgstr[2] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "Pakv_iesti kitus..."
 
@@ -19375,9 +20314,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "The task information has changed. Send an updated version?"
 #~ msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Negalėjau gauti straipsnio %s iš NNTP serverio"
-
 #~ msgid "Connection error: %s"
 #~ msgstr "Jungimosi klaida: %s"
 
@@ -19391,179 +20327,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Nežinomas serverio atsakymas: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Adjust Score"
-
-#~ msgid "Assign Color"
-#~ msgstr "Priskirti spalvą"
-
-#~ msgid "Assign Score"
-#~ msgstr "Priskirti įvertį"
-
-#~ msgid "Attachments"
-#~ msgstr "Priedai"
-
-#~ msgid "Beep"
-#~ msgstr "Signalas"
-
-#~ msgid "contains"
-#~ msgstr "turi savyje"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopijuoti į aplanką"
-
-#~ msgid "Date received"
-#~ msgstr "Gavimo data"
-
-#~ msgid "Date sent"
-#~ msgstr "Siuntimo data"
-
-#~ msgid "Deleted"
-#~ msgstr "Ištrintas"
-
-#~ msgid "does not contain"
-#~ msgstr "neturi savyje"
-
-#~ msgid "does not end with"
-#~ msgstr "nesibaigia"
-
-#~ msgid "does not exist"
-#~ msgstr "neegzistuoja"
-
-#~ msgid "does not return"
-#~ msgstr "negražina"
-
-#~ msgid "does not sound like"
-#~ msgstr "neskamba panašiai į"
-
-#~ msgid "does not start with"
-#~ msgstr "neprasideda su"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "neegzistuoja"
-
-#~ msgid "Draft"
-#~ msgstr "Juodraštis"
-
-#~ msgid "ends with"
-#~ msgstr "baigiasi su"
-
-#~ msgid "Exist"
-#~ msgstr "Egzistuoja"
-
-#~ msgid "exists"
-#~ msgstr "egzistuoja"
-
-#~ msgid "Expression"
-#~ msgstr "Išraiška"
-
-#~ msgid "Follow Up"
-#~ msgstr "Tęsinys"
-
-#~ msgid "is"
-#~ msgstr "yra"
-
-#~ msgid "is after"
-#~ msgstr "yra po"
-
-#~ msgid "is before"
-#~ msgstr "yra prieš"
-
-#~ msgid "is Flagged"
-#~ msgstr "yra pažymėtas"
-
-#~ msgid "is greater than"
-#~ msgstr "yra didesnis už"
-
-#~ msgid "is less than"
-#~ msgstr "yra mažesnis už"
-
-#~ msgid "is not"
-#~ msgstr "nėra"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nėra pažymėtas"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Birželis"
-
-#~ msgid "Mailing list"
-#~ msgstr "Konferencija"
-
-#~ msgid "Message Body"
-#~ msgstr "Laiško tekstas"
-
-#~ msgid "Message Header"
-#~ msgstr "Laiško antraštė"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "_Laiškai"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Atšaukti Šiukšlės _Pažymėjimą"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Perkelti į aplanką"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Išeiti iš programos"
-
-#~ msgid "Play Sound"
-#~ msgstr "Groti garsą"
-
-#~ msgid "Recipients"
-#~ msgstr "Gavėjai"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regex tenkina"
-
-#~ msgid "Replied to"
-#~ msgstr "Atsakytas"
-
-#~ msgid "returns"
-#~ msgstr "gražina"
-
-#~ msgid "returns greater than"
-#~ msgstr "gražina reikšmę didesnę už"
-
-#~ msgid "returns less than"
-#~ msgstr "gražina reikšmę mažesnę už"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Paleisti programą:"
-
-#~ msgid "Sender"
-#~ msgstr "Siuntėjas"
-
-#~ msgid "Set Status"
-#~ msgstr "Priskirti būseną"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Dydis (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "skamba panašiai į"
-
-#~ msgid "Source Account"
-#~ msgstr "Šaltinio sąskaita"
-
-#~ msgid "Specific header"
-#~ msgstr "Savita antraštė"
-
-#~ msgid "starts with"
-#~ msgstr "prasideda su"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Sustabdyti vykdymą"
-
-#~ msgid "Unset Status"
-#~ msgstr "Atšaukti Būseną"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "Pat_ikrinti Gautą Paštą"
 
@@ -19794,9 +20557,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Finished"
 #~ msgstr "Baigta"
 
-#~ msgid "Group:"
-#~ msgstr "Grupė:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20334,9 +21094,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "component"
 #~ msgstr "komponentas"
 
-#~ msgid "Alarms"
-#~ msgstr "Perspėjimai"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Geografinė vietovė"
 
@@ -20870,9 +21627,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Could not create a directory for the new addressbook."
 #~ msgstr "Nepavyko sukurti naujos adresų knygos katalogo."
 
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Pasirinkti Lontaktus iš Adresų Knygos"
-
 #~ msgid "Birthdays"
 #~ msgstr "Gimtadieniai"
 
@@ -20912,18 +21666,9 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Aliarmo Veiksmas</b>"
 
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Aliarmo Garsas</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Data ir Laikas</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Aprašymas</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Sa_ntrauka</b>"
 
diff --git a/po/lv.po b/po/lv.po
index 2f025f6c0d..8e2143baab 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2003-02-03 23:02+0200\n"
 "Last-Translator: Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -21,16 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Rediģēt adrešu grāmatau"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakti:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution _logs"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -56,35 +46,263 @@ msgstr "kartes"
 msgid " card"
 msgstr "1 karte"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakti:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _logs"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kursors nevarēja tikt ieladēts\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nespēju autentificēties ar LDAP serveri"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nevarēju pieprasīt informāciju par shēmu"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nevarēju ielādēt %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategoriju redaktors nav pieejams."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Saglabāt adrešu grāmatā"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Kļūda ielādējot noklusēto adrešu grāmatu."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Kļūda izpildot meklēšanu"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinarda"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "un vēl viena karte."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nespēju saņemt vēstuli no redaktora"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Kļūda pievienojot karti"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Noklusētā sinhr. adrese:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nevarēju ielādēt %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Izmantoju LDAP serveri anonīmi"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Neizdevās autentificēties.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autoaizpildes mapes"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIevadiet %s paroli (lietotājs %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikāta ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Rediģēt adrešu grāmatau"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, 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:9
+#, 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:10
+#, 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:11
+#, 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:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, 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:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -119,7 +337,7 @@ msgstr "Jauns kontakts:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakti:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -144,15 +362,15 @@ msgid "Migrating `%s':"
 msgstr "Ehotestējam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -161,22 +379,22 @@ msgid "Personal"
 msgstr "Personīgi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Autoaizpildes mapes"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -184,58 +402,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dzēst"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Izmantoju LDAP serveri anonīmi"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Neizdevās autentificēties.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -255,69 +482,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Autoaizpildes mapes"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikāta ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Šeit konfigurējiet jūsu epasta kontus"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Rediģēt adrešu grāmatau"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, 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:9
-#, 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:10
-#, 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:11
-#, 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:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-#, 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:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -325,7 +489,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -334,8 +498,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
@@ -361,6 +524,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentifikācija"
@@ -410,13 +574,11 @@ msgid "Anonymously"
 msgstr "Anonīmi"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Pamata"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaļas"
 
@@ -679,34 +841,27 @@ msgid "cards"
 msgstr "kartes"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minūtes"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Izvēlieties kontaktus no adrešu grāmatas"
+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:208
+msgid "Remove All"
+msgstr "Izņemt visu"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Izņemt"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Izņemt visu"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -723,7 +878,7 @@ msgid "Send HTML Mail?"
 msgstr "Sūtīt HTML pastu?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Pievienot kontaktiem"
 
@@ -731,16 +886,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Avots"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
+msgid "Select Contacts from Address Book"
+msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -767,6 +929,11 @@ msgstr "_Kategorija:"
 msgid "_Find"
 msgstr "Sameklēt"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Meklēt"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -813,9 +980,8 @@ msgid "<b>Work</b>"
 msgstr "Darba nedēļa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -840,7 +1006,6 @@ msgid "Birthday:"
 msgstr "_Dzimšanas diena:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alendārs:"
@@ -856,15 +1021,15 @@ msgid "Company:"
 msgstr "Kompānija"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakts"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
@@ -974,8 +1139,8 @@ msgstr "_Web lapaspuses adrese:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -999,46 +1164,29 @@ msgid "_File under:"
 msgstr "Faila nosaukums:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Serveris:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 #, fuzzy
 msgid "Address"
 msgstr "_Adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 #, fuzzy
 msgid "Editable"
 msgstr "Aktivizēt"
@@ -2018,144 +2166,135 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Publicēt vēstuli"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Nenosaukts saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Joro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Grupa"
+msgid "Service"
+msgstr "Serviss kārtībā"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Lokācija: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Lietotājvārds:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Mājas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Citi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Joro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grupa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Avots"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #, fuzzy
 msgid "Changed"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Atkārtošanas datums ir nepareizs."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Nepareizs mērķis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-#, fuzzy
-msgid "_Discard"
-msgstr "Dinarda"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Publicēt vēstuli"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Serviss kārtībā"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Lokācija: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Lietotājvārds:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakta ātrā pievienošana"
@@ -2178,6 +2317,23 @@ msgstr ""
 "\n"
 "E-pasts:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adrese _2:"
@@ -2306,52 +2462,72 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Izvēlieties kontaktus no adrešu grāmatas"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Locekļi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Izņemt izvēlētos priekšmetus no piesaistņu saraksta"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "Izvēlēties"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Slēpt adreses, kad sūtam šo uz sarakstu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "Saraksta vā_rds:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakstā:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 #, fuzzy
 msgid "Is New List"
 msgstr "Jauns saraksts"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Pieprasītie dalībnieki"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktu saraksta redaktors"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Saglabāt Sarakstu kā VKarti"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Izmainīt Kontaktu:"
@@ -2390,449 +2566,11 @@ msgstr ""
 "šajā mapē. Vai jūs vēlaties pievienot jebkurā gadījumā?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Paplašinātā meklēšana"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "Locekļi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-pasts"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizācija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Bostona"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Ponkē"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Darbs"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobilais telefons"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Personīgi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Piezīme"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "_Darba nosaukums:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Epasts"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "Mājas fakss"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Veiksmīgi"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repozitorijs nesaistes režīmā"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adrešu grāmata neeksistē"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Jauns kontaktu saraksts"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Atļauja liegta"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "Karte nav atrasta"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Kartes ID jau eksistē"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokols nav atbalstīts"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Atsaukts"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nevar atvērt koplietošanas mapi: `%s'."
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Autentifikācija neizdevusies"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Pieprasīta autentifikācija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS nav pieejams"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nav tādas vēstules"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Cita kļūda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Mēs nevarējām atvērt šo adrešu grāmatu. Tas nozīmē,\n"
-"ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
-"ir nesasniedzams."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Šai Evolution versijai nav iekompilēts LDAP atbalsts.\n"
-"Ja jūs gribat lietot LDAP Evolution programmā,\n"
-"jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
-"programmatūras iegūšanas no saites zemāk.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Mēs nevaram atvērt šo adrešu grāmatu. Tas nozīmē,\n"
-"ka esat ievadijuši nepareizu URI, vai arī serveris\n"
-"ir nesasniedzams."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Par daudz karšu šajā pieprasijumā ir atgriezts, nekā vai nu serveris ir \n"
-"nokonfigurēts atgriezt vai arī Evolution nokonfigurēta parādīt.\n"
-"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/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Laiks pieprasījuma izpildei pārsniedza servera limitu vai arī limitu\n"
-"šajai adresu grāmatai.  Lūdzu padariet jūsu meklējumu nedaudz precīzāku\n"
-"vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
-"šajai adrešu grāmatai."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-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/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Kļūda pievienojot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Kļūda pievienojot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Kļūda mainot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Kļūda mainot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Kļūda izņemot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Kļūda izņemot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s jau eksistē\n"
-"Vai tu vēlies to pārrakstīt?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Pārrakstīt"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "saraksts"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Pārvietot karti uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopēt karti uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Pārvietot kartes uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopēt kartes uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Izvēlieties kontaktus no adrešu grāmatas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Vairākas VKartes"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VKarte"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(nekas)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primārais epasts"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Epasts 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Epasts 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Izvēlieties darbību"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Izveidojiet jaunu \"%s\" kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Meklēju adrešu grāmatā..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Rediģēt kontakta informāciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Apvienot e-pasta adreses"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "un vēl viena karte."
-msgstr[1] "un vēl viena karte."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Parādīt _pilnas galvenes"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Saglabāt konaktu kā VKarti"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Saglabāt adrešu grāmatā"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2847,9 +2585,9 @@ msgstr[1] "Kontakti"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
@@ -2867,134 +2605,134 @@ msgstr "Molde"
 msgid "Error modifying card"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Paplašināti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tips"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Jauns kontakts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Jauns kontaktu saraksts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Iet uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Meklēt kontaktus..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adrešu grāmatas avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot uzstādījumi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Pārsūtīt kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopēt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Pašreizējais skats"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Jebkura kategorija"
@@ -3028,6 +2766,8 @@ msgid "Car Phone"
 msgstr "Automašīnas telefons"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategorijas"
 
@@ -3035,6 +2775,21 @@ msgstr "Kategorijas"
 msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Epasts"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Epasts 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Epasts 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Uzvārds"
@@ -3074,14 +2829,29 @@ msgstr "Jordāna"
 msgid "Manager"
 msgstr "Menedžeris"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobilais telefons"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Iesauka"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Piezīme"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birojs"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizācija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Cits fakss"
@@ -3135,33 +2905,23 @@ msgstr "Unsta"
 msgid "Web Site"
 msgstr "Web lapaspuse"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 #, fuzzy
 msgid "Width"
 msgstr "Platums:"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 #, fuzzy
 msgid "Height"
 msgstr "Augstums:"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Izvēlētais:"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Uzdevumu kārtošana"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3181,7 +2941,12 @@ msgstr "Teksta _izmērs"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Kolumbija"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3195,7 +2960,7 @@ msgstr ""
 "\n"
 "Dubultklikšķiniet šeit, lai izveidotu jaunu kontaktu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3205,15 +2970,421 @@ msgstr ""
 "\n"
 "Šeit nav priekšmetu, ko rādīt šajā skatā."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 #, fuzzy
 msgid "Adapter"
 msgstr "Adrara"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: addressbook/gui/widgets/e-minicard.c:160
 #, fuzzy
-msgid "Column Width"
-msgstr "Kolumbija"
+msgid "Selected"
+msgstr "Izvēlētais:"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Uzdevumu kārtošana"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Locekļi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-pasts"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Bostona"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Ponkē"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Darbs"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Personīgi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "_Darba nosaukums:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Mājas fakss"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Veiksmīgi"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repozitorijs nesaistes režīmā"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Adrešu grāmata neeksistē"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Jauns kontaktu saraksts"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Atļauja liegta"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "Karte nav atrasta"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Kartes ID jau eksistē"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokols nav atbalstīts"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Atsaukts"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nevar atvērt koplietošanas mapi: `%s'."
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autentifikācija neizdevusies"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Pieprasīta autentifikācija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS nav pieejams"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nav tādas vēstules"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Cita kļūda"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Mēs nevarējām atvērt šo adrešu grāmatu. Tas nozīmē,\n"
+"ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
+"ir nesasniedzams."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Šai Evolution versijai nav iekompilēts LDAP atbalsts.\n"
+"Ja jūs gribat lietot LDAP Evolution programmā,\n"
+"jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
+"programmatūras iegūšanas no saites zemāk.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Mēs nevaram atvērt šo adrešu grāmatu. Tas nozīmē,\n"
+"ka esat ievadijuši nepareizu URI, vai arī serveris\n"
+"ir nesasniedzams."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Par daudz karšu šajā pieprasijumā ir atgriezts, nekā vai nu serveris ir \n"
+"nokonfigurēts atgriezt vai arī Evolution nokonfigurēta parādīt.\n"
+"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/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Laiks pieprasījuma izpildei pārsniedza servera limitu vai arī limitu\n"
+"šajai adresu grāmatai.  Lūdzu padariet jūsu meklējumu nedaudz precīzāku\n"
+"vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
+"šajai adrešu grāmatai."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Kļūda pievienojot sarakstu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Kļūda pievienojot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Kļūda mainot sarakstu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Kļūda mainot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Kļūda izņemot sarakstu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Kļūda izņemot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s jau eksistē\n"
+"Vai tu vēlies to pārrakstīt?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Pārrakstīt"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "saraksts"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Pārvietot karti uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopēt karti uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Pārvietot kartes uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopēt kartes uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Izvēlieties kontaktus no adrešu grāmatas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Vairākas VKartes"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VKarte"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(nekas)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primārais epasts"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Izvēlieties darbību"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Izveidojiet jaunu \"%s\" kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Meklēju adrešu grāmatā..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Rediģēt kontakta informāciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Apvienot e-pasta adreses"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "un vēl viena karte."
+msgstr[1] "un vēl viena karte."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Parādīt _pilnas galvenes"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Saglabāt konaktu kā VKarti"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Saglabāt adrešu grāmatā"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3262,6 +3433,11 @@ msgstr "Evolution pasta sacerētājs."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Drukāt aploksni"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Drukāt kontaktus"
@@ -3272,11 +3448,6 @@ msgstr "Drukāt kontaktus"
 msgid "Print contact"
 msgstr "Drukāt kontaktus"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Drukāt aploksni"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3463,6 +3634,23 @@ msgstr "Kontaktu _saraksts"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nevar atvērt vēstuli"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nevarēju ielādēt %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nevaru atvērt adrešu gramatu"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3520,23 +3708,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Iekšēja kļūda"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nevar atvērt vēstuli"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nevarēju ielādēt %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Nevaru atvērt adrešu gramatu"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Kļūda ielādējot noklusēto adrešu grāmatu."
@@ -3553,40 +3724,375 @@ msgstr "Nav dots faila nosaukums."
 msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Nedzēst"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Sūtīt _vēlāk"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo sanāksmi?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
+"ierakstu?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr ""
+"Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Tikšanās"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Dinarda"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Sūtīt"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution kalendāra kopsavilkuma komponente."
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ievadiet paroli"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Sadalīt vairāku dienu notikumus:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nevarēju sāknēt wombat serveri"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nevarēju sāknēt wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nevarēju nolasīt Pilot kalendāra aplikācijas bloku"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Noklusētā prioritāte:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nevar nolasīt Pilota ToDo aplikācijas bloku"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendārs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, 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:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendārs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Sākums:"
@@ -3682,11 +4188,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Nevarēju inicializēt Bonobo"
@@ -3836,9 +4337,30 @@ msgstr ""
 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:50
+msgid "Summary contains"
+msgstr "Kopsavilkums satur"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentāri satur"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Neatbilstoši"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3862,8 +4384,8 @@ msgid "Purge events older than"
 msgstr "atgriež mazāk kā"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dienas"
 
@@ -3874,7 +4396,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3924,69 +4446,57 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendārs"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Jauna tikšanās"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Tikšanās"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Jauna tikšanās visu dienu"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Visas _dienas tikšanās"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "K_alendārs:"
+msgid "Cale_ndar"
+msgstr "Kalendārs"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu mapi"
@@ -4017,27 +4527,6 @@ msgstr "Nedēļas skats"
 msgid "Month View"
 msgstr "Mēneša skats"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Kopsavilkums satur"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Apraksts satur"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentāri satur"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Apraksts satur"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Neatbilstoši"
-
 #: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4057,230 +4546,133 @@ msgstr "Atļauja liegta"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Skaņas trauksmes opcijas"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Ziņas trauksmes opcijas"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Pasta trauksmes opcijas"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programmas Trauksmes opcijas"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Nezināmas trauksmes opcijas"
+msgid "<b>Alarm</b>\t"
+msgstr "Kalendāra informācija"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Atkārtot trauksmi"
+msgid "<b>Options</b>"
+msgstr "Apraksts:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Vēstules attēlošana"
+msgid "<b>Repeat</b>"
+msgstr "Atgādinājumi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "Vēstules ķermenis"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Spēlēt skaņu:"
+msgid "Add Alarm"
+msgstr "Trauksmes"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Atkārtot trauksmi"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Palaist programmu:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "Sūtīt"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Ar šiem argumentiem:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "papildus laiks katras"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "stundas"
+msgid "Custom _message"
+msgstr "Uzrakstīt vēstuli"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Pievieno_t"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Pamati"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datums/laiks:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Vēstules"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spēlēt skaņu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Atgādinājums"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Sāknēt programmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Sūtīt"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Sūtīt epastu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Kopsavilkums:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Konts:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Palaist programmu:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcijas:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Atkārtot trauksmi"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "pēc"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pirms"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "diena(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "tikšanās beigas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "papildus laiks katras"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "stunda(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "stundas"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minūte(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "tikšanās sākums"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Jums ir jānorāda faila vārds"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Metode lai ielādētu `%s' nav atbalstīta"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Jaunkaledonija"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Uzdevumu saraksts"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Krāsas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Izvēlies krāsu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Jaunkaledonija"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Jauna grupa..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Atsvaidzināt"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tips:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Pievieno_t"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedēļas"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Trauksmes"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4398,7 +4790,7 @@ msgid "Free/Busy Publishing"
 msgstr "Brīvs/aizņemts pieprasījums"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piekdiena"
@@ -4412,7 +4804,7 @@ msgid "Minutes"
 msgstr "Minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pirmdiena"
@@ -4422,7 +4814,7 @@ msgid "S_un"
 msgstr "_Sv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sesdiena"
@@ -4436,7 +4828,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Svēdiena"
@@ -4450,7 +4842,7 @@ msgid "T_hu"
 msgstr "Ce_t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Ceturdiena"
@@ -4464,7 +4856,7 @@ msgid "Time format:"
 msgstr "Laika formāts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Otradiena"
@@ -4474,7 +4866,7 @@ msgid "W_eek starts:"
 msgstr "N_edēļa sākas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Trešdiena"
@@ -4508,7 +4900,8 @@ msgstr "_Saspiest nedēļas mēneša skatā"
 msgid "_Day begins:"
 msgstr "_Diena sākas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4558,6 +4951,81 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Jums ir jānorāda faila vārds"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Metode lai ielādētu `%s' nav atbalstīta"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Jaunkaledonija"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Krāsas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Izvēlies krāsu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Jaunkaledonija"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Jauna grupa..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Atsvaidzināt"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tips:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "nedēļas"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Šis notikums ir izdzēsts."
@@ -4604,83 +5072,77 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validācijas kļūda: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " uz "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Izpildīts "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Izpildīts"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Līdz "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Līdz"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nevarēju atjaunināt objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Saglabāt kā..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 #, 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validācijas kļūda: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " uz "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Izpildīts "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Izpildīts"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Līdz "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Līdz"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4752,8 +5214,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresu grāmata..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Kontakti..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4763,164 +5226,222 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Tikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Atgādinājums"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informācija"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Beigu datums ir nepareizs"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Atļauja liegta"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "pirms katras tikšanās"
+msgstr[1] "pirms katras tikšanās"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "tikšanās beigas"
+msgstr[1] "tikšanās beigas"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "pirms katras tikšanās"
+msgstr[1] "pirms katras tikšanās"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Visas _dienas notikums"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "pirms katras tikšanās"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Aizņe_mts"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "pirms katras tikšanās"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorijas..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "pirms katras tikšanās"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Kalendāra informācija"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikācija"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Datums & laiks"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Konfidenciāls"
+msgid "A_ll day event"
+msgstr "Visas _dienas notikums"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Datums/laiks:"
+msgid "C_ustomize..."
+msgstr "Saglabāt skatu pēc izvēles"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Brīvs"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorijas..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Lokācija: "
+msgid "Cale_ndar:"
+msgstr "K_alendārs:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vāts"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikācija"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blisks"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Konfidenciāls"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Parādīt laiku kā"
+msgid "L_ocation:"
+msgstr "Lokācija: "
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privāts"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publisks"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Parādīt laiku kā"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Kopsavilku_ms:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Trauksmes"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Apraksts:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "B_eigu laiks:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Sākuma laiks:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nekas"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Nepieciešams organizētajs."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Tiek pieprasīts vismaz viens apmeklētājs."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Deleģēt uz..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Dzēst"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Izņemt"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4959,36 +5480,45 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Apmeklētājs"
+msgid "<b>Attendees</b>"
+msgstr "<b>Sākas:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Pievienot sūtītāju adrešu _grāmatai"
+msgid "<b>Organizer</b>"
+msgstr "<b>Līdz:</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Mainīt organizētāju"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizētājs:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "K_ontakti..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Mainīt organizētāju"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizētājs:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5067,153 +5597,145 @@ msgstr "Volisa un Futuna salas"
 msgid "All Instances"
 msgstr "Vi_sas stacijas:"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Šī tikšanās satur atkārtošanās, ko Evolution nevar rediģēt."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 #, fuzzy
 msgid "Recurrence date is invalid"
 msgstr "Atkārtošanas datums ir nepareizs."
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "pirmais"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekunde"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trešais"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "ceturtais"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "pēdējais"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Cits datums"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dienā"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "uz"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "reizes"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Datums/laiks:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Katru"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Izņēmumi"
+msgid "<b>Exceptions</b>"
+msgstr "Apraksts:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Pirmsapskats:"
+msgid "<b>Preview</b>"
+msgstr "Pirmsapskats"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Atkārtošanās noteikums"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Atkārtošanās pē_c izvēles"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modificēt"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Bez a_tkārtošanās"
+msgid "<b>Recurrence</b>"
+msgstr "Atkārtošanās"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Izņemt"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Katru"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Vienkārša atkārtošanās"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "R_ediģēt tikšanos"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "priekš"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "visu laiku"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mēnesis(ši)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "līdz"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nedēļa(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "gads(i)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Dzēst šo mapi"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Ziņa, ko attēlot"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% izpildīts"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Ziņa, ko attēlot"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Pabeigts"
 
@@ -5225,8 +5747,8 @@ msgstr "Augsts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Progresā"
@@ -5238,23 +5760,22 @@ msgid "Low"
 msgstr "Zems"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normāls"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nav iesākts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Progresā"
+msgid "P_ercent complete:"
+msgstr "Procenti Izpidildīti: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5279,37 +5800,42 @@ msgstr "_Statuss:"
 msgid "_Web Page:"
 msgstr "_Web lapaspuses adrese:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Uzdevums"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nevaru atvērt adrešu gramatu"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Konfidenciāli"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Ziņa, ko attēlot"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Ziņa, ko attēlot"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "M_ape:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5320,60 +5846,58 @@ msgstr "Sākum_a datums:"
 msgid "_Due date:"
 msgstr "_Datuma laikā:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Slikta autentifikācijas atbilde no servera."
+msgid "_Group:"
+msgstr "Grupa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Brīvs/Aizņemts info beidzās: <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Diena"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Brīvs/Aizņemts informācija"
+msgid "<b>Publishing _Location</b>"
+msgstr "Brīvs/aizņemts pieprasījums"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Brīvs/aizņemts pieprasījums"
+msgid "Free/Busy Editor"
+msgstr "Brīvs/Aizņemts informācija"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Saraksta vā_rds:"
+msgid "_Daily"
+msgstr "Diena"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Parole"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Parole"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Atcerēties šo paroli"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Lietotājvārds:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Nedēļa"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5455,7 +5979,7 @@ msgstr "%s iekš %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s nezināma palaidēja tipam"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
@@ -5464,6 +5988,11 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "Untitled"
 msgstr "Nenosaukts"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Kopsavilkums:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5477,7 +6006,7 @@ msgstr "_Datuma laikā:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Statuss:"
 
@@ -5491,20 +6020,93 @@ msgstr "_Prioritāte:"
 msgid "Web Page:"
 msgstr "_Web lapaspuses adrese:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Publisks"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Beigu datums"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privāts"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Sākuma datums"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Konfidenciāls"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Brīvs"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Aizņemts"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "A"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "R"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Jā"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nē"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Periodisks"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Asignēts"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5550,96 +6152,102 @@ msgstr "80%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Brīvs"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Aizņemts"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Atvērt vēstuli"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Saglabāt kā..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Drukāt..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izgriezt"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Ievietot"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Nozīmēt uzdevumu"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Pārsūtīt kā iKalendāru"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "A_tzīmēt kā Izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "A_tzīmēt izvēlētos uzdevumus kā izpildītus"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Dzēst"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Dzēst izvēlētos uzdevumus"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Saglabāt kā..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
@@ -5648,181 +6256,112 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "% Complete"
 msgstr "% izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Izpildīts"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Izpildes datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Datuma laikā"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Sākuma datums"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kopsavilkums"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Pārvietoju"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopēju"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izvēlēties _pavedienu"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Dzēst..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopēt uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pār_vietot uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Plānot _sanāksmi..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Iet uz _dienu"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Iet uz datumu..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Uzstādījumi..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Beigu datums"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Sākuma datums"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nezināms"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Periodisks"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Asignēts"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Jā"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nē"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Z"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "A"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "R"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5846,36 +6385,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minūšu sadaļas"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minūšu sadaļas"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5942,37 +6481,36 @@ msgid ", ending on "
 msgstr ", beidzoties "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Sākas:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Beidzas:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Izpildīts:</b>"
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enida"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Līdz:</b>"
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Līdz"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iKalendāra informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iKalendāra kļūda"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5980,308 +6518,288 @@ 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:918
-msgid "<i>None</i>"
-msgstr "<i>Nekas</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Lokācija: "
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Noliegts"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Atjaunot"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Sanāksmes iemesls"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Atjaunināta informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Informācijas par sanāksmi atjaunināšanas pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Atbilde par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Sanāksmes atcelšana"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Nepareiza vēstule par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Uzdevuma informācija"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Uzdevuma atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunināšanas pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Uzdevuma atsaukums"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts informācija"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/aizņemts ziņa"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Ir kļūda CORBA sistēmā\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objektu nevarēja atrast\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
@@ -6310,6 +6828,10 @@ msgstr "Ielādēju kalendāru"
 msgid "Loading calendar..."
 msgstr "Ielādēju Kalendāru..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizētājs:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Servera ziņojums:"
@@ -6326,11 +6848,6 @@ msgstr "datums-beigas"
 msgid "Chair Persons"
 msgstr "Vadošās personas"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Pieprasītie dalībnieki"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Iespējamie dalībnieki"
@@ -6398,6 +6915,28 @@ msgstr "Deleģēts"
 msgid "In Process"
 msgstr "Procesā"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Neatrodas Birojā"
@@ -6406,98 +6945,64 @@ msgstr "Neatrodas Birojā"
 msgid "No Information"
 msgstr "Nav Informācijas"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Pievienot sūtītāju adrešu _grāmatai"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opcijas"
+msgid "O_ptions"
+msgstr "Opcijas"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Parādīt Tikai _Darba Stundas"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Parādīt Sama_zinātu"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Atjaunināt Brīvs/Aizņemts Informāciju"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoizvēle"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Visi Cilvēki un Resursi"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Visi _Cilvēki un Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Pieprasītie Cilvēki"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Pieprasītie Cilvēki un _Viens Resurss"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Sanāksmes _sākuma laiks:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Sanāksmes _beigu laiks:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6506,124 +7011,53 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Atvērt uzdevumus uz %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Kļūda %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Atvērt uzdevumus uz %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Uzdevumi"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Atjaunināt objektus"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nav tikšanos"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atvērt ar %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turīna"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, 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:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendārs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Uzdevumi"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprīlis"
@@ -6963,10 +7397,6 @@ msgstr "Izvēlētais mēnesis (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izvēlētais gads (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Uzdevums"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6997,7 +7427,7 @@ msgid "Contacts: "
 msgstr "Kontakti:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
@@ -7026,7 +7456,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Nav uzdevumu"
 msgstr[1] "Nav uzdevumu"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7047,35 +7477,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ievietot jaunu uzdevumu"
@@ -8760,69 +9184,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sinhronizējam mapes"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Kļūda parsējot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Kļūda palaižot filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nespēju atvērt spoles mapi"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nespēj procesēt spoles mapi"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dabūjam vēstuli %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Nevar atvērt vēstuli"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Problēma ar vēstuli %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "SInhronizējam mapi"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dabūjam vēstuli %d no %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Kļūda pie vēstules %d no %d"
@@ -8844,43 +9268,6 @@ msgstr "Nepareizi argrumenti uz (user-flag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Neatbalstīta operācija: pievienot vēstuli: priekš %s"
-
-#: camel/camel-folder.c:1262
-#, 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:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "Pārvietojam vēstules"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopēju vēstules"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansinga"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Saņemu %d vēstuli(es)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8926,7 +9313,44 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Neatbalstīta operācija: pievienot vēstuli: priekš %s"
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Pārvietojam vēstules"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopēju vēstules"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansinga"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Saņemu %d vēstuli(es)"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8937,15 +9361,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Neizdevās noparsēt gpg userid padomu."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neizdevās noparsēt gpg paroļfrāzes pieprasījumu."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8954,28 +9378,28 @@ msgstr ""
 "Jums nepieciešama atslēgfrāze, lai atslēgtu atslēgu\n"
 "lietotājam: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8986,67 +9410,87 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Neizdevās GPG %s vēstuli: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Neizdevās palaist gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Neizdevās palaist gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksa ķermenis satur"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nevaru būvēt noslēgošo palīga kanālu: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nevaru sazarot noslēgošo palīgu: %s"
+
+#: 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 "Nevarēju noslēgt '%s': protokola kļūda ar noslēgumpalīgu"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nevarēju noslēgt '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9068,26 +9512,6 @@ msgstr "Neizdevās dabūt slēgu lietojot fctl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nevaru būvēt noslēgošo palīga kanālu: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nevaru sazarot noslēgošo palīgu: %s"
-
-#: 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 "Nevarēju noslēgt '%s': protokola kļūda ar noslēgumpalīgu"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nevarēju noslēgt '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9332,7 +9756,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -9416,55 +9840,55 @@ msgstr "POP pirms SMTP autentifikācijas lietojot ne-pop avotu"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Regulāras izteiksmes kompilācija neizdevusies: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' nepieciešams lietotājvārda komponents"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' nepieciešams hosta komponents"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' nepieciešams ceļa komponents"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Sameklējam: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nevar atrast nosaukumu: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hosta meklēšana neizdevusies: nezināms iemesls"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Hosta meklēšana neizdevusies: %s: hosts nav atrasts"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Hosta meklēšana neizdevusies: %s: nezināms iemesls"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Atrodu adresi"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Hosta meklēšana neizdevusies: hosts nav atrasts"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Hosta meklēšana neizdevusies: nezināms iemesls"
 
@@ -9540,7 +9964,7 @@ msgstr "_Sertifikāta ID:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
@@ -9636,7 +10060,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Rediģēt parakstu"
 
 #: camel/camel-smime-context.c:651
@@ -9651,49 +10075,48 @@ msgstr "IMAP komandas kļūda: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Neizdevās atrast sertifikātu \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Neizdevās atrast parasto bulk algoritmu."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "_Izveidot noteikumu no vēstules"
+msgid "Cannot create CMS Message"
+msgstr "Nevar atvērt vēstuli"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Nevar atvērt vēstuli"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Nevar piesaistīt failu %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Nevar piesaistīt failu %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Nevar atvērt vēstuli"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9740,7 +10163,8 @@ msgstr "Nevaru dabūt mapi: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
@@ -9749,8 +10173,8 @@ msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 msgid "Trash"
 msgstr "Atkritummape"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jūnijs"
@@ -9871,7 +10295,7 @@ msgstr "Atslēgu lietojums neatbalsta sertifikāta parakstīšanu"
 msgid "Error in application verification"
 msgstr "Kļūda aplikāciju pārbaudē"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9884,11 +10308,11 @@ msgstr ""
 "Parakstnospiedums:      %s\n"
 "Paraksts:               %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "LABS"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "SLIKTS"
 
@@ -9912,7 +10336,7 @@ msgstr ""
 "Vai jūs vēlaties akceptēt jebkurā gadījumā?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9927,7 +10351,7 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties akceptēt?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9936,7 +10360,7 @@ msgstr ""
 "Sertifikāta problēma: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9945,7 +10369,7 @@ msgstr ""
 "Slikts sertifikāta domēns: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9954,14 +10378,14 @@ msgstr ""
 "Sertifikāta der. laiks iztecējis: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nevarēja noparsēt URL `%s'"
@@ -9985,7 +10409,7 @@ msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -10006,8 +10430,8 @@ msgid "Checking for new mail"
 msgstr "Pārbaudam jauno pastu"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Pārbaudam jaunas vēstules visās mapēs"
 
@@ -10040,8 +10464,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10060,324 +10484,28 @@ msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 msgid "Checklist"
 msgstr "Bieza dūmaka"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Negaidīta atbilde no IMAP servera: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Serveris negaidīti atvienojās: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapes"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Parādīt tikai parakstītās mapes"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vārdalauks"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP serveris %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP serviss priekš %s uz %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nevarēja savienoties ar %s (ports %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS nav pieejams"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Konekcija pārtraukta"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nezināma kļūda"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nevarēju savienoties ar POP serveri %s: Pieprasītajam autentifikācijas "
-"mehānismam nav atbalsta."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sLūdzu ievadiet %s@%s SMTP paroli"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Neizdevās autentificēties POP serverī %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr ""
-"\n"
-"Komentāri: "
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nevaru dabūt mapi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Negaidīta atbilde no IMAP servera: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Nav uzdevumu"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serveris negaidīti atvienojās: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nezināma kļūda"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10446,7 +10574,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10523,6 +10651,27 @@ msgstr ""
 "\n"
 "Komentāri: "
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapes"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Parādīt tikai parakstītās mapes"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Pārrakstīt servera piedāvātos mapju nosaukumlaukumus"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Vārdalauks"
+
 #: 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ī"
@@ -10545,43 +10694,93 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP serveris %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP serviss priekš %s uz %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nevarēja savienoties ar %s (ports %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS nav pieejams"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Konekcija pārtraukta"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS paplašinājums nav atbalstīts."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL sarunas neizdevušās"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nevarēju savienoties ar serveri: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLūdzu ievadi IMAP paroli %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10592,30 +10791,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma vecāku mape: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Neizdevās autentificēties POP serverī %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Serveris negaidīti atvienojās: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nevarēju savienoties ar POP serveri %s: Pieprasītajam autentifikācijas "
+"mehānismam nav atbalsta."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sLūdzu ievadiet %s@%s SMTP paroli"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Neizdevās autentificēties POP serverī %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Komentāri: "
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Nav uzdevumu"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serveris negaidīti atvienojās: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10782,18 +11233,26 @@ msgstr "Nevarēju saglabāt kopsavilkumu: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nevarēju pievienot vēstuli kopsavilkumam: nezināms iemesls"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Iesūtne"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir vēstules pievienošana atsaukta"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nevaru pievienot vēstuli maildir mapei: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10809,48 +11268,48 @@ msgstr ""
 "Nevar dabūt vēstuli: %s no mapes %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Nepareizs vēstules saturs"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mape '%s' neeksistē."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s nav maildir direktorija."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nevarēju izdzēst mapi `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11441,20 +11900,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nevarēju savienoties ar POP serveri %s (ports %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Neizdevās autentificēties POP serverī %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Neizdevās savienoties ar POP serveri %s drošības režīmā: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nevarēju savienoties ar POP serveri %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11463,28 +11927,28 @@ msgstr ""
 "Nevarēju savienoties ar POP serveri %s: Pieprasītajam autentifikācijas "
 "mehānismam nav atbalsta."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' pieteikšanās neizdevusies priekš POP servera %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Nevarēju pieteikties POP serverī %s: SASL protokola kļūda"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Neizdevās autentificēties POP serverī %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sLūdzu ievadiet POP paroli %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11493,7 +11957,16 @@ msgstr ""
 "Neizdevās savienoties ar POP serveri %s.\n"
 "Kļūda nosūtot paroli: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Neizdevās savienoties ar POP serveri %s.\n"
+"Kļūda nosūtot paroli: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
@@ -11708,97 +12181,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP serveris %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP pasta nosūtīšana caur  %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Nevaru nosūtīt vēstuli: nav noteikta sūtītāja adrese."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Sūtam vēstuli"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Nevaru nosūtīt vēstuli: nav norādīti adresāti."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nevaru nosūtīt vēstuli: viens vai vairaki nepareizi adresāti"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP apsveikums (Greeting)"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP autentifikācija"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Kļūda izveidojot SASL autentifikācijas objektu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Slikta autentifikācijas atbilde no servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM pieprasījums iztecējis: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO atbildes kļūda: %s: pasts nav nosūtīts"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO (%s) neizdevies"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA atbildes kļūda: %s: pasts nav nosūtīts"
@@ -11806,28 +12279,28 @@ msgstr "DATA atbildes kļūda: %s: pasts nav nosūtīts"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP komandas kļūda: %s"
@@ -11892,100 +12365,6 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku piesaistnes attēlošanu"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Nevaru kodēt šo vēstuli: nav parastā teksta, ko kodēt"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nevar atvērt vēstuli"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nespēju saņemt vēstuli no redaktora"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Nenosaukta vēstule)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Atvērt failu"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autoģenerēts"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Paraksts:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Uzrakstīt vēstuli"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nevarēju izveidot sacerētāja logu:\n"
-"Nespēju aktivizēt HTML redaktora komponenti.\n"
-"Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
-"un libgtkhtml pareizās versijas.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nevarēju izveidot sacerētāja logu:\n"
-"Nespēju aktivizēt HTML redaktora komponenti."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
@@ -12069,17 +12448,91 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Attach file(s)"
 msgstr "Piesaistīt failu"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Nevaru kodēt šo vēstuli: nav parastā teksta, ko kodēt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nevar atvērt vēstuli"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nespēju saņemt vēstuli no redaktora"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Nenosaukta vēstule)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Atvērt failu"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autoģenerēts"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Paraksts:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Uzrakstīt vēstuli"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Pārsūtītā vēstule - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Piesaistīt orģinālo vēstuli"
+msgstr[1] "Piesaistīt orģinālo vēstuli"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Piesaistīt failu vēstulei"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12097,54 +12550,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nevarēju saņemt vēstuli no POP servera %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Nākošā _neizlasītā vēstule"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Nepārvietot"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Izņemt"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nevarēju saglabāt paraksta failu: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Kļūda glabājot saīsinājumus."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Brīdinājums: Mainīta vēstule"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12154,60 +12621,77 @@ msgstr ""
 "tikšanos?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Dinarda"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Saglabāt vēstuli kā..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nevar izveidot kanālu: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nevarēju saglabāt paraksta failu: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nevar izveidot kanālu: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nevarēju izveidot sacerētāja logu:\n"
+"Neizdevās aktivizēt adrešu izvēlētāja kontroli."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nevarēju izveidot sacerētāja logu:\n"
+"Nespēju aktivizēt HTML redaktora komponenti.\n"
+"Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
+"un libgtkhtml pareizās versijas.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12506,11 +12990,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Izvēlieties laiku ar ko salīdzināt"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Filtra noteikumi"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12540,20 +13019,8 @@ msgstr "Jums ir jānorāda faila vārds"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Izņemu mapi %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "Jums ir jānorāda mape.\n"
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12561,158 +13028,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Uzticējums"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Jums jānosauc šī vmape."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nav izvēlēts serveris"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Izvēlieties failu"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Līdz:</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Izvēlēties mapi"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Filtra noteikumi"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "vMapes avoti"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Salīdzināt ar"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Ienākošais"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"plkst. 00:00 norādītajā datumā."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"relatīvo laiku, kad notiks filtrēšana."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Vēstules datums tiks salīdzināts ar\n"
-"pašreizējo laiku, kad notiks filtrēšana."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "atpakaļ"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mēneši"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekundes"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "tikai specifiskas mapes"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "pašreizējais laiks"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "laiks, kuru jūs norādiet"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "ar visām akīvajām attālinātajām mapēm"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "ar visām lokālām mapēm"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "gadi"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Svarīgs"
 
@@ -12782,6 +13128,71 @@ msgstr "ienākošais"
 msgid "outgoing"
 msgstr "izejošais"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtra noteikumi"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Salīdzināt ar"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Ienākošais"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"plkst. 00:00 norādītajā datumā."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"relatīvo laiku, kad notiks filtrēšana."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Vēstules datums tiks salīdzināts ar\n"
+"pašreizējo laiku, kad notiks filtrēšana."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "laiks, relatīvs attiecībā uz pašreizējo laiku"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "atpakaļ"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mēneši"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekundes"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "pašreizējais laiks"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "laiks, kuru jūs norādiet"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "gadi"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pievienot noteikumu"
@@ -12795,61 +13206,77 @@ msgstr "Rediģēt noteikumu"
 msgid "Rule name"
 msgstr "Noteikuma nosaukums:"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Rezultāta noteikumi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultāts"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Sacerētāja preferences"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Ķermenis satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+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"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Ķermenis nesatur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+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"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Ķermenis vai subjekts satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Vēstule satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Adresāti satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Sūtītājs satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution pasta sacerētājs."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Subjekts satur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution pasta sacerētājs."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Subjekts nesatur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtuālās mapes"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Pievienot"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pasts"
 
-#: filter/vfolder-rule.c:573
-#, fuzzy
-msgid "VFolder source"
-msgstr "vMapes avoti"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Pasta Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Pasts"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12884,51 +13311,313 @@ msgstr "Izvēlieties paraksta skriptu"
 msgid "Signature(s)"
 msgstr "_Paraksti"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Filtra noteikumi"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Izvēlēties mapi"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Piešķirt rezultātu"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Uzstādīt krāsu"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Uzstādīt rezultātu"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Piesaistījumi"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Pīkstiens"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "satur"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopēt uz mapi"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Saņemšanas datums"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Nosūtīšanas datums"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Dzēsts"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "nesatur"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "nebeidzas ar"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "neeksistē"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "neatgriežas"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "neskan kā"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "nesākas ar"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Neeksistē"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Melnraksts"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "beidzas ar"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Eksistē"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "eksistē"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Izteiksme"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Sekojums"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "ir"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "ir pēc"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "ir pirms"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "ir karogots"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "ir lielāks par"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "ir mazāks par"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nav"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nav karogots"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Jūnijs"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Iezīme"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Adresātu saraksts"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Vēstules ķermenis"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Vēstules galvene"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Vēstule tika nosūtīta"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Vēstule %s nav atrasta."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Pārvietot uz mapi"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Iziet no programmas"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Spēlēt skaņu"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lasīt"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Adresāti"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regex atbilšana"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Atbildēts uz"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "atgriež"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "atgriež lielāku kā"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "atgriež mazāk kā"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Palaist programmu:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultāts"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Sūtītajs"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Uzstādīt statusu"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Izmērs (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "skan kā"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Avota konts"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Specifiska galvene"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "sākas ar"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Apturēt procesēšanu"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subjekts"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Noņemt statusu"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
+msgid "<b>Then</b>"
+msgstr "<b>Līdz:</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _virtuālo mapi no meklējuma..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Fontu rekvizīti"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Rekvizīti"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "_Mapes nosaukums:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Palīdzības ziņojums"
+msgstr[1] "Palīdzības ziņojums"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Palīdzības ziņojums"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Nākošā _neizlasītā vēstule"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nākošā _neizlasītā vēstule"
+msgstr[1] "Nākošā _neizlasītā vēstule"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12938,417 +13627,438 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Create New Folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Norādīt, kur lai izveidotu mapi:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "vMapes"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Ielādēju..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz mapi"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz mapi"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Pārvietot"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Atcelt uzdevumu"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopēt"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Pārdēvēt mapi"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Skatīt"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Atvērt jaunā logā"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopēt..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Pārvietot..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Jauna mape"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Pārsaukt"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Rekvizīti..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Pā_rsaukt..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "vMapes"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Iesūtne"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Ielādēju..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pasts"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "A_tzīmēt kā lasītu"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Iezīme"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtra noteikumi"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "No"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Atbilstumi:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Atbildēt-Uz"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignēts"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kam"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
+"autnetiska."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Rediģēt parakstu"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
+"autnetiska."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subjekts"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Rediģēt parakstu"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datums"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s piesaistne"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
+msgid "Unencrypted"
+msgstr "Pārtraukts"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-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-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Neatbalstīta shēma"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Neizdodas pārbaudīt lapas parakstu"
+msgid "Encrypted"
+msgstr "PGP kodējums"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Neizdodas pārbaudīt lapas parakstu"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Saņemu vēstuli %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Asignēts"
+msgid "_View Certificate"
+msgstr "_Sertifikāta ID:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Rediģēt parakstu"
+msgid "This certificate is not viewable"
+msgstr "Sertifikāts vēl nav derīgs"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Rediģēt parakstu"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Nokavētie:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Pārtraukts"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Skatīt iekļauti"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "PGP kodējums"
+msgid "_Hide"
+msgstr "Slēpt"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d. lapa no %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Saņemu vēstuli %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13385,9 +14095,35 @@ msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
 msgid "Formatting message"
 msgstr "Pārvietojam vēstules"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "No"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Atbildēt-Uz"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kam"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Pastnieks"
 
@@ -13401,110 +14137,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Atbilstumi:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this 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:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"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:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datums"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Sertifikāta ID:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s piesaistne"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Sertifikāts vēl nav derīgs"
+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:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "līdz %B %d, %Y, %l:%M %P"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Nokavētie:"
+#: mail/em-format.c:1279
+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-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "līdz %B %d, %Y, %l:%M %P"
+msgid "Unsupported signature format"
+msgstr "Neatbalstīta shēma"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Skatīt iekļauti"
+msgid "Error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Slēpt"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d. lapa no %d"
+msgid "Unknown error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13621,7 +14294,7 @@ msgstr "Sūtīt _vēstuli uz saraksti..."
 msgid "_Add to Addressbook"
 msgstr "Pievienot adrešu grāmatu"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
@@ -13636,7 +14309,7 @@ msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 msgid "Subscribed"
 msgstr "Pierakstīties"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mape"
 
@@ -13673,11 +14346,25 @@ msgid "Add address"
 msgstr "_Adrese:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pasts no %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuālās mapes"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "vMapes avoti"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14173,70 +14860,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importēt"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Sacerētāja preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Šeit konfigurējiet jūsu epasta kontus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
+msgid "Evolution Pine importer"
+msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Pasta konti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution pasta sacerētājs."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Pasta Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Pasts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14298,38 +14952,6 @@ msgstr "Importējam"
 msgid "Importing mailbox"
 msgstr "Importējam failus"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14497,80 +15119,86 @@ msgstr "%s pasta sarakste"
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra noteikumus"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d izvēlētas"
+msgid_plural "%d deleted"
+msgstr[0] "%d izvēlētas"
+msgstr[1] "%d izvēlētas"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d nenosūtītas"
+msgid_plural "%d junk"
+msgstr[0] "%d nenosūtītas"
+msgstr[1] "%d nenosūtītas"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Melnraksti"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Melnraksti"
+msgstr[1] "Melnraksti"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d nosūtītas"
+msgid_plural "%d sent"
+msgstr[0] "%d nosūtītas"
+msgstr[1] "%d nosūtītas"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d nenosūtītas"
+msgid_plural "%d unsent"
+msgstr[0] "%d nenosūtītas"
+msgstr[1] "%d nenosūtītas"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d kopā"
+msgid_plural "%d total"
+msgstr[0] "%d kopā"
+msgstr[1] "%d kopā"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d nenosūtītas"
+msgid_plural ", %d unread"
+msgstr[0] "%d nenosūtītas"
+msgstr[1] "%d nenosūtītas"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Jauna vMape"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pasta filtri"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Pārbaudam servisu"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Savienojamies ar serveri..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitāte"
@@ -14636,16 +15264,23 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Pārbaudam servisu"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Savienojamies ar serveri..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Pirmsapskats"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14922,7 +15557,7 @@ msgstr "Necitēt oriģinālo vēstuli"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Izdarīts"
 
@@ -15287,6 +15922,122 @@ msgstr "krāsa"
 msgid "description"
 msgstr "apraksts"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vMapes avoti"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Apstiprināts"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "P_abeigts"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Reģistrjūtīgs"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Meklēt vēstulē"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Meklēt:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Karogs sekojumam"
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Pārvaldīt pierakstījumus"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Izvēlētais:"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "_Serveris:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Avota informācija"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Vēstules, kuras jūs izvēlējaties sekojumam, ir sakārtotas zemāk.\n"
+"Lūdzu izvēlieties sekojuma darbību zem \"Karogs\" izvēlnes."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Pasta konti"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Līdz:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "Ka_rodziņš:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Parakstīties"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Atrakstīties"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "tikai specifiskas mapes"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "ar visām akīvajām attālinātajām mapēm"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "ar visām lokālajām un aktīvajām attālinātajām mapēm"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "ar visām lokālām mapēm"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15495,14 +16246,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15607,8 +16350,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Nevaru pārvietot mapi: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15658,8 +16402,9 @@ msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "un vēl viena karte."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15688,8 +16433,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Nedzēst"
+msgstr "_Atdzēst"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15715,8 +16461,9 @@ msgstr ""
 
 #. mail:ask-signature-changed title
 #: mail/mail-errors.xml.h:179
+#, fuzzy
 msgid "Discard changed?"
-msgstr ""
+msgstr "Dinarda"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
@@ -15734,8 +16481,9 @@ msgstr ""
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "Dinarda"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -15752,8 +16500,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Nevaru izdzēst mapi:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15795,13 +16546,45 @@ msgstr ""
 "    '%s'\n"
 "Un tagad tiek atjauninātas."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Izņemu mapi %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "Jums ir jānorāda mape.\n"
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Jums jānosauc šī vmape."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nav izvēlēts serveris"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15809,16 +16592,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Pārrakstīt"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspena"
@@ -15978,7 +16761,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15987,46 +16770,21 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Reģistrjūtīgs"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Meklēt vēstulē"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Meklēt:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Avota informācija"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Atsaucu..."
@@ -16063,24 +16821,24 @@ msgstr "Atjauninu..."
 msgid "Waiting..."
 msgstr "Gaidu..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Atcerēties šo paroli"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
 
@@ -16137,15 +16895,15 @@ msgstr "Atjauninu vmapes priekš uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
@@ -16209,7 +16967,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -16265,10 +17023,6 @@ msgstr "Pārsūtīt"
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lasīt"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atbildēt"
@@ -16281,53 +17035,52 @@ msgstr "Atbildēt Visiem"
 msgid "Review"
 msgstr "Apskats"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Karogs sekojumam"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Ķermenis satur"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "P_abeigts"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Ķermenis nesatur"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Vēstules, kuras jūs izvēlējaties sekojumam, ir sakārtotas zemāk.\n"
-"Lūdzu izvēlieties sekojuma darbību zem \"Karogs\" izvēlnes."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Ķermenis vai subjekts satur"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Līdz:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Vēstule satur"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "Ka_rodziņš:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Adresāti satur"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Pārvaldīt pierakstījumus"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Sūtītājs satur"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Izvēlētais:"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Subjekts satur"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Subjekts nesatur"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "_Serveris:"
+msgid "Evolution Shell"
+msgstr "Evolution čaula."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Parakstīties"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Atrakstīties"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Kopsavilkuma komponente."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16397,31 +17150,20 @@ msgstr ""
 msgid "mail"
 msgstr "Epasts"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Nezināma kļūda"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Nepareizi argrumenti"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Nevar reģistrēties uz OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktīvie savienojumi"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Konfigurāciju datubāze nav atrasta"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Aktīvie savienojumi"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Vispārēja kļūda"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16606,30 +17348,6 @@ msgstr "Mapes nosaukums nedrīkst saturēt Return (Enter) simbolu."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' un '..' ir rezervēti mapju nosaukumi."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution ieiet nesaistes režīmā."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pasts uz %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izskatās, ka GNOME Pilot rīki nav uzstādīti šajā sistēmā."
@@ -16648,116 +17366,94 @@ msgstr "Bug buddy nevar tikt palaists."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Strādāt nesaistē"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Izvēles rūtiņa"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Jauna"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Jauns uzdevums"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Tests"
-
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Ievietot jaunu uzdevumu"
+msgid "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/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktīvie savienojumi"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution ieiet nesaistes režīmā."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "Active Connections"
-msgstr "Aktīvie savienojumi"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendārs:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Kontakti:"
+"Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs pogas, lai "
+"strādātu tiešsaistē."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Pasts:"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pasts uz %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Uzdevumi:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "Folder _type:"
-msgstr "Mapes tips:"
+msgid "Uknown system error."
+msgstr "Nezināma kļūda"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Atvērt cita lietotāja mapi"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Nepareizi argrumenti"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Konts:"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Mapes nosaukums:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfigurāciju datubāze nav atrasta"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Vispārēja kļūda"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Lietotājs:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Jauna"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution uzstādīšanas asistents"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importējam failus"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Laika zona"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Esiet aicināti"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
@@ -16772,7 +17468,7 @@ msgstr ""
 "\n"
 "Lūdzu klikšķiniet \"Nākošais\" pogu, lai turpinātu."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
@@ -16785,20 +17481,20 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" pogu, lai saglabātu uzstādijumus. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution čaula."
+msgid "New Test"
+msgstr "Jauns uzdevums"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Tests"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Kopsavilkuma komponente."
+msgid "Create a new test item"
+msgstr "Ievietot jaunu uzdevumu"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16864,7 +17560,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16899,7 +17595,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16908,40 +17604,40 @@ msgstr ""
 "Paldies\n"
 "Ximian Evolution Komanda\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nesakiet man vēlreiz"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Startēt nesaistes režīmā"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Startēt tiešsaistes režīmā"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forsēt konfigurācijas failu atjaunināšanu no Evolution versijas 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17016,6 +17712,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17283,6 +18001,12 @@ msgstr "_Sertifikāta ID:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kartes ID jau eksistē"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17516,12 +18240,6 @@ msgstr "Subjekts ir %s"
 msgid "Certificate Signature Value"
 msgstr "Sertifikāta paraksta neizdošanās"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kartes ID jau eksistē"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17665,8 +18383,8 @@ msgstr "Parādīt pašreizējo kontaktu"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Darbības"
@@ -18163,16 +18881,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:5
-msgid "Close this window"
-msgstr "Aizvērt šo logu"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Aizvērt"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18586,6 +19294,16 @@ msgstr "_Rīki"
 msgid "_Undelete"
 msgstr "_Atdzēst"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Aizvērt šo logu"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Aizvērt"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Piesaistīt"
@@ -18668,10 +19386,6 @@ msgstr "Saglabāt pašreizējo failu ar citu nosaukumu"
 msgid "Save the message in a specified folder"
 msgstr "Saglabāt vēstuli norādītajā mapē"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Sūtīt"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19258,7 +19972,7 @@ msgid "Evolution Query"
 msgstr "Evolution Kopsavilkuma komponente."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19423,27 +20137,280 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Slikta autentifikācijas atbilde no servera."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Saraksta vā_rds:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Saglabāt Sarakstu kā VKarti"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Grupa"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nevarēju sāknēt wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "K_alendārs:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Skaņas trauksmes opcijas"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Ziņas trauksmes opcijas"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Pasta trauksmes opcijas"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programmas Trauksmes opcijas"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Nezināmas trauksmes opcijas"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Atkārtot trauksmi"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Vēstules attēlošana"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "Vēstules ķermenis"
+
+#~ msgid "Play sound:"
+#~ msgstr "Spēlēt skaņu:"
+
+#~ msgid "Run program:"
+#~ msgstr "Palaist programmu:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Ar šiem argumentiem:"
+
+#~ msgid "Basics"
+#~ msgstr "Pamati"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datums/laiks:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Atgādinājums"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opcijas:"
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresu grāmata..."
+
+#~ msgid "Reminder"
+#~ msgstr "Atgādinājums"
+
+#~ msgid "B_usy"
+#~ msgstr "Aizņe_mts"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Konfidenciāls"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Datums/laiks:"
+
+#~ msgid "F_ree"
+#~ msgstr "Brīvs"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vāts"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blisks"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Apmeklētājs"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Pievienot sūtītāju adrešu _grāmatai"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Izņēmumi"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Pirmsapskats:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Atkārtošanās noteikums"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Atkārtošanās pē_c izvēles"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modificēt"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Bez a_tkārtošanās"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Vienkārša atkārtošanās"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% izpildīts"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Progresā"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Konfidenciāli"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "M_ape:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Sākas:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Beidzas:</b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Izpildīts:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Līdz:</b>"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nekas</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Ir kļūda CORBA sistēmā\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objektu nevarēja atrast\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Pievienot sūtītāju adrešu _grāmatai"
+
+#~ msgid "_Options"
+#~ msgstr "_Opcijas"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Sanāksmes _sākuma laiks:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Sanāksmes _beigu laiks:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kļūda %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Neizdevās atrast sertifikātu \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "_Izveidot noteikumu no vēstules"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nevarēju izveidot sacerētāja logu:\n"
+#~ "Nespēju aktivizēt HTML redaktora komponenti."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Rezultāta noteikumi"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Mapes nosaukums:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Pārsaukt"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Rekvizīti..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Izvēles rūtiņa"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendārs:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontakti:"
+
+#~ msgid "_Mail:"
+#~ msgstr "_Pasts:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Uzdevumi:"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Mapes tips:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Atvērt cita lietotāja mapi"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Mapes nosaukums:"
+
+#~ msgid "_User:"
+#~ msgstr "_Lietotājs:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nespēju savienoties ar LDAP serveri"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Nespēju autentificēties ar LDAP serveri"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Kļūda saņemot shēmas informāciju"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  Pa_rādīt atbalstītās bāzes"
 
@@ -19516,9 +20483,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Webcam:"
 #~ msgstr "Lapa"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategoriju redaktors nav pieejams."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19576,10 +20540,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ "Notikums, kuru jūs vēlaties dzēst, ir sanāksme, vai jūs vēlaties izsūtīt "
 #~ "atsaukumus?"
 
-#~ 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?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19598,57 +20558,20 @@ msgstr "%s (%d%% izpildīts)"
 #~ "Žurnāla ieraksts, ko jūs vēlaties dzēst, ir publicēts, vai jūs vēlaties "
 #~ "izsūtīt atsaukumu?"
 
-#~ 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?"
-
-#~ 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'?"
-
 #~ 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?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] ""
-#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
-#~ msgstr[1] ""
-#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
-#~ msgstr[1] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] ""
-#~ "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
-#~ msgstr[1] ""
-#~ "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Ielūgt citus..."
 
@@ -19706,179 +20629,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Nezināma servera atbilde: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Piešķirt rezultātu"
-
-#~ msgid "Assign Color"
-#~ msgstr "Uzstādīt krāsu"
-
-#~ msgid "Assign Score"
-#~ msgstr "Uzstādīt rezultātu"
-
-#~ msgid "Attachments"
-#~ msgstr "Piesaistījumi"
-
-#~ msgid "Beep"
-#~ msgstr "Pīkstiens"
-
-#~ msgid "contains"
-#~ msgstr "satur"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopēt uz mapi"
-
-#~ msgid "Date received"
-#~ msgstr "Saņemšanas datums"
-
-#~ msgid "Date sent"
-#~ msgstr "Nosūtīšanas datums"
-
-#~ msgid "Deleted"
-#~ msgstr "Dzēsts"
-
-#~ msgid "does not contain"
-#~ msgstr "nesatur"
-
-#~ msgid "does not end with"
-#~ msgstr "nebeidzas ar"
-
-#~ msgid "does not exist"
-#~ msgstr "neeksistē"
-
-#~ msgid "does not return"
-#~ msgstr "neatgriežas"
-
-#~ msgid "does not sound like"
-#~ msgstr "neskan kā"
-
-#~ msgid "does not start with"
-#~ msgstr "nesākas ar"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Neeksistē"
-
-#~ msgid "Draft"
-#~ msgstr "Melnraksts"
-
-#~ msgid "ends with"
-#~ msgstr "beidzas ar"
-
-#~ msgid "Exist"
-#~ msgstr "Eksistē"
-
-#~ msgid "exists"
-#~ msgstr "eksistē"
-
-#~ msgid "Expression"
-#~ msgstr "Izteiksme"
-
-#~ msgid "Follow Up"
-#~ msgstr "Sekojums"
-
-#~ msgid "is"
-#~ msgstr "ir"
-
-#~ msgid "is after"
-#~ msgstr "ir pēc"
-
-#~ msgid "is before"
-#~ msgstr "ir pirms"
-
-#~ msgid "is Flagged"
-#~ msgstr "ir karogots"
-
-#~ msgid "is greater than"
-#~ msgstr "ir lielāks par"
-
-#~ msgid "is less than"
-#~ msgstr "ir mazāks par"
-
-#~ msgid "is not"
-#~ msgstr "nav"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nav karogots"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Jūnijs"
-
-#~ msgid "Mailing list"
-#~ msgstr "Adresātu saraksts"
-
-#~ msgid "Message Body"
-#~ msgstr "Vēstules ķermenis"
-
-#~ msgid "Message Header"
-#~ msgstr "Vēstules galvene"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Vēstule tika nosūtīta"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Vēstule %s nav atrasta."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Pārvietot uz mapi"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Iziet no programmas"
-
-#~ msgid "Play Sound"
-#~ msgstr "Spēlēt skaņu"
-
-#~ msgid "Recipients"
-#~ msgstr "Adresāti"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regex atbilšana"
-
-#~ msgid "Replied to"
-#~ msgstr "Atbildēts uz"
-
-#~ msgid "returns"
-#~ msgstr "atgriež"
-
-#~ msgid "returns greater than"
-#~ msgstr "atgriež lielāku kā"
-
-#~ msgid "returns less than"
-#~ msgstr "atgriež mazāk kā"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Palaist programmu:"
-
-#~ msgid "Sender"
-#~ msgstr "Sūtītajs"
-
-#~ msgid "Set Status"
-#~ msgstr "Uzstādīt statusu"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Izmērs (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "skan kā"
-
-#~ msgid "Source Account"
-#~ msgstr "Avota konts"
-
-#~ msgid "Specific header"
-#~ msgstr "Specifiska galvene"
-
-#~ msgid "starts with"
-#~ msgstr "sākas ar"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Apturēt procesēšanu"
-
-#~ msgid "Unset Status"
-#~ msgstr "Noņemt statusu"
-
 #~ msgid "Working"
 #~ msgstr "Strādāju"
 
@@ -20094,10 +20844,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Finished"
 #~ msgstr "Beigt"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Grupa"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20659,9 +21405,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "component"
 #~ msgstr "Tikšanās"
 
-#~ msgid "Alarms"
-#~ msgstr "Trauksmes"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Ģeogrāfiskā pozīcija"
 
@@ -21228,10 +21971,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Nevar izveidot direktoriju %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Izvēlieties kontaktus no adrešu grāmatas"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "_Dzimšanas diena:"
 
@@ -21303,22 +22042,10 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Kalendāra informācija"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Kalendāra informācija"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klasifikācija"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Datums & laiks"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Apraksts:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Sākas:</b> "
 
@@ -21743,9 +22470,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Saņemu LDAP meklēšanas rezultātus..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Kļūda izpildot meklēšanu"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Repozitorijs nesaistes režīmā"
@@ -21885,10 +22609,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution kalendāra kopsavilkuma komponente."
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
 
@@ -21989,9 +22709,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Use Score"
 #~ msgstr "Rezultāts"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kursors nevarēja tikt ieladēts\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mape, kas satur informāciju par kontaktiem"
 
@@ -24279,9 +24996,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Emporia"
 #~ msgstr "Emporija"
 
-#~ msgid "Enid"
-#~ msgstr "Enida"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -25665,9 +26379,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -26058,9 +26769,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manasasa"
 
@@ -28437,9 +29145,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "South Dakota"
 #~ msgstr "Dienviddakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30656,9 +31361,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "View the selected folder"
 #~ msgstr "Parādīt izvēlēto mapi"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopēt..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Mapju josla"
 
@@ -30668,27 +31370,18 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Iet uz mapi..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Pārvietot..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Jauna mape"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Dzēst cita lietotāja mapi"
 
-#~ msgid "_Rename..."
-#~ msgstr "Pā_rsaukt..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Ī_sinājumikonu josla"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "Ī_sinājums..."
 
-#~ msgid "Information"
-#~ msgstr "Informācija"
-
 #~ msgid "Error"
 #~ msgstr "Kļūda"
 
@@ -30778,9 +31471,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Izveidot _jaunu mapi..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontakti..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Ražotne LDIF failu importēšanai Evolution."
 
@@ -30879,9 +31569,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Re_store Defaults"
 #~ msgstr "At_jaunot noklusējumus"
 
-#~ msgid "Select"
-#~ msgstr "Izvēlēties"
-
 #~ msgid ""
 #~ "To add an attribute to the DN, select it from the list and click the "
 #~ "\"Add Attribute\" button.\n"
@@ -30964,9 +31651,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "(%d not shown)"
 #~ msgstr "(%d nav parādīts)"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "K_ontakti..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Telefona tipi"
 
@@ -31365,9 +32049,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "_Ievietot teksta failu... (FIXME)"
 
-#~ msgid "Send _Later"
-#~ msgstr "Sūtīt _vēlāk"
-
 #~ msgid "F_ormat"
 #~ msgstr "F_ormāts"
 
@@ -31526,9 +32207,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Meeting ends: <b>"
 #~ msgstr "Sanāksme beidzās: <b>"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Brīvs/Aizņemts info beidzās: <b>"
-
 #~ msgid "Task Completed: <b>"
 #~ msgstr "Uzdevums Izpildīts: <b>"
 
@@ -31655,9 +32333,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_Pilot Settings..."
 #~ msgstr "_Pilot uzstādījumi..."
 
-#~ msgid "Could not query for schema information"
-#~ msgstr "Nevarēju pieprasīt informāciju par shēmu"
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Pasta kopsavilkuma komponentes ražotne."
 
@@ -31753,12 +32428,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Could not create a PGP decryption context."
 #~ msgstr "Nevarēja izveidot PGP atkodēšanas kontekstu."
 
-#~ msgid "Moving"
-#~ msgstr "Pārvietoju"
-
-#~ msgid "Copying"
-#~ msgstr "Kopēju"
-
 #~ msgid "Signature name:"
 #~ msgstr "Paraksta nosaukums:"
 
@@ -32093,9 +32762,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Nevarēju atvērt mapi: vēstuļu saraksts bija nepilnīgs."
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Nevarēju saņemt vēstuli no POP servera %s: %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Nezināms)"
 
diff --git a/po/mn.po b/po/mn.po
index 1faee01116..6f2f967aea 100755
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-14 12:40+0800\n"
 "Last-Translator: Dulmandakh <sdulmandakh@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-gnome@lists.sf.net>\n"
@@ -22,15 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Эвелюшин хаягийн дэвтэр"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Эволюшин сэрүүлэг"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -55,34 +46,246 @@ msgstr "картууд"
 msgid " card"
 msgstr "картууд"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Эволюшин сэрүүлэг"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "LDAP серверээр баталгаажуулж чадсангүй"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+msgid "Could not get schema information for LDAP server."
+msgstr ""
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Тайлбар алга."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Хаягийн дэвтэрт хадгалах"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr ""
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "болон бусад нэг холбоо."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Бүх холбоонуудыг тэмдэглэх"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Холбоо нэмэхэд алдаа гарлаа"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Эвелюшин хаягийн дэвтрийн хаяг үзүүлэгч"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Баталгаажуулалт хийж чадсангүй.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Автоматаар гүйцээх"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Холбоонууд"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Батламж"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Автомат гүйцээлтийг энд тохируул"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Холбоонууд"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Эвелюшин хаягийн дэвтэр"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Эвелюшин хаягийн дэвтрийн хаяг үзүүлэгч"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+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 "Evolution folder settings configuration control"
+msgstr "Эволюшин хавтасны тохируулгын тохиргууны удирдлага"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -115,7 +318,7 @@ msgstr "Шинэ холбоо"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Холбоо"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -139,15 +342,15 @@ msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Энэ компьютер дээр"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -156,21 +359,21 @@ msgid "Personal"
 msgstr "Хувийн"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Автоматаар гүйцээх"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -178,58 +381,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Шинэ хаягийн дэвтэр"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Устгах"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Шинжүүд:"
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Холбоонууд"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Баталгаажуулалт хийж чадсангүй.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -249,60 +461,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Автоматаар гүйцээх"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Холбоонууд"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Батламж"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Автомат гүйцээлтийг энд тохируул"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Эвелюшин хаягийн дэвтэр"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Эвелюшин хаягийн дэвтрийн хаяг үзүүлэгч"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-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 "Evolution folder settings configuration control"
-msgstr "Эволюшин хавтасны тохируулгын тохиргууны удирдлага"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -310,7 +468,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -319,8 +477,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -346,6 +503,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "<b>Б_айршил</b>"
@@ -395,13 +553,11 @@ msgid "Anonymously"
 msgstr "Хэн нэгэнээр"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Энгийн"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэлгэрэнгүй"
 
@@ -621,33 +777,26 @@ msgid "cards"
 msgstr "картууд"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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.c:702
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Бүгдийг устгах"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Бүгдийг устгах"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Холбооны жагсаалтыг үзүүлэх"
@@ -662,7 +811,7 @@ msgid "Send HTML Mail?"
 msgstr "ХТМЛ захиадал илгээх үү?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Холбоонуудад нэмэх"
 
@@ -670,14 +819,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Эх үүсвэр"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
@@ -705,6 +861,11 @@ msgstr "_"
 msgid "_Find"
 msgstr "Олох"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Хайх"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -751,9 +912,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Ажлын долоо хоног</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -778,7 +938,6 @@ msgid "Birthday:"
 msgstr "Төрсөн _өдөр:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Хуанли:"
 
@@ -793,15 +952,15 @@ msgid "Company:"
 msgstr "_Компаниар"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Холбоо"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Холбооны засварлагч"
 
@@ -910,8 +1069,8 @@ msgstr "_Вэб хуудас нээх"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -933,40 +1092,28 @@ msgid "_File under:"
 msgstr "_Шүүлтүүрүүд..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Хэрэглэгч:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Хаяг"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Засварлагдах"
 
@@ -1945,136 +2092,128 @@ msgstr "Замби"
 msgid "Zimbabwe"
 msgstr "Зимбаб"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
-msgid "Jabber"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Бүлэг"
+msgid "Service"
+msgstr "Эх үүсвэр"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Байршил:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Шинээр нэрлэх"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Гэрийн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Бусад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Бүлэг"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Эх дэвтэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Өөрчлөгдсөн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Негр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Дараахи холболтууд одоо идэвхитэй байна:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d холбоонууд"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Эх үүсвэр"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Байршил:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Шинээр нэрлэх"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2092,6 +2231,18 @@ msgstr "_Бүтэн нэр:"
 msgid "E-_mail:"
 msgstr "_Ц-шуудан:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Хаяг _2:"
@@ -2218,46 +2369,65 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Гишүүд"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Тэмдэглэгдсэн"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Жагсаалтын нэр:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Дэвтэр"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Шинэ жагсаалт"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
-msgid "Contact List Editor"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
+msgid "Contact List Editor"
 msgstr ""
 
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
@@ -2294,412 +2464,11 @@ msgid ""
 msgstr ""
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Гишүүдийг жагсаах"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "Ц-шуудан"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Байгууллага"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Тайлбар"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Бүлэг"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Машины утас"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Ажилын"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Гар утас"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Хувийн"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Тэмдэглэл"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Албан тушаал"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Ц-шуудан"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Вэб хуудас"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Амжилттай"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Хаягийн дэвтэр"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Шинэ холбооны жагсаалт"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Зөвшөөрөгдөөгүй"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Холбоо олдсонгүй"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Цуцлагдсан"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "`%s' хавтсыг нээж чадахгүй байна"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Баталгаажуулж чадсангүй"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Баталгаажуулах хэрэгтэй"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Бусад алдаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
-" болон хандах эрхээ шалгана уу."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
-" болон хандах эрхээ шалгана уу."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Энэ хүсэлт амжилттай дууссангүй."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Холбоо нэмэхэд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Жагсаалтыг устгахад алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Холбоог устгахад алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Дарж бичих"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "жагсаах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Холбоог зөөх"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Холбоог хуулах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Холбоонуудыг зөөх"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Холбоонуудыг хуулах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Хаягийн дэвтэрт хадгалах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr ""
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(алга)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Анхдагч ц-шуудан"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Ц--шуудан 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Ц--шуудан 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Үйлдлээ тэмдэглэх"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Шинэ \"%s\" данс нээх"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Хаягийн дэвтэр..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Холбоо барих мэдээллийг засварлах"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Ц-шуудангийн хаягийг нийлүүлэх"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "болон бусад нэг холбоо."
-msgstr[1] "болон бусад нэг холбоо."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Хаягийн дэвтэрт хадгалах"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Холбоо алга"
@@ -2713,9 +2482,9 @@ msgstr[1] "%d холбоонууд"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Хүсэлт"
 
@@ -2731,134 +2500,134 @@ msgstr "Загвар"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Нэрний эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Ц-шуудангийн эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Төрөл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Нэрээр хадгалах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Шинэ холбоо..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Шинэ холбооны жагсаалт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Хавтас руу оч..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Оруулах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Хэвлэх"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Хайчлах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Хуулах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Буулгах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Одоогийн үзэмж"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
@@ -2892,6 +2661,8 @@ msgid "Car Phone"
 msgstr "Машины утас"
 
 #: 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:3
 msgid "Categories"
 msgstr ""
 
@@ -2899,6 +2670,21 @@ msgstr ""
 msgid "Company Phone"
 msgstr "Компанийн утас"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Ц-шуудан"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Ц--шуудан 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Ц--шуудан 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Овог"
@@ -2935,14 +2721,29 @@ msgstr "Сэтгүүл"
 msgid "Manager"
 msgstr "Зохион байгуулагч"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Гар утас"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Хоч"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Тэмдэглэл"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Байгууллага"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Бусад факс"
@@ -2994,29 +2795,21 @@ msgstr "Нэгж"
 msgid "Web Site"
 msgstr "Вэб сайт"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Өргөн"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Өндөр"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Тэмдэглэгдсэн"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Курсортой"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr ""
@@ -3033,7 +2826,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3042,21 +2839,389 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Тэмдэглэгдсэн"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Курсортой"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Гишүүдийг жагсаах"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "Ц-шуудан"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Тайлбар"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Машины утас"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Ажилын"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Хувийн"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Албан тушаал"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Вэб хуудас"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Амжилттай"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Хаягийн дэвтэр"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Шинэ холбооны жагсаалт"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Зөвшөөрөгдөөгүй"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Холбоо олдсонгүй"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "`%s' хавтсыг нээж чадахгүй байна"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Баталгаажуулж чадсангүй"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Баталгаажуулах хэрэгтэй"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Бусад алдаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
+" болон хандах эрхээ шалгана уу."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
+" болон хандах эрхээ шалгана уу."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Энэ хүсэлт амжилттай дууссангүй."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Холбоо нэмэхэд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Жагсаалтыг устгахад алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Холбоог устгахад алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Дарж бичих"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "жагсаах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Холбоог зөөх"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Холбоог хуулах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Холбоонуудыг зөөх"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Холбоонуудыг хуулах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Хаягийн дэвтэрт хадгалах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr ""
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(алга)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Анхдагч ц-шуудан"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Үйлдлээ тэмдэглэх"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Шинэ \"%s\" данс нээх"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Хаягийн дэвтэр..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Холбоо барих мэдээллийг засварлах"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Ц-шуудангийн хаягийг нийлүүлэх"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "болон бусад нэг холбоо."
+msgstr[1] "болон бусад нэг холбоо."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Хаягийн дэвтэрт хадгалах"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Картын үзэмж"
@@ -3102,6 +3267,11 @@ msgstr "Эволюшин сэрүүлэг"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr ""
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Холбоонуудыг хэвлэх"
@@ -3111,11 +3281,6 @@ msgstr "Холбоонуудыг хэвлэх"
 msgid "Print contact"
 msgstr "Холбоог хэвлэх"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr ""
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3300,6 +3465,22 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Файлыг нээх чадахгүй"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Хаягийн дэвтрийг нээх боломжгүй"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3354,22 +3535,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Файлыг нээх чадахгүй"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Хаягийн дэвтрийг нээх боломжгүй"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3386,39 +3551,358 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Нэр үгүй жагсаалт"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Бүү оруулж ир"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Илгээх этгээд:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Та энэ нэр үгүй үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Та энэ уулзалтыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Та энэ уулзалтыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Уулзалт"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Серверийн мэдээлэл:"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Илгээх"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr ""
-
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+msgid "Could not start evolution-data-server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Хуанли ба үүрэг"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Хуанлинууд"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Үүргүүд"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Хуанлинууд"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Эхлэх:"
@@ -3502,10 +3986,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr ""
@@ -3646,9 +4126,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Дүгнэлтэд агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Тохироогүй"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3666,8 +4167,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "өдрүүд"
 
@@ -3678,7 +4179,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3727,62 +4228,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Хуанлинууд"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Зориулалт"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Шинэ зориулалт үүсгэх"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Уул_залт"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Шинэ уулзалтын хүсэлт үүсгэх"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Бүтэн өдрийн шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Бүтэн _өдрийн төлөвлөгөө"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Хуанли"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Хуанли"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Шинэ хуанли үүсгэх"
 
@@ -3812,27 +4303,6 @@ msgstr "Долоо хоногийн үзэмж"
 msgid "Month View"
 msgstr "Сарын  үзэмж"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Дүгнэлтэд агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Тохироогүй"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
@@ -3850,227 +4320,133 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "<b>Түгшүүрийн давталт</b>"
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Хугацаа</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "<b>Харуулах зурвас</b>"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Илгээх зурвас"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Авиа тоглуул:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Түгшүүрийг давт"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Програм ажиллуул:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Илгээх этгээд:"
+msgid "<b>Options</b>"
+msgstr "<b>Тайлбар</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Хугацаа</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Шинэ хуанли нэмэх"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "цаг"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "_Шинэ зурвас зохиох"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Нэмэх"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
 #, fuzzy
-msgid "Basics"
-msgstr "Энгийн"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr ""
+msgid "Mes_sage:"
+msgstr "_Мэдээлэл"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Дуу тоглуул"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Сануулагч"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Програм ажиллуул"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Илгээх этгээд:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Ц-захиа илгээх"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Нийт:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Данс:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Програм ажиллуул:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Түгшүүрийг давт"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Илгээх"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "дараа"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "өмнө"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "өдөр(үүд)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "цаг"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "цаг"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "минут"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Шинэ хуанли нэмэх"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Үүргийн жагсаалтын бүлэг"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Коморск"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Шинэ хуанли нэмэх"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "Бүлэг"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Ахин шинэчлэх"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Нэмэх"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_Type:"
-msgstr "Төрөл:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
+msgid "Alarms"
+msgstr "Үргэлж"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4187,7 +4563,7 @@ msgid "Free/Busy Publishing"
 msgstr "Чөлөөтэй/завгүй хүсэлт"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Баасан"
@@ -4201,7 +4577,7 @@ msgid "Minutes"
 msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Даваа"
@@ -4211,7 +4587,7 @@ msgid "S_un"
 msgstr "Н_ям"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Бямба"
@@ -4225,7 +4601,7 @@ msgid "Show week _numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Ням"
@@ -4239,7 +4615,7 @@ msgid "T_hu"
 msgstr "Пү_р"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Пүрэв"
@@ -4253,7 +4629,7 @@ msgid "Time format:"
 msgstr "Цагийн хэлбэр:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Мягмар"
@@ -4263,7 +4639,7 @@ msgid "W_eek starts:"
 msgstr "_Долоо хоног эхлэнэ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Лхагва"
@@ -4297,7 +4673,8 @@ msgstr ""
 msgid "_Day begins:"
 msgstr "_Өдөр эхлэнэ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4347,6 +4724,80 @@ msgstr "_Лха"
 msgid "before every appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Шинэ хуанли нэмэх"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Үүргийн жагсаалтын бүлэг"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Коморск"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Шинэ хуанли нэмэх"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Бүлэг"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Ахин шинэчлэх"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Төрөл:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr ""
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
@@ -4391,79 +4842,73 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "-д"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Дууссан"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Дууссан"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Дүгнэлт алга"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Нэрээр хадгалах..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "-д"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Дууссан"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Дууссан"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4527,8 +4972,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Хаягийн дэвтэр..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Холбоонууд"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4538,163 +4984,221 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Уулзалт"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Сануулагч"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Хандлага"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Уулзалт"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Эхлэх өдөр буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Төгсөх өдөр буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Эхлэх цаг буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Төгсөх цаг буруу байна"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "Бүтэн өдрийн шинэ зориулалт"
+msgstr[1] "Бүтэн өдрийн шинэ зориулалт"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "Шинэ зориулалт"
+msgstr[1] "Шинэ зориулалт"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "Шинэ зориулалт үүсгэх"
+msgstr[1] "Шинэ зориулалт үүсгэх"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Бүх өдрийн ажлууд"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "Бүтэн өдрийн шинэ зориулалт"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "За_вгүй"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "Шинэ зориулалт"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr ""
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "Шинэ зориулалт үүсгэх"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Үүргийн жагсаалт</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Ангилал"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Хугацаа</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr ""
+msgid "A_ll day event"
+msgstr "Бүх өдрийн ажлууд"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
-msgid "Date & Time"
-msgstr "Он сар өдөр/цаг"
+msgid "C_ustomize..."
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Чөлөөтэй"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Байршил:"
+msgid "Cale_ndar:"
+msgstr "Хуанли:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Хувийн"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Ангилал"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Нийтийн"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "<b>Цагийг харуул</b>"
+msgid "L_ocation:"
+msgstr "Байршил:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Хувийн"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Нийтийн"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "<b>Цагийг харуул</b>"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Нийт:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Цэвэрлэх"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Тайлбар:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Дуусах цаг:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Эхлэх цаг:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Алга"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Зохион байгуулагч шаардлагатай."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Устгах"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4734,35 +5238,45 @@ msgid "Member"
 msgstr "Гишүүн"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr ""
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Хугацаа</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Хаягийн дэвтэр..."
+msgid "<b>Organizer</b>"
+msgstr "<b>Хугацаа</b>"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
 msgstr "Зохион байгуулагч:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Холбоонууд"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Зохион байгуулагч:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4829,150 +5343,142 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "эхний"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "2 дахь"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "3 дахь"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "4 дэх"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "сүүлийн"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Бусад өдрүүд"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "өдөр"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Он сар өдөр/цаг"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Бүх"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Өргөтгөлүүд"
+msgid "<b>Exceptions</b>"
+msgstr "<b>Тайлбар</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Өмнөх үзэмж:"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr ""
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Өөрчлөх"
+msgid "<b>Preview</b>"
+msgstr "<b>Хугацаа</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "<b>Хугацаа</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Устгах"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Бүх"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Шинэ зориулалт"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "-д"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "үүрд"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "сар"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "болтол"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "долоо хоног"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "жил"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Үйлдлээ тэмдэглэх"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Тайлбар"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Үүргийн жагсаалтын нэр"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr ""
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>Сануулагч</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _дууссан"
+msgid "<span weight=\"bold\">Status</span>"
+msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Дууссан"
 
@@ -4984,8 +5490,8 @@ msgstr "Өндөр"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Явж байна"
@@ -4997,23 +5503,22 @@ msgid "Low"
 msgstr "Бага"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Хэвийн"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Эхлээгүй"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Явж байна"
+msgid "P_ercent complete:"
+msgstr "_Дууссан он сар өдөр:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5038,36 +5543,40 @@ msgstr "_Байдал:"
 msgid "_Web Page:"
 msgstr "_Вэб хуудас нээх"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Тайлбар:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Хавтас:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5078,59 +5587,57 @@ msgstr "_Эхлэх цаг:"
 msgid "_Due date:"
 msgstr "Он сар өдөр:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Бүлэг:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
+msgid "<b>Free/Busy C_alendars</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Өдөр"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Чөлөөтэй/завгүй мэдээлэл"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Чөлөөтэй/завгүй мэдээлэл"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Жагсаалтын нэр:"
+msgid "_Daily"
+msgstr "Өдөр"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Нууц үгээ _мартсан"
+msgid "_Manual"
+msgstr "Мали"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Нууц үгээ _мартсан"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
-msgstr ""
+#, fuzzy
+msgid "_Remember password"
+msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
 #, fuzzy
-msgid "URL:"
-msgstr "URL"
+msgid "_Username:"
+msgstr "Шинээр нэрлэх"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Долоо хоног"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5212,7 +5719,7 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr ""
@@ -5221,6 +5728,11 @@ msgstr ""
 msgid "Untitled"
 msgstr ""
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Нийт:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5234,7 +5746,7 @@ msgstr "Он сар өдөр:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr ""
 
@@ -5248,19 +5760,90 @@ msgstr "_Давуу эрх:"
 msgid "Web Page:"
 msgstr "_Вэб хуудас нээх"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Нийтийн"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "_Дуусах цаг:"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Хувийн"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Дүгнэлт"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Чөлөөтэй"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Завгүй"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Х"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "У"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Тийм"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Үгүй"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Үл мэдэгдэх"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:396
@@ -5307,95 +5890,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Чөлөөтэй"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Завгүй"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Нээх"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Вэб хуудас нээх"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Нэрээр хадгалах..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Хэвлэх..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Х_ачлах"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Хуулах"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Буулгах"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Устгах"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Нэрээр хадгалах..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
@@ -5404,179 +5993,112 @@ msgstr ""
 msgid "% Complete"
 msgstr "% гүйцэтгэгдсэн"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Дууссан"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Гүйцэтгэгдсэн он сар өдөр"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Он сар өдөр:"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Давуу эрх"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "_Эхлэх цаг:"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Дүгнэлт"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Хавтсанд хадгалах..."
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Хавтас руу хуулах..."
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Шинэ _уулзалт..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Бүгдийг _тэмдэглэх"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Устгах..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Хавтас руу хуулах..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Хавтас руу зөөх..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Тохируулгууд..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "_Дуусах цаг:"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Үл мэдэгдэх"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Тийм"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Үгүй"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Х"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "У"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5600,36 +6122,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5696,341 +6218,318 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr ""
+#, fuzzy
+msgid "Starts"
+msgstr "_Байдал:"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:733
+msgid "Due"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Алга</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Байршил:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Зөвшөөрөгдсөн"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Шинэчлэх"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "За"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Зөвшөөрөх"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Чөлөөтэй/завгүй мэдээллүүдийг илгээх"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Сүүлийн мэдээллүүдийг илгээх"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Чөлөөтэй/завгүй мэдээлэл"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Чөлөөтэй/завгүй хүсэлт"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Чөлөөтэй/завгүй хариу"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Буруу чөлөөтэй/завгүй мэдээлэл"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Устгалт дууслаа"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Илгээгдсэн!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6059,6 +6558,10 @@ msgstr "Хуанлийг ачааллаж байна"
 msgid "Loading calendar..."
 msgstr "Хуанлийг ачааллаж байна..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Зохион байгуулагч:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Серверийн мэдээлэл:"
@@ -6075,11 +6578,6 @@ msgstr ""
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr ""
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
@@ -6147,6 +6645,28 @@ msgstr ""
 msgid "In Process"
 msgstr ""
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ажлын байрандаа байхгүй"
@@ -6155,208 +6675,111 @@ msgstr "Ажлын байрандаа байхгүй"
 msgid "No Information"
 msgstr "Мэдээлэл алга"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Хаягийн дэвтэр..."
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr ""
+msgid "O_ptions"
+msgstr "Өргөтгөлүүд"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Ажлын долоо хоногийг харуулах"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Нэг сарыг харуулах"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Уулзалтын _эхлэх цаг:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Уулзалт _дуусах цаг:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr ""
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr "Жагсаалтыг устгахад алдаа гарлаа"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Тэмдэглэгдсэн обьектуудыг устгаж байна..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Үүргүүд"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Шинэчлэх"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s-г нэмж байна"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Хуанли ба үүрэг"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Хуанлинууд"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4-р сар"
@@ -6696,10 +7119,6 @@ msgstr ""
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr ""
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6730,7 +7149,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr ""
 
@@ -6758,7 +7177,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d холбоонууд"
 msgstr[1] "%d холбоонууд"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6779,35 +7198,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Үүргийн жагсаалтын бүлэг"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Хаягийн дэвтэрт хадгалах"
@@ -8474,69 +8887,69 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
@@ -8558,42 +8971,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr ""
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr ""
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Анхааруулга"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr ""
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8633,7 +9010,43 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr ""
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr ""
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Анхааруулга"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr ""
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8641,43 +9054,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8685,99 +9098,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9012,7 +9425,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9091,55 +9504,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr ""
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
@@ -9211,7 +9624,7 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
@@ -9296,8 +9709,9 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
-msgstr ""
+#, fuzzy
+msgid "Cannot find signature digests"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:651
 #, c-format
@@ -9310,47 +9724,45 @@ msgstr ""
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+msgid "Cannot attach CMS data object"
 msgstr ""
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Шинэ холбоо үүсгэх"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9396,7 +9808,8 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
@@ -9405,8 +9818,8 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9526,7 +9939,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9535,11 +9948,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9556,7 +9969,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9566,35 +9979,35 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr ""
@@ -9618,7 +10031,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9639,8 +10052,8 @@ msgid "Checking for new mail"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr ""
 
@@ -9671,8 +10084,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9691,303 +10104,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "жагсаах"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 ""
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Үл мэдэгдэх алдаа"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "LDAP серверээр баталгаажуулж чадсангүй"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "%d секунд"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Үл мэдэгдэх алдаа"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10052,7 +10190,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10123,6 +10261,27 @@ msgstr ""
 msgid "Command:"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr ""
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10143,43 +10302,92 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 ""
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10187,30 +10395,262 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "LDAP  серверт холбогдож чадсангүй"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "LDAP серверээр баталгаажуулж чадсангүй"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "%d секунд"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10371,18 +10811,26 @@ msgstr ""
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10396,48 +10844,48 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11001,55 +11449,67 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -11256,93 +11716,93 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr ""
@@ -11350,26 +11810,26 @@ msgstr ""
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr ""
 
@@ -11432,89 +11892,6 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Файлыг нээх чадахгүй"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Дараагийн _уншигдаагүй мэдээлэл"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr ""
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr ""
@@ -11593,16 +11970,87 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Файлыг нээх чадахгүй"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Дараагийн _уншигдаагүй мэдээлэл"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr ""
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "_Зургуудыг ачааллах"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Дараагийн _уншигдаагүй мэдээлэл"
+msgstr[1] "Дараагийн _уншигдаагүй мэдээлэл"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11620,52 +12068,66 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Дараагийн _уншигдаагүй мэдээлэл"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Бүү оруулж ир"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Устгах"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr ""
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11673,56 +12135,65 @@ msgid ""
 msgstr "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Серверийн мэдээлэл:"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
@@ -12010,11 +12481,6 @@ msgstr ""
 msgid "Select a time to compare against"
 msgstr ""
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "_Шүүлтүүрүүд..."
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12040,378 +12506,615 @@ msgstr ""
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Хавтсанд хадгалах..."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr ""
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr ""
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr ""
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr ""
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
+#: filter/filter-file.c:288
+msgid "Choose a file"
 msgstr ""
 
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
 msgstr ""
 
-#: filter/filter-file.c:288
-msgid "Choose a file"
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
 msgstr ""
 
-#. and now for the action area
-#: filter/filter-filter.c:491
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:790
 #, fuzzy
-msgid "<b>Then</b>"
+msgid "Rule name:"
+msgstr "Загварын нэр:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
 msgstr "<b>Хугацаа</b>"
 
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr " "
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
 
-#: filter/filter.glade.h:2
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
 #, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Түгшүүрүүд</b>"
+msgid "Replies"
+msgstr "Сануулагч"
 
-#: filter/filter.glade.h:3
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
 #, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Түгшүүрийн авиа</b>"
+msgid "Include threads"
+msgstr "Агуулах:"
 
-#: filter/filter.glade.h:4
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Түгшүүрүүд</b>"
+
+#: filter/filter.glade.h:2
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter.glade.h:5
+#: filter/filter.glade.h:3
 msgid "Incoming"
 msgstr ""
 
-#: filter/filter.glade.h:6
+#: filter/filter.glade.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:8
+#: filter/filter.glade.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:10
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13
+#: filter/filter.glade.h:11
 msgid "a time relative to the current time"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: filter/filter.glade.h:12
 msgid "ago"
 msgstr ""
 
-#: filter/filter.glade.h:18
+#: filter/filter.glade.h:16
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
-#: filter/filter.glade.h:20
-msgid "specific folders only"
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr ""
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
 msgstr ""
 
 #: filter/filter.glade.h:21
-msgid "the current time"
+msgid "years"
 msgstr ""
 
-#: filter/filter.glade.h:22
-msgid "the time you specify"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
 msgstr ""
 
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
 msgstr ""
 
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
+#: filter/rule-editor.c:685
+msgid "Rule name"
 msgstr ""
 
-#: filter/filter.glade.h:26
-msgid "with all local folders"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: filter/filter.glade.h:27
-msgid "years"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
-msgid "Important"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: filter/filter-rule.c:790
-#, fuzzy
-msgid "Rule name:"
-msgstr "Загварын нэр:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
 
-#: filter/filter-rule.c:817
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Хугацаа</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "All related"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
 msgstr ""
 
-#: filter/filter-rule.c:877
-#, fuzzy
-msgid "Replies"
-msgstr "Сануулагч"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr ""
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
 msgstr ""
 
-#: filter/filter-rule.c:879
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
-msgid "Include threads"
-msgstr "Агуулах:"
+msgid "_Mail"
+msgstr "Мали"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
 msgstr ""
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
 msgstr ""
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
 msgstr ""
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
 msgstr ""
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
 msgstr ""
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
 msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr ""
+
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
 msgstr ""
 
-#: filter/searchtypes.xml.h:1
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
 #, fuzzy
-msgid "Body contains"
+msgid "_Filter Rules"
+msgstr "_Шүүлтүүрүүд..."
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr ""
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "_Хавсралт..."
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Белиз"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
 msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: filter/searchtypes.xml.h:2
+#: mail/em-filter-i18n.h:8
 #, fuzzy
-msgid "Body does not contain"
+msgid "Copy to Folder"
+msgstr "_Хавтас руу хуулах"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "_Дууссан он сар өдөр:"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Илгээгдсэн!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Устгах"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: filter/searchtypes.xml.h:3
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:15
 #, fuzzy
-msgid "Body or subject contains"
+msgid "does not exist"
+msgstr "Хаягийн дэвтэр"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: filter/searchtypes.xml.h:4
+#: mail/em-filter-i18n.h:17
 #, fuzzy
-msgid "Message contains"
-msgstr "Илгээх зурвас"
+msgid "does not sound like"
+msgstr "Тайлбарт агуулагдаж байна"
 
-#: filter/searchtypes.xml.h:5
+#: mail/em-filter-i18n.h:18
 #, fuzzy
-msgid "Recipients contain"
+msgid "does not start with"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: filter/searchtypes.xml.h:6
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
 #, fuzzy
-msgid "Sender contains"
-msgstr "Дүгнэлтэд агуулагдаж байна"
+msgid "Draft"
+msgstr "_Нооргийг хадгалах"
 
-#: filter/searchtypes.xml.h:7
+#: mail/em-filter-i18n.h:21
 #, fuzzy
-msgid "Subject contains"
-msgstr "Дүгнэлтэд агуулагдаж байна"
+msgid "ends with"
+msgstr "Нэрний эхний үсэг"
 
-#: filter/searchtypes.xml.h:8
+#: mail/em-filter-i18n.h:22
 #, fuzzy
-msgid "Subject does not contain"
-msgstr "Тайлбарт агуулагдаж байна"
+msgid "Exist"
+msgstr "Г_арах"
 
-#: filter/vfolder-editor.c:108
+#: mail/em-filter-i18n.h:23
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "_Хавтас"
+msgid "exists"
+msgstr "Текст"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Нэмэх"
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Өргөтгөлүүд"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
-#. translators: default account indicator
-#: mail/em-account-prefs.c:418
-msgid "[Default]"
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Жагсаалт"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "дараа"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "өмнө"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: mail/em-account-prefs.c:472
-msgid "Account name"
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
-#: mail/em-account-prefs.c:474
-msgid "Protocol"
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
 msgstr ""
 
-#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1045
-msgid "Unnamed"
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Жагсаалт"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
 msgstr ""
 
-#: mail/em-composer-prefs.c:909
-msgid "Language(s)"
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "6-р сар"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
 msgstr ""
 
-#: mail/em-composer-prefs.c:955
-msgid "Add signature script"
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "Ц-шуудангийн хаяг"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Илгээх зурвас"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Илгээх зурвас"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Мэдээлэл"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Илгээх зурвас"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "_Хавтас руу зөөх"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Програмаас гарах"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Авиа тоглуул:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
 msgstr ""
 
-#: mail/em-composer-prefs.c:975
-msgid "Signature(s)"
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
 msgstr ""
 
-#: mail/em-composer-utils.c:888
-msgid "-------- Forwarded Message --------"
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Сануулагч"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
 msgstr ""
 
-#: mail/em-composer-utils.c:1495
-msgid "an unknown sender"
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
 msgstr ""
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
 msgstr ""
 
-#: mail/em-folder-browser.c:129
-msgid "Create _Virtual Folder From Search..."
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Програм ажиллуул:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Илгээх"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "_Байдал:"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
 msgstr ""
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
 msgstr ""
 
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Эх дэвтэр"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
 msgstr ""
 
-#: mail/em-folder-properties.c:146
+#: mail/em-filter-i18n.h:61
 #, fuzzy
-msgid "Total messages"
-msgstr "_Зургуудыг ачааллах"
+msgid "starts with"
+msgstr "Үүргийн жагсаалтын нэр"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-filter-i18n.h:63
 #, fuzzy
-msgid "Unread messages"
-msgstr "Дараагийн _уншигдаагүй мэдээлэл"
+msgid "Stop Processing"
+msgstr "Ачааллахыг зогсоох"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Нэгдсэн улсууд"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Хугацаа</b>"
+
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
+msgstr ""
+
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "Хуанлийн бүлэг"
+
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "_Зургуудыг ачааллах"
+msgstr[1] "_Зургуудыг ачааллах"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Дараагийн _уншигдаагүй мэдээлэл"
+msgstr[1] "Дараагийн _уншигдаагүй мэдээлэл"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12421,398 +13124,414 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr ""
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Хорват"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr ""
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Хавтсанд хадгалах..."
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Хавтас руу хуулах..."
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Хавтас руу хуулах"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Хавтас руу зөөх"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Цуцлах"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Хуулах"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr ""
 
-#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
-msgid "_New Folder..."
-msgstr ""
-
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr ""
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr ""
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr ""
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Хуулах"
 
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "Зөөх"
 
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
+msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr ""
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Ахин илгээх..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr ""
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Шинжүүд:"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr ""
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:651
+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.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr ""
 
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
+#: mail/em-format-html-display.c:653
+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.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
 msgstr ""
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr ""
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12848,114 +13567,85 @@ msgstr ""
 msgid "Formatting message"
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
 msgstr ""
 
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
 msgstr ""
 
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
 msgstr ""
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr ""
-
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr ""
+msgid "Error verifying signature"
+msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
 
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
 #: mail/em-junk-filter.c:86
@@ -13064,7 +13754,7 @@ msgstr ""
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13077,7 +13767,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr ""
 
@@ -13111,11 +13801,24 @@ msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Илгээх зурвас"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "_Хавтас"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Нэмэх"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr ""
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -13568,64 +14271,34 @@ msgstr ""
 msgid "spamd port"
 msgstr "Оруулах"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "Мали"
-
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr ""
@@ -13682,34 +14355,6 @@ msgstr "Файлуудыг оруулж байна"
 msgid "Importing mailbox"
 msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13853,80 +14498,86 @@ msgstr ""
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Тэмдэглэгдсэн"
+msgid_plural "%d deleted"
+msgstr[0] "Тэмдэглэгдсэн"
+msgstr[1] "Тэмдэглэгдсэн"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d өдөр"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d өдөр"
+msgstr[1] "%d өдөр"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d секунд"
+msgid_plural "%d sent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d секунд"
+msgid_plural "%d unsent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "%d холбоонууд"
+msgid_plural "%d total"
+msgstr[0] "%d холбоонууд"
+msgstr[1] "%d холбоонууд"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_Хавтас руу зөөх"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Хавтас"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
@@ -13976,15 +14627,22 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr ""
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr " "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "<b>Хугацаа</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
@@ -14237,7 +14895,7 @@ msgstr ""
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
@@ -14572,6 +15230,114 @@ msgstr "өнгө"
 msgid "description"
 msgstr ""
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Түгшүүрийн авиа</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Зөвшөөрөгдсөн"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -14689,10 +15455,11 @@ msgstr "Дэлгэрэнгүй"
 
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
+#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
-msgstr ""
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
 #. mail:ask-expunge secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
@@ -14762,14 +15529,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -14778,13 +15537,15 @@ msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
+#, fuzzy
 msgid "Error loading filter definitions."
-msgstr ""
+msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:90
+#, fuzzy
 msgid "Cannot save to directory \"{0}\"."
-msgstr ""
+msgstr "Файлыг нээх чадахгүй"
 
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
@@ -14800,8 +15561,9 @@ msgstr ""
 
 #. mail:no-create-tmp-path primary
 #: mail/mail-errors.xml.h:98
+#, fuzzy
 msgid "Cannot create temporary save directory."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
@@ -14821,8 +15583,9 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 
 #. mail:no-delete-spethal-folder primary
 #: mail/mail-errors.xml.h:114
+#, fuzzy
 msgid "Cannot delete system folder \"{0}\"."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:no-delete-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
@@ -14857,8 +15620,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -14872,8 +15636,9 @@ msgstr ""
 
 #. mail:no-move-folder-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:no-move-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
@@ -14889,8 +15654,9 @@ msgstr "Файлыг нээх чадахгүй"
 
 #. mail:no-copy-folder-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:no-create-folder-nostore primary
 #: mail/mail-errors.xml.h:152
@@ -14906,8 +15672,9 @@ msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "болон бусад нэг холбоо."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -14927,8 +15694,9 @@ msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr ""
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -14936,8 +15704,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr ""
+msgstr "_Устгасныг сэргээх"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -14952,8 +15721,9 @@ msgstr ""
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
+#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr ""
+msgstr "Файлыг нээх чадахгүй"
 
 #. mail:signature-notscript secondary
 #: mail/mail-errors.xml.h:177
@@ -14978,8 +15748,9 @@ msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -14996,8 +15767,9 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
-msgstr ""
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15029,13 +15801,43 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Хавтсанд хадгалах..."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr ""
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr ""
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Тэмдэглэгдсэн"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15043,16 +15845,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Дарж бичих"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Илгээх"
@@ -15208,52 +16010,28 @@ msgstr ""
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr ""
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr ""
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr ""
@@ -15289,24 +16067,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15361,15 +16139,15 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Updating vFolders for '%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr ""
 
@@ -15433,7 +16211,7 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr ""
 
@@ -15489,10 +16267,6 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15505,47 +16279,59 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr ""
+#: mail/searchtypes.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "Тайлбарт агуулагдаж байна"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Тайлбарт агуулагдаж байна"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr ""
+#: mail/searchtypes.xml.h:4
+#, fuzzy
+msgid "Message contains"
+msgstr "Илгээх зурвас"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr ""
+#: mail/searchtypes.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "Тайлбарт агуулагдаж байна"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr ""
+#: mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Sender contains"
+msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr ""
+#: mail/searchtypes.xml.h:7
+#, fuzzy
+msgid "Subject contains"
+msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr ""
+#: mail/searchtypes.xml.h:8
+#, fuzzy
+msgid "Subject does not contain"
+msgstr "Тайлбарт агуулагдаж байна"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
 msgstr ""
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr ""
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Эволюшин"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15608,30 +16394,17 @@ msgstr ""
 msgid "mail"
 msgstr ""
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Үл мэдэгдэх алдаа"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr ""
+msgid "<b>Active Connections</b>"
+msgstr "Идэвхитэй холболтууд"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr ""
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Идэвхитэй холболтууд"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15798,23 +16571,6 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr ""
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -15832,116 +16588,87 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Бүлэг"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Шинэ"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Шинэ үүрэг"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Текст"
-
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Шинэ холбооны жагсаалт үүсгэх"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Идэвхитэй холболтууд"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Идэвхитэй холболтууд"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Хуанли:"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "_Холбоо"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr ""
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "_Ц-шуудан:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Tasks:"
-msgstr "_"
+msgid "Uknown system error."
+msgstr "Үл мэдэгдэх алдаа"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Хавтасны _төрөл:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Данс:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Ха_втасны нэр:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "_Хэрэглэгч:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Шинэ"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Эволюшин тохируулагч туслах"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Файлуудыг оруулж байна"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Цагийн бүс"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Тавтай морил"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -15950,7 +16677,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -15958,19 +16685,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Шинэ үүрэг"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Эволюшин"
+msgid "_Test"
+msgstr "Текст"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
+msgid "Create a new test item"
+msgstr "Шинэ холбооны жагсаалт үүсгэх"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16033,7 +16761,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Эволюшин дараахи файлуудаас өгөгдөл оруулаж чадна:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16053,46 +16781,46 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr "Эволюшины тохиргоонуудыг солих"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Эволюшин"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16137,8 +16865,9 @@ msgstr "Холбогдож байна"
 
 #. shell:noshell title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
 msgid "Cannot start Evolution"
-msgstr ""
+msgstr "Эволюшин"
 
 #. shell:noshell primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
@@ -16164,6 +16893,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16404,6 +17155,11 @@ msgstr ""
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16605,11 +17361,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16750,8 +17501,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
@@ -17228,16 +17979,6 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Энэ цонхыг хаах"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Хаах"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17642,6 +18383,16 @@ msgstr "_Хэрэгслүүд"
 msgid "_Undelete"
 msgstr "_Устгасныг сэргээх"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Энэ цонхыг хаах"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Хаах"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Хавсаргах"
@@ -17724,10 +18475,6 @@ msgstr "Энэ файлыг өөр нэрээр хадгалах"
 msgid "Save the message in a specified folder"
 msgstr "Мэдээллийг хавтсанд хадгалах"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Илгээх"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18295,7 +19042,7 @@ msgid "Evolution Query"
 msgstr "Эволюшин"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18448,11 +19195,134 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "LDAP  серверт холбогдож чадсангүй"
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Жагсаалтын нэр:"
+
+#, fuzzy
+#~ msgid "URL:"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Бүлэг"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "LDAP серверээр баталгаажуулж чадсангүй"
+#~ msgid "C_alendar"
+#~ msgstr "_Хуанли"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "<b>Түгшүүрийн давталт</b>"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "<b>Харуулах зурвас</b>"
+
+#~ msgid "Run program:"
+#~ msgstr "Програм ажиллуул:"
+
+#, fuzzy
+#~ msgid "Basics"
+#~ msgstr "Энгийн"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Сануулагч"
+
+#~ msgid "Addressbook..."
+#~ msgstr "Хаягийн дэвтэр..."
+
+#~ msgid "Reminder"
+#~ msgstr "Сануулагч"
+
+#~ msgid "B_usy"
+#~ msgstr "За_вгүй"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Он сар өдөр/цаг"
+
+#~ msgid "F_ree"
+#~ msgstr "_Чөлөөтэй"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Хувийн"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Нийтийн"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Хаягийн дэвтэр..."
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Өмнөх үзэмж:"
+
+#~ msgid "_Modify"
+#~ msgstr "_Өөрчлөх"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _дууссан"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Явж байна"
+
+#~ msgid "Folder:"
+#~ msgstr "Хавтас:"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Алга</i>"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Хаягийн дэвтэр..."
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Уулзалтын _эхлэх цаг:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Уулзалт _дуусах цаг:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr "Жагсаалтыг устгахад алдаа гарлаа"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Шинэ холбоо үүсгэх"
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Хуанли:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "_Холбоо"
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "_Ц-шуудан:"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "_"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Хавтасны _төрөл:"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Ха_втасны нэр:"
+
+#, fuzzy
+#~ msgid "_User:"
+#~ msgstr "_Хэрэглэгч:"
 
 #~ msgid "1:00"
 #~ msgstr "1:00"
@@ -18501,10 +19371,6 @@ msgstr ""
 #~ msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
 
 #, fuzzy
-#~ msgid "Calendar Properties"
-#~ msgstr "Хуанлийн бүлэг"
-
-#, fuzzy
 #~ msgid "Remote"
 #~ msgstr "Устгах"
 
@@ -18516,39 +19382,9 @@ msgstr ""
 #~ msgid "_Source URL:"
 #~ msgstr "Эх үүсвэр"
 
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Та энэ уулзалтыг устгахыг хүсч байна уу?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#~ msgid "Are you sure you want to delete this untitled task?"
-#~ msgstr "Та энэ нэр үгүй үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-#~ msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-#~ msgstr[1] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-#~ msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-
-#~ msgid "_Discard Changes"
-#~ msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
-
 #, fuzzy
 #~ msgid "Stream error"
 #~ msgstr "Бусад алдаа"
@@ -18561,26 +19397,6 @@ msgstr ""
 #~ msgid "Could not get messages: unspecified error"
 #~ msgstr "Мэдээллийг хавтсанд хадгалах"
 
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "6-р сар"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "_Мэдээлэл"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Илгээх зурвас"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Програмаас гарах"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Програм ажиллуул:"
-
 #~ msgid ""
 #~ "%s\n"
 #~ "\n"
@@ -18625,13 +19441,6 @@ msgstr ""
 #~ msgstr "Хуанли"
 
 #, fuzzy
-#~ msgid "task list"
-#~ msgstr "Үүргийн жагсаалтын нэр"
-
-#~ msgid "_Resend..."
-#~ msgstr "_Ахин илгээх..."
-
-#, fuzzy
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Хаягийн дэвтэр үүсгэгч туслах"
 
@@ -18651,9 +19460,6 @@ msgstr ""
 #~ msgid "Finished"
 #~ msgstr "Дууссан"
 
-#~ msgid "Group:"
-#~ msgstr "Бүлэг:"
-
 #, fuzzy
 #~ msgid ""
 #~ "Specifying a\n"
@@ -18926,8 +19732,5 @@ msgstr ""
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Ангилал</b>"
 
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Тайлбар</b>"
-
 #~ msgid "A group must be selected"
 #~ msgstr "Бүлэг сонгогдсон байх ёстой"
diff --git a/po/ms.po b/po/ms.po
index 9a33d4e65a..37cc0a17d0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\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"
@@ -22,16 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Buku Alamat Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kenalan: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Tetingkap _Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -57,34 +47,254 @@ msgstr "kad"
 msgid " card"
 msgstr "1 kad"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kenalan: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Tetingkap _Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kursor tidak dapat dimuatkan\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Gagal disahkan dengan pelayan LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Tidak dapat memuatkan buku alamat"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Editor kategori tidak ada."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Simpan dalam buku alamat"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Ralat ketika memuatkan buku alamat piawai."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Ralat ketika membuat carian"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Adakah anda ingin menyimpan perubahan?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Buang"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "dan satu kenalan lain."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Tidak dapat menghuraikan kandungan mesej"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Ralat ketika menambahkan kenalan"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Pelihat alamat Buku Alamat Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Alamat Segerak Piawai:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Tidak dapat memuatkan buku alamat"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Mencapai Pelayan LDAP tanpa nama"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Gagal disahkan.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Folder Autocompletion"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kenalan"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sijil"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kenalan"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up alamat Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Pelihat alamat Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Pelihat kad Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponen Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kawalan konfigurasi seting folder Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Urus sijil S/Mime anda di sini"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -119,7 +329,7 @@ msgstr "Kenalan Baru:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kenalan:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -144,15 +354,15 @@ msgid "Migrating `%s':"
 msgstr "%s berdenting"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Atas Komputer Ini"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -161,22 +371,22 @@ msgid "Personal"
 msgstr "Peribadi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Folder Autocompletion"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -184,58 +394,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Hapus"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ciri-ciri..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kenalan"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Mencapai Pelayan LDAP tanpa nama"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Gagal disahkan.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -255,62 +474,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Folder Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kenalan"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sijil"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Buat konfigurasi akaun e-mel anda di sini"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up alamat Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Pelihat alamat Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Pelihat kad Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Komponen Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Kawalan konfigurasi seting folder Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Urus sijil S/Mime anda di sini"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -318,7 +481,7 @@ msgstr "Urus sijil S/Mime anda di sini"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -327,8 +490,7 @@ msgstr "Urus sijil S/Mime anda di sini"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -354,6 +516,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Pengesahan"
@@ -403,13 +566,11 @@ msgid "Anonymously"
 msgstr "Tanpa nama"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Asas"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Perincian"
 
@@ -677,34 +838,26 @@ msgid "cards"
 msgstr "kad"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minit"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Pilih Kenalan daripada Buku Alamat"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Keluarkan Semua"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Keluarkan"
 
-#: 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 "Nama"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Keluarkan Semua"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Lihat Senarai Kenalan"
@@ -719,7 +872,7 @@ msgid "Send HTML Mail?"
 msgstr "Hantar Mel HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Tambahkan Kenalan"
 
@@ -727,15 +880,23 @@ msgstr "Tambahkan Kenalan"
 msgid "Unnamed Contact"
 msgstr "Kenalan Tanpa Nama"
 
+#: 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 "Nama"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Sumber"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Pilih Kenalan daripada Buku Alamat"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -762,6 +923,11 @@ msgstr "_Kategori:"
 msgid "_Find"
 msgstr "Cari"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Cari"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -808,9 +974,8 @@ msgid "<b>Work</b>"
 msgstr "Minggu Bekerja"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -835,7 +1000,6 @@ msgid "Birthday:"
 msgstr "Hari lahi_r:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alendar:"
@@ -851,15 +1015,15 @@ msgid "Company:"
 msgstr "Syarikat"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kenalan"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor Kenalan"
 
@@ -969,8 +1133,8 @@ msgstr "_Laman Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -992,44 +1156,28 @@ msgid "_File under:"
 msgstr "Nama fail:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "P_elayan:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Adakah anda pasti ingin\n"
-"menghapuskan kenalan ini?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Adakah anda pasti ingin\n"
-"menghapuskan kenalan ini?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Alamat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Boleh Edit"
 
@@ -2008,140 +2156,132 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Kiriman Mesej"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Senarai Id Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Khidmat boleh digunakan"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 #, fuzzy
-msgid "GroupWise"
-msgstr "Kumpulan"
+msgid "Location"
+msgstr "Lokasi:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nama_pengguna:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Rumah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Lain"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Kumpulan"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Sumber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Merupakan Kenalan Baru"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Medan Boleh Tulis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Diubah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Kenalan ini tergolong dalam kategori ini:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Sila pilih opsyen berikut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Tarikh perulangan tak sah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Objek tak sah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Buang"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Kiriman Mesej"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Khidmat boleh digunakan"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Lokasi:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nama_pengguna:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Tambah Cepat Kenalan"
@@ -2159,6 +2299,22 @@ msgstr "_Nama Penuh:"
 msgid "E-_mail:"
 msgstr "E-mel:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Adakah anda pasti ingin\n"
+"menghapuskan kenalan ini?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Adakah anda pasti ingin\n"
+"menghapuskan kenalan ini?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Alamat _2:"
@@ -2285,48 +2441,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Pilih Kenalan daripada Buku Alamat"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Ahli"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Keluarkan item yang dipilih daripada senarai lampiran"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Dipilih"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sembunyikan alamat apabila menghantar mel ke senarai ini"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Nama _senarai:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Taip alamat e-mel atau seret kenalan ke dalam senarai di bawah:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "editor-senarai-kenalan"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Buku"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Ialah Senarai Baru"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Peserta yang Diperlukan"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor Senarai Kenalan"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Simpan Senarai sebagai VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Kenalan Diubah:"
@@ -2365,438 +2542,11 @@ msgstr ""
 "dalam folder ini. Adakah anda tetap ingin menambahnya?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Carian Lanjutan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Senaraikan Ahli"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisasi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Kumpulan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Kerja"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefon Bimbit"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Peribadi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Gelaran Jawatan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Laman web"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Berjaya"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-#, fuzzy
-msgid "Backend busy"
-msgstr "Bahagian belakang sibuk"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repositori luar talian"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Buku Alamat tidak wujud"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Senarai Kenalan Baru"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Kebenaran dinafikan"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kenalan tidak dijumpai"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "ID Kenalan telah wujud"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol tidak disokong"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Batal"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Tidak dapat membuka folder sumber: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Pengesahan Gagal"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Pengesahan Diperlukan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS tidak Ada"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Mesej tersebut tidak ada"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Ralat lain"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
-"laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
-"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
-"tidak dapat dijangkau."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Versi Evolution ini tidak mempunyai sokongan LDAP\n"
-"yang dikompilkan ke dalamnya.  Jika anda ingin menggunakan LDAP dalam "
-"Evolution\n"
-"anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
-"mendapatkan semula OpenLDAP dari pautan di bawah.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
-"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan\n"
-"tidak dapat dijangkau."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Lebih banyak kad sepadan dengan pertanyaan ini, maka sama ada pelayan ini \n"
-"dikonfigurasikan untuk dikembalikan atau Evolution dikonfigurasikan untuk "
-"dipaparkan.\n"
-"Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
-"keutamaan pelayan direktori bagi buku alamat ini."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Masa untuk melaksanakan pertanyaan ini melebihi had pelayan atau had\n"
-"yang anda konfigurasikan untuk buku alamat ini.  Sila jadikan carian anda\n"
-"lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
-"direktori bagi buku alamat ini."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Ralat ketika menambahkan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Ralat ketika menambahkan kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Ralat ketika mengubahsuaikan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Ralat ketika mengubah suai kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Ralat ketika mengeluarkan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Ralat ketika mengeluarkan kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s telah wujud\n"
-"Adakah anda ingin menulis gantinya?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Tulis ganti"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Alihkan kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Salin kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Alihkan kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Salin kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Pilih Kenalan daripada Buku Alamat"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "VCard Berganda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard bagi %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(tiada)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "E-mel Utama"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mel 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mel 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Pilih Tindakan"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Wujudkan kenalan baru \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Pertanyaan Buku Alamat..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Maklumat Kenalan"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Cantumkan Alamat E-mel"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "dan satu kenalan lain."
-msgstr[1] "dan satu kenalan lain."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Tunjukkan Vcard Penuh"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Tunjukkan VCard Padat"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Simpan dalam buku alamat"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Tiada kenalan"
@@ -2810,9 +2560,9 @@ msgstr[1] "%d kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Pertanyaan"
 
@@ -2828,134 +2578,134 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Ralat ketika mengubah suai kad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Nama bermula dengan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-mel bermula dengan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorinya ialah"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Sebarang medan mengandungi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Lanjutan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Jenis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Simpan sebagai VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Senarai Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Pergi ke Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Carian Kenalan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Sumber Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Seting Rintis..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Sampaikan kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Cetak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Cetak Sampul Surat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Potong"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Salin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Sebarang Kategori"
@@ -2989,6 +2739,8 @@ msgid "Car Phone"
 msgstr "Telefon Kereta"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategori"
 
@@ -2996,6 +2748,21 @@ msgstr "Kategori"
 msgid "Company Phone"
 msgstr "Telefon Syarikat"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mel 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mel 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nama Keluarga"
@@ -3034,14 +2801,29 @@ msgstr "Jordan"
 msgid "Manager"
 msgstr "Pengurus"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefon Bimbit"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nama ringkas"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pejabat"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisasi"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Faks Lain"
@@ -3095,29 +2877,21 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Laman Web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Lebar"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Tinggi"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Mempunyai Fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Dipilih"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Mempunyai Kursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Medan"
@@ -3134,7 +2908,11 @@ msgstr "Model Teks"
 msgid "Max field name length"
 msgstr "Panjang maksimum nama medan"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Lebar Lajur"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3148,7 +2926,7 @@ msgstr ""
 "\n"
 "Klik dua kali di sini untuk mewujudkan Kenalan baru."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3158,13 +2936,407 @@ msgstr ""
 "\n"
 "Tiada item yang ditunjukkan dalam pandangan ini."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Penyesuai"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Lebar Lajur"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Dipilih"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Mempunyai Kursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Senaraikan Ahli"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Kerja"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Peribadi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Gelaran Jawatan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Laman web"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Berjaya"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+#, fuzzy
+msgid "Backend busy"
+msgstr "Bahagian belakang sibuk"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repositori luar talian"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Buku Alamat tidak wujud"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Senarai Kenalan Baru"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Kebenaran dinafikan"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kenalan tidak dijumpai"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "ID Kenalan telah wujud"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol tidak disokong"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Batal"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Tidak dapat membuka folder sumber: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Pengesahan Gagal"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Pengesahan Diperlukan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS tidak Ada"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Mesej tersebut tidak ada"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Ralat lain"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
+"laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
+"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
+"tidak dapat dijangkau."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Versi Evolution ini tidak mempunyai sokongan LDAP\n"
+"yang dikompilkan ke dalamnya.  Jika anda ingin menggunakan LDAP dalam "
+"Evolution\n"
+"anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
+"mendapatkan semula OpenLDAP dari pautan di bawah.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
+"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan\n"
+"tidak dapat dijangkau."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Lebih banyak kad sepadan dengan pertanyaan ini, maka sama ada pelayan ini \n"
+"dikonfigurasikan untuk dikembalikan atau Evolution dikonfigurasikan untuk "
+"dipaparkan.\n"
+"Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
+"keutamaan pelayan direktori bagi buku alamat ini."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Masa untuk melaksanakan pertanyaan ini melebihi had pelayan atau had\n"
+"yang anda konfigurasikan untuk buku alamat ini.  Sila jadikan carian anda\n"
+"lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
+"direktori bagi buku alamat ini."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Ralat ketika menambahkan senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Ralat ketika menambahkan kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Ralat ketika mengubahsuaikan senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Ralat ketika mengubah suai kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Ralat ketika mengeluarkan senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Ralat ketika mengeluarkan kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s telah wujud\n"
+"Adakah anda ingin menulis gantinya?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Tulis ganti"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Alihkan kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Salin kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Alihkan kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Salin kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Pilih Kenalan daripada Buku Alamat"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "VCard Berganda"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard bagi %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(tiada)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "E-mel Utama"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Pilih Tindakan"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Wujudkan kenalan baru \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Pertanyaan Buku Alamat..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Edit Maklumat Kenalan"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Cantumkan Alamat E-mel"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "dan satu kenalan lain."
+msgstr[1] "dan satu kenalan lain."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Tunjukkan Vcard Penuh"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Tunjukkan VCard Padat"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Simpan dalam buku alamat"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3208,6 +3380,11 @@ msgstr "Pengimport VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Cetak sampul surat"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Cetak kenalan"
@@ -3217,11 +3394,6 @@ msgstr "Cetak kenalan"
 msgid "Print contact"
 msgstr "Cetak kenalan"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Cetak sampul surat"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 poin Tahoma"
@@ -3406,6 +3578,22 @@ msgstr "Ujian Cetakan Kenalan"
 msgid "This should test the contact print code"
 msgstr "Ini sepatutnya menguji kod cetakan kenalan"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Tidak dapat membuka fail"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Tidak dapat memuatkan buku alamat"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Tidak dapat membuka buku alamat"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Menentukan fail output bukannya output piawai"
@@ -3463,22 +3651,6 @@ msgstr "Dalam mod normal, opsyen saiz sepatutnya tidak perlu."
 msgid "Impossible internal error."
 msgstr "Ralat dalaman mustahil."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Tidak dapat membuka fail"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Tidak dapat memuatkan buku alamat"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Tidak dapat membuka buku alamat"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Ralat ketika memuatkan buku alamat piawai."
@@ -3495,40 +3667,365 @@ msgstr "Tiada nama fail diberikan. "
 msgid "Unnamed List"
 msgstr "Senarai Tanpa Nama"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Jangan hapuskan"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Hantar Kepada:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Adakah anda pasti ingin menghapuskan %d tugas?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Adakah anda pasti ingin menghapuskan %d temu janji?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Temu janji"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Adakah anda ingin menyimpan perubahan?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan kemas kini "
+"editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Buang Perubahan"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Hantarkan"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Bahagian belakang fail setempat Kalendar Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Masukkan Kata Laluan"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Pisahkan Peristiwa Berbilang Hari:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Tidak dapat memulakan pelayan wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Tidak dapat memulakan wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Tidak dapat membaca blok aplikasi Kalendar rintis"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Keutamaan Piawai:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Tidak dapat membaca blok aplikasi ToDo rintis"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar dan Tugas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendar dan Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kawalan konfigurasi Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Pemandang mesej penjadualan Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor Kalendar/Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponen Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponen ujian Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tugas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tugas"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bermula:"
@@ -3628,10 +4125,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
@@ -3780,9 +4273,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Ringkasan mengandungi"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Huraian mengandungi"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Ulasan mengandungi"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Huraian mengandungi"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Tidak padan"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3803,8 +4317,8 @@ msgid "Purge events older than"
 msgstr "Singkirkan peristiwa yang lebih lama dari"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "hari"
 
@@ -3815,7 +4329,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3864,67 +4378,56 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Temu Janji Baru Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "K_alendar:"
+msgid "Cale_ndar"
+msgstr "Kalendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Wujudkan kalendar baru"
 
@@ -3954,27 +4457,6 @@ msgstr "Pandangan Minggu"
 msgid "Month View"
 msgstr "Pandangan Bulan"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Ringkasan mengandungi"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Huraian mengandungi"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Ulasan mengandungi"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Huraian mengandungi"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Tidak padan"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Ralat ketika membuka kalendar"
@@ -3992,227 +4474,132 @@ msgstr "Kebenaran dinafikan untuk membuka kalendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opsyen Penggera Audio"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opsyen Penggera Mesej"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opsyen Penggera E-mel"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opsyen Penggera Atur Cara"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opsyen Penggera Tak Diketahui"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Penggera Diulang"
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Opsyen kalendar</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Paparan Mesej"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Mesej untuk Dihantar"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Dengarkan bunyi:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Ulang penggera"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Jalankan atur cara:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Hantar Kepada:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Dengan argumen ini:"
+msgid "<b>Options</b>"
+msgstr "Huraian"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Peringatan"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "masa tambahan setiap"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Penggera"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "jam"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Gubah mesej"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "T_ambah"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Asas"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Tarikh/Masa:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Mesej"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Dengarkan bunyi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Peringatan"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Jalankan atur cara"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Hantar Kepada:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Hantar e-mel"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Ringkasan:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Akaun:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opsyen..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Jalankan atur cara:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Ulang penggera"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "selepas"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "sebelum"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "hari"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "temu janji berakhir"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "masa tambahan setiap"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "jam"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "jam"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minit"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "temu janji bermula"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Anda mestilah menetapkan nama fail."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Tambah Kalendar Baru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Senarai Tugas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "W_arna"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Pilih warna"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Tambah Kalendar Baru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Tambahkan Kumpulan..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Muat semula"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Jenis:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "T_ambah"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "minggu"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Penggera"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4330,7 +4717,7 @@ msgid "Free/Busy Publishing"
 msgstr "Permintaan Bebas/Sibuk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Jumaat"
@@ -4344,7 +4731,7 @@ msgid "Minutes"
 msgstr "Minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Isnin"
@@ -4354,7 +4741,7 @@ msgid "S_un"
 msgstr "A_had"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sabtu"
@@ -4368,7 +4755,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Ahad"
@@ -4382,7 +4769,7 @@ msgid "T_hu"
 msgstr "K_hamis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Khamis"
@@ -4396,7 +4783,7 @@ msgid "Time format:"
 msgstr "Format masa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Selasa"
@@ -4406,7 +4793,7 @@ msgid "W_eek starts:"
 msgstr "M_inggu bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Rabu"
@@ -4440,7 +4827,8 @@ msgstr "_Mampatkan hujung minggu dalam pandangan bulan"
 msgid "_Day begins:"
 msgstr "_Hari bermula:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4490,6 +4878,81 @@ msgstr "_Rabu"
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Anda mestilah menetapkan nama fail."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Tambah Kalendar Baru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "W_arna"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Pilih warna"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Tambah Kalendar Baru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Tambahkan Kumpulan..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Muat semula"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Jenis:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "minggu"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Peristiwa ini telah dihapuskan."
@@ -4538,81 +5001,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Ralat pengesahan: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " kepada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Siap "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Siap "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Genap Tempoh "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Genap Tempoh"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Tidak dapat mengemas kini objek"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Edit Temu Janji"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Temu janji - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entri jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Simpan sebagai..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Tidak dapat memperoleh versi semasa!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Ralat pengesahan: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " kepada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Siap "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Siap "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Genap Tempoh "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Genap Tempoh"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4676,8 +5133,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh satu ralat"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Buku Alamat..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kenalan"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4687,164 +5145,223 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Temu janji"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Peringatan"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Maklumat"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Mesyuarat"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Tarikh mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Tarikh akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Masa mula adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Masa akhir adalah salah"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kebenaran dinafikan untuk membuka kalendar"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "sebelum setiap temu janji"
+msgstr[1] "sebelum setiap temu janji"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "temu janji berakhir"
+msgstr[1] "temu janji berakhir"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "sebelum setiap temu janji"
+msgstr[1] "sebelum setiap temu janji"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "P_eristiwa sepanjang hari"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "sebelum setiap temu janji"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "S_ibuk"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "sebelum setiap temu janji"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegori..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "sebelum setiap temu janji"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Opsyen kalendar</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Pengelasan"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Tarikh & Masa"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "S_ulit"
+msgid "A_ll day event"
+msgstr "P_eristiwa sepanjang hari"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Tarikh/Masa:"
+msgid "C_ustomize..."
+msgstr "Simpan Pandangan Biasa..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "B_ebas"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegori..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Lokasi:"
+msgid "Cale_ndar:"
+msgstr "K_alendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Per_sendirian"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Pengelasan"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "A_wam"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Sulit"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Tunjukkan Masa Sebagai"
+msgid "L_ocation:"
+msgstr "Lokasi:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Persendirian"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Awam"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Tunjukkan Masa Sebagai"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Ri_ngkasan:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Penggera"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Huraian:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Masa akhir:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Masa mula:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Tiada"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Penyusun yang dipilih tidak lagi mempunyai akaun."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Penyusun diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Hapus"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Keluarkan"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4883,36 +5400,45 @@ msgid "Member"
 msgstr "Ahli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Sila Jawab"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Peserta"
+msgid "<b>Attendees</b>"
+msgstr "<b>Mula:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Tambahkan Penghantar ke Buku_Alamat"
+msgid "<b>Organizer</b>"
+msgstr "<b>Genap tempoh:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Ubah Penyusun"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Penyusun:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kenalan"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Ubah Penyusun"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Penyusun:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4991,153 +5517,145 @@ msgstr "Contoh Ini dan Masa Depan"
 msgid "All Instances"
 msgstr "Semua Contoh"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Temu janji ini mengandungi perulangan yang tidak boleh diedit oleh Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Tarikh perulangan tak sah"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "pada"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "pertama"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "kedua"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "ketiga"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "keempat"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "terakhir"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Tarikh Lain"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "hari"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "semasa"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "kejadian"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Tarikh/Masa:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Setiap"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Pengecualian"
+msgid "<b>Exceptions</b>"
+msgstr "Huraian"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Pralihat:"
+msgid "<b>Preview</b>"
+msgstr "Pralihat"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Peraturan Perulangan"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Perulangan biasa"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Ubah suai"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Tiada perulangan"
+msgid "<b>Recurrence</b>"
+msgstr "Perulangan"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Keluarkan"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Setiap"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Kejadian mudah"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Edit temu janji"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "untuk"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "selama-lamanya"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "bulan"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "sehingga"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "minggu"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "tahun"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Pilih destinasi untuk folder ini disalin"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Hapuskan folder ini"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Mesej untuk Dipaparkan:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Selesai"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Mesej untuk Dipaparkan:"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Selesai"
 
@@ -5149,8 +5667,8 @@ msgstr "Tinggi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Sedang Dijalankan"
@@ -5162,23 +5680,22 @@ msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Tidak Dimulakan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Sedang Dijalankan"
+msgid "P_ercent complete:"
+msgstr "Peratus Siap: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5202,37 +5719,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Laman Web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tugas"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Umpukan"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Tarikh genap tempoh adalah salah"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tidak dapat membuka buku alamat"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Su_lit"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Mesej untuk Dipaparkan:"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Mesej untuk Dipaparkan:"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Huraian:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_Folder:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5243,60 +5765,58 @@ msgstr "Tar_ikh Mula:"
 msgid "_Due date:"
 msgstr "_Tarikh Genap Tempoh:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Maklum balas pengesahan yang salah daripada pelayan."
+msgid "_Group:"
+msgstr "Kumpulan"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opsyen kalendar</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Hari"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Maklumat Bebas/Sibuk"
+msgid "<b>Publishing _Location</b>"
+msgstr "Permintaan Bebas/Sibuk"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Permintaan Bebas/Sibuk"
+msgid "Free/Busy Editor"
+msgstr "Maklumat Bebas/Sibuk"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Nama _senarai:"
+msgid "_Daily"
+msgstr "Hari"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Kata laluan"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Kata laluan"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Ingat kata laluan ini"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nama_pengguna:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Minggu"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5378,7 +5898,7 @@ msgstr "%s semasa %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s bagi jenis cetusan yang tak diketahui"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Klik untuk menambahkan tugas"
@@ -5387,6 +5907,11 @@ msgstr "Klik untuk menambahkan tugas"
 msgid "Untitled"
 msgstr "Tak Berjudul"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Ringkasan:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5398,7 +5923,7 @@ msgstr "Tarikh Genap Tempoh:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Status:"
 
@@ -5411,20 +5936,93 @@ msgstr "Keutamaan:"
 msgid "Web Page:"
 msgstr "_Laman Web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Awam"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Tarikh Akhir"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Persendirian"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Tarikh Mula"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Sulit"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Ringkasan"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Bebas"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Sibuk"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Kedudukan geografi mestilah dimasukkan dalam format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ya"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Tidak"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Tak diketahui"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Berulang"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Diumpukkan"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5470,95 +6068,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Bebas"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Sibuk"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Mengemaskinikan objek"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Buka"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Buka Laman _Web"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Cetak..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: 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-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Salin"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Tampal"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Umpukkan Tugas"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Sampaikan sebagai iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Tandakan sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Tandakan Tugas yang Dipilih sebagai Siap"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Hapus"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Hapuskan Tugas yang Dipilih"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Simpan sebagai..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik untuk menambahkan tugas"
 
@@ -5567,181 +6171,112 @@ msgstr "Klik untuk menambahkan tugas"
 msgid "% Complete"
 msgstr "% Siap"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Siap"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Tarikh Siap"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Tarikh Genap Tempoh"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Keutamaan"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Tarikh Mula"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Ringkasan"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Isihan tugas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Mengalihkan mesej"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Menyalin mesej"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pilih _Bebenang"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Hapuskan..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Salin ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Alih_kan ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Seting..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Tarikh Akhir"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Tarikh Mula"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tak diketahui"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Berulang"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Diumpukkan"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ya"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Tidak"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kedudukan geografi mestilah dimasukkan dalam format: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5765,36 +6300,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "pagi"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "petang"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+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.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i bahagian minit"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "pagi"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "petang"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5861,37 +6396,36 @@ msgid ", ending on "
 msgstr ", berakhir pada "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Mula:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Akhir:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Siap:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Genap tempoh:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Genap Tempoh"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Maklumat iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Ralat iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Orang yang tak diketahui"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5899,307 +6433,287 @@ msgstr ""
 "<br>Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada "
 "menu di bawah."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Tiada</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Lokasi:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Diterima"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Diterima Sementara"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Ditolak"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Pilih tindakan:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Kemas kini"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Terima"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Tolak"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Hantar Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Kemas kini status responden"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> telah menyiarkan maklumat mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Maklumat Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Cadangan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Permintaan Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Jawapan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> telah membatalkan mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Pembatalan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Mesej Mesyuarat Salah"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> telah menyiarkan maklumat tugas."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Maklumat Tugas"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Cadangan Tugas"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Permintaan Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Jawapan Tugas"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> telah membatalkan tugas."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Pembatalan Tugas"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Mesej Tugas Salah"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Permintaan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Jawapan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Mesej Bebas/Sibuk Salah"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Mesej tidak terbentuk dengan sempurna"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Mesej mengandungi permintaan yang tidak disokong sahaja."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Terdapat ralat pada sistem CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objek tidak dapat dijumpai\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Status peserta tidak dapat dikemaskinikan!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
@@ -6228,6 +6742,10 @@ msgstr "Memuatkan Kalendar"
 msgid "Loading calendar..."
 msgstr "Memuatkan kalendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Penyusun:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mesej Pelayan:"
@@ -6244,11 +6762,6 @@ msgstr "tarikh mula"
 msgid "Chair Persons"
 msgstr "Pengerusi"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Peserta yang Diperlukan"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Peserta Opsyenal"
@@ -6316,6 +6829,28 @@ msgstr "Ditugaskan"
 msgid "In Process"
 msgstr "Dalam Proses"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Di Luar Pejabat"
@@ -6324,98 +6859,64 @@ msgstr "Di Luar Pejabat"
 msgid "No Information"
 msgstr "Tiada Maklumat"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Tambahkan Penghantar ke Buku_Alamat"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opsyen"
+msgid "O_ptions"
+msgstr "Opsyen"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Tunjukkan _Jam Bekerja Sahaja"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Tunjukkan _Zum ke Luar"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Pengemaskinian Bebas/Sibuk"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autopick"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Semua Orang dan Sumber"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Semua _Orang dan Satu Sumber"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Orang yang Diperlukan"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Orang yang Diperlukan dan _Satu Sumber"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Masa mula _mesyuarat:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Masa akhir _mesyuarat:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6424,117 +6925,52 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Tugas permulaan pada %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Ralat dalam %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Tugas permulaan pada %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tugas"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Mengemaskinikan objek"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Tiada temu janji."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Buka dalam %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Menyingkir"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendar dan Tugas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendar dan Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kawalan konfigurasi Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Pemandang mesej penjadualan Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor Kalendar/Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Komponen Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponen ujian Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tugas"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6874,10 +7310,6 @@ msgstr "Bulan yang dipilih (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Tahun yang dipilih (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tugas"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6908,7 +7340,7 @@ msgid "Contacts: "
 msgstr "Kenalan: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
@@ -6937,7 +7369,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Tiada tugas"
 msgstr[1] "Tiada tugas"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6958,35 +7390,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tugas"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Wujudkan tugas baru"
@@ -8666,69 +9092,69 @@ msgstr "Menyediakan folder '%s' untuk luar talian"
 msgid "You must be working online to complete this operation"
 msgstr "Anda mestilah berada dalam talian untuk melengkapkan pengendalian ini"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Aliran mesej tak sah diterima daripada %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ralat ketika menghuraikan penapis : %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ralat ketika melaksanakan penapis :%s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Tidak dapat membuka folder spul"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Tidak dapat memproses folder spul"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Mendapatkan mesej %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Tidak dapat membuka mesej"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Gagal pada mesej %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Menyegerakkan folder"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Mendapatkan mesej %d daripada %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Gagal pada mesej %d daripada %d"
@@ -8750,42 +9176,6 @@ msgstr "Argumen tak sah pada (tag pengguna)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Mengalihkan mesej"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Menyalin mesej"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Menapis mesej baru"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8831,7 +9221,43 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Mengalihkan mesej"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Menyalin mesej"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Menapis mesej baru"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8842,15 +9268,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Gagal menghuraikan petunjuk id pengguna gpg."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Gagal menghuraikan permintaan ungkapan laluan gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8859,28 +9285,28 @@ msgstr ""
 "Anda memerlukan ungkapan laluan untuk membuka kunci bagi\n"
 "pengguna:  \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Batal."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Gagal untuk menyulitkan: Penerima sah tidak ditetapkan."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8891,68 +9317,88 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Gagal melaksanakan gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Kandungan badan indeks"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Tidak dapat menghuraikan kandungan mesej"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Tidak dapat membina saluran pembantu penguncian: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Tidak dapat memisahkan pembantu penguncian: %s"
+
+#: 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 "Tidak dapat mengunci '%s': ralat protokol dengan pembantu kunci"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Tidak dapat mengunci '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8974,26 +9420,6 @@ msgstr "Gagal mendapatkan kunci dengan menggunakan fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Gagal mendapatkan kunci dengan menggunakan flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Tidak dapat membina saluran pembantu penguncian: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Tidak dapat memisahkan pembantu penguncian: %s"
-
-#: 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 "Tidak dapat mengunci '%s': ralat protokol dengan pembantu kunci"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Tidak dapat mengunci '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9251,7 +9677,7 @@ msgstr "Bukti kelayakan yang dirujuk telah tamat tempoh."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Maklum balas pengesahan yang salah daripada pelayan."
 
@@ -9339,55 +9765,55 @@ msgstr "POP sebelum sah kuasa SMTP dengan menggunakan sumber bukan pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Pengkompilan ungkapan biasa gagal: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' memerlukan komponen nama pengguna"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' memerlukan komponen hos"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' memerlukan komponen laluan"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Menyelesaikan: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Gagal dalam carian nama: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Carian hos gagal: tidak dapat mewujudkan bebenang: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Carian hos gagal: %s: hos tidak dijumpai"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Carian hos gagal: %s sebab tak diketahui"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Mengubah alamat"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Carian hos gagal: hos tidak dijumpai"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Carian hos gagal: sebab tak diketahui"
 
@@ -9463,7 +9889,7 @@ msgstr "Sijil Kenalan"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Tidak dapat mewujudkan konteks nyahkod S/MIME."
@@ -9553,7 +9979,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Tandatangan buruk"
 
 #: camel/camel-smime-context.c:651
@@ -9568,49 +9994,48 @@ msgstr "Arahan IMAP gagal: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Gagal mencari sijil bagi \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Gagal mencari algoritma pukal sepunya."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Wujud_kan Peraturan Daripada Mesej"
+msgid "Cannot create CMS Message"
+msgstr "Tidak dapat membuka mesej"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Tidak dapat membuka mesej"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Tidak dapat melampirkan fail %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Tidak dapat melampirkan fail %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Tidak dapat membuka mesej"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Tidak dapat mewujudkan konteks nyahkod S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9657,7 +10082,8 @@ msgstr "Tidak boleh mewujudkan folder: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
@@ -9666,8 +10092,8 @@ msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 msgid "Trash"
 msgstr "Sampah"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jun"
@@ -9788,7 +10214,7 @@ msgstr "Penggunaan kunci tidak menyokong tandatangan sijil"
 msgid "Error in application verification"
 msgstr "Ralat dalam pengesahbetulan aplikasi"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9801,11 +10227,11 @@ msgstr ""
 "Cap jari:          %s\n"
 "Tandatangan:       %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "BAD"
 
@@ -9829,7 +10255,7 @@ msgstr ""
 "Adakah anda mahu menerimanya?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9844,7 +10270,7 @@ msgstr ""
 "\n"
 "Adakah anda mahu menerimanya?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9853,7 +10279,7 @@ msgstr ""
 "Masalah sijil: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9862,7 +10288,7 @@ msgstr ""
 "Domain sijil salah: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9871,7 +10297,7 @@ msgstr ""
 "Sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9880,7 +10306,7 @@ msgstr ""
 "Senarai pembatalan sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Tidak dapat menghuraikan URL `%s'"
@@ -9904,7 +10330,7 @@ msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
@@ -9925,8 +10351,8 @@ msgid "Checking for new mail"
 msgstr "Menyemak mel baru"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Menyemak mesej baru dalam semua folder"
 
@@ -9958,8 +10384,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9980,323 +10406,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kabut yang tebal"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Pelayan terputus tanpa dijangkakan: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folder"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Tunjukkan folder yang dilanggan sahaja"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Ruang nama"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
-"teks biasa."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Pelayan IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Khidmat IMAP bagi %s pada %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Tidak dapat disambungkan ke %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL tidak Ada"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Sambungan dibatalkan"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Ralat tak diketahui"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
-"pengesahan yang diminta."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sSila masukkan kata laluan SMTP bagi %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Gagal disahkan pada pelayan POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Tidak boleh mendapatkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Syarikat"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Tiada tugas"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Pelayan terputus tanpa dijangkakan: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Pengendalian dibatalkan"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ralat tak diketahui"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10365,7 +10496,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10440,6 +10571,27 @@ msgstr "Gagal disambungkan ke pelayan LDAP"
 msgid "Command:"
 msgstr "Syarikat"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Folder"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Tunjukkan folder yang dilanggan sahaja"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Ruang nama"
+
 #: 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"
@@ -10462,43 +10614,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Pelayan IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Khidmat IMAP bagi %s pada %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Tidak dapat disambungkan ke %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL tidak Ada"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Sambungan dibatalkan"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Sambungan SSL/TLS tidak disokong."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Tidak dapat disambungkan dengan arahan \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Pelayan IMAP %s tidak menyokong jenis pengesahan yang diminta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tiada sokongan bagi jenis pengesahan %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSila masukkan kata laluan IMAP bagi %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Anda tidak memasukkan kata laluan."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10509,30 +10710,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder tersebut tidak ada%s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Folder ibu tak diketahui: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Gagal disahkan pada pelayan POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Pelayan terputus tanpa dijangkakan: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
+"teks biasa."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
+"pengesahan yang diminta."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSila masukkan kata laluan SMTP bagi %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Gagal disahkan pada pelayan POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Syarikat"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Tiada tugas"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Pelayan terputus tanpa dijangkakan: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10702,18 +11155,26 @@ msgstr "Tidak dapat menyimpan ringkasan: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Tidak dapat menambahkan mesej ke ringkasan: sebab tak diketahui"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Kotak masuk"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Mesej tambahan dirmel dibatalkan"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Tidak dapat menambahkan mesej pada folder dirmel: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10729,48 +11190,48 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s dari folder %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Kandungan mesej tak sah"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Folder `%s' tidak wujud."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' bukan direktori dirmel."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Tidak dapat menghapuskan folder `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "Bukan direktori dirmel"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11361,20 +11822,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Tidak dapat disambungkan ke pelayan POP %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Gagal disahkan pada pelayan POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Gagal disambungkan ke pelayan POP %s dalam mod terjamin: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Tidak dapat disambungkan ke pelayan POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11383,29 +11849,29 @@ msgstr ""
 "Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
 "pengesahan yang diminta."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Log masuk gagal bagi pelayan POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Tidak dapat mengelog masuk ke dalam pelayan POP %s: ralat Protokol SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sSila masukkan kata laluan POP bagi %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11414,7 +11880,16 @@ msgstr ""
 "Tidak dapat disambungkan ke pelayan POP %s.\n"
 "Ralat ketika menghantar kata laluan: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Tidak dapat disambungkan ke pelayan POP %s.\n"
+"Ralat ketika menghantar kata laluan: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
@@ -11633,97 +12108,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Pelayan SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Penghantaran mel SMTP melalui %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Tidak dapat menghantar mesej: penerima tidak ditentukan."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Tidak dapat menghantar mesej: alamat penghantar tak sah."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Menghantar mesej"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Tidak dapat menghantar mesej: penerima tidak ditentukan."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Tidak dapat menghantar mesej: satu penerima tak sah atau lebih"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Aluan SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Pengesahan SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Ralat ketika mewujudkan objek pengesahan SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Maklum balas pengesahan rosak daripada pelayan.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Permintaan MAIL FROM tamat masa: %s: mel tidak dihantar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Permintaan RCPT TO tamat masa: %s: mel tidak dihantar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> gagal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Permintaan DATA tamat masa: %s: mel tidak dihantar"
@@ -11731,28 +12206,28 @@ msgstr "Permintaan DATA tamat masa: %s: mel tidak dihantar"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Arahan IMAP gagal: %s"
@@ -11816,100 +12291,6 @@ msgstr "Jenis MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Tidak dapat membuka fail"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mesej Tak Berjudul)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Buka fail"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Tandatangan:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Gubah mesej"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan kawalan pemilih alamat."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan komponen editor HTML.\n"
-"Sila pastikan versi gtkhtml dan libgtkhtml\n"
-"yang betul dipasang.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan komponen editor HTML."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destinasi Pengiriman"
@@ -11992,17 +12373,91 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Tidak dapat membuka fail"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mesej Tak Berjudul)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Buka fail"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Tandatangan:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Gubah mesej"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mesej yang disampaikan - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Lampirkan mesej asal"
+msgstr[1] "Lampirkan mesej asal"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Lampirkan fail ke mesej"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12020,54 +12475,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Tidak dapat mewujudkan saluran: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Mesej _Belum Dibaca Seterusnya"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Adakah anda ingin menyimpan perubahan?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Jangan import"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Keluarkan"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Ralat ketika menyimpan jalan pintas."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Amaran: Mesej yang Diubah Suai"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12075,57 +12544,74 @@ msgid ""
 msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Buang Perubahan"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Simpan Mesej..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Tidak dapat mewujudkan saluran: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Anda perlu mengkonfigurasikan akaun sebelum anda boleh menggubah mel."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Tidak dapat mewujudkan saluran: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Tidak dapat mewujudkan tetingkap penggubah:\n"
+"Tidak dapat mengaktifkan kawalan pemilih alamat."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Tidak dapat mewujudkan tetingkap penggubah:\n"
+"Tidak dapat mengaktifkan komponen editor HTML.\n"
+"Sila pastikan versi gtkhtml dan libgtkhtml\n"
+"yang betul dipasang.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12431,11 +12917,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Pilih masa untuk dibandingkan dengan"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Peraturan Penapis"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12464,19 +12945,8 @@ msgstr "Anda mestilah menetapkan nama fail."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Mengeluarkan folder %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Anda mestilah menetapkan folder."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12484,159 +12954,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Umpukan"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Anda mestilah menamakan penapis ini."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Anda mestilah menamakan vfolder ini."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Pelayan tidak dipilih"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Pilih fail"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Genap tempoh:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Pilih Folder"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Peraturan Penapis"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Sumber vFolder"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Dibandingkan dengan"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Masuk"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Tarikh mesej akan dibandingkan dengan\n"
-"pukul 12:00 pagi pada tarikh yang ditetapkan."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Tarikh mesej akan dibandingkan dengan\n"
-"masa yang berkaitan dengan bila penapisan berlaku."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Tarikh mesej akan dibandingkan dengan\n"
-"masa sekarang bila penapisan berlaku."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "masa yang berkaitan dengan masa sekarang"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "yang lalu"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "bulan"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "saat"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "folder yang ditetapkan sahaja"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "masa sekarang"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "masa yang anda tetapkan"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "dengan semua folder jauh yang aktif"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "dengan semua folder jauh yang setempat dan aktif"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "dengan semua folder setempat"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "tahun"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Penting"
 
@@ -12706,6 +13054,71 @@ msgstr "masuk"
 msgid "outgoing"
 msgstr "keluar"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Peraturan Penapis"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Dibandingkan dengan"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Masuk"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Tarikh mesej akan dibandingkan dengan\n"
+"pukul 12:00 pagi pada tarikh yang ditetapkan."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Tarikh mesej akan dibandingkan dengan\n"
+"masa yang berkaitan dengan bila penapisan berlaku."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Tarikh mesej akan dibandingkan dengan\n"
+"masa sekarang bila penapisan berlaku."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "masa yang berkaitan dengan masa sekarang"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "yang lalu"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "bulan"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "saat"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "masa sekarang"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "masa yang anda tetapkan"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "tahun"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Tambahkan Peraturan"
@@ -12718,60 +13131,72 @@ msgstr "Edit Peraturan"
 msgid "Rule name"
 msgstr "Tajuk peraturan"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Peraturan Skor"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skor"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Keutamaan Penggubah"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Badan mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
+"sini"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Badan tidak mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Badan atau tajuk mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Mesej mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Mel Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Penerima mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kawalan konfigurasi akaun Mel Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Penghantar mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponen Mel Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Tajuk mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Penggubah Mel Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Tajuk tidak mengandungi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kawalan konfigurasi penggubah Mel Evolution"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Folder Maya"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kawalan keutamaan Mel Evolution"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Tambah"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Mel"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Sumber VFolder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Akaun Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Keutamaan Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Mel"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12804,47 +13229,312 @@ msgstr "_Tambahkan Tandatangan"
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Disampaikan --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Peraturan Penapis"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Pilih Folder"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Selaraskan Skor"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Umpukkan Warna"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Umpukkan Skor"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Lampiran"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Bip"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "mengandungi"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Salin ke Folder"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Tarikh diterima"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Tarikh dihantar"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Dihapuskan"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "tidak mengandungi"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "tidak berakhir dengan"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "tidak wujud"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "tidak kembali"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "tidak seperti "
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "tidak dimulakan dengan"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Tidak Wujud"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Draf"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "berakhir dengan"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Wujud"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "wujud"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Ungkapan"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Susulan"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "adalah"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "adalah selepas"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "adalah sebelum"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "ditandai"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "lebih besar daripada"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "kurang daripada"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "tidak"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "tidak ditandai"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Jun"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Senarai mel"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Badan Mesej"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Pengepala Mesej"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Mesej"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Tandakan sebagai _Penting"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Alihkan ke Folder"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Keluar dari atur cara"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Dengarkan Bunyi"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Baca"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Penerima"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Padanan Regex "
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Jawapan kepada"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "kembali"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "kembalikan lebih besar daripada"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "kembalikan kurang daripada"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Jalankan atur cara:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skor"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Penghantar"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Set Status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Saiz (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "seperti"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Akaun Sumber"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Pengepala yang khusus"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "bermula dengan"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Hentikan Memproses"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Tajuk"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Batalkan Set Status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Genap tempoh:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Wujudkan _Folder Maya Daripada Carian..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Ciri-ciri Folder"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Ciri-ciri"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nama Folder"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Mesej bantuan"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Mesej bantuan"
+msgstr[1] "Mesej bantuan"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Mesej _Belum Dibaca Seterusnya"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mesej _Belum Dibaca Seterusnya"
+msgstr[1] "Mesej _Belum Dibaca Seterusnya"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12854,413 +13544,435 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Create New Folder"
 msgstr "Wujudkan Folder Baru"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Tetapkan di mana folder akan diwujudkan:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Nama _folder:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolder"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Sedang memuatkan..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Alih"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Batalkan Tugas"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Salin"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Wujudkan folder"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Namakan semula folder \"%s\" kepada:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Namakan semula Folder"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Lihat"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Buka dalam Tetingkap _Baru"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Salin..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Alihkan..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Folder Baru..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Namakan semula"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Ciri-ciri..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolder"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Kotak masuk"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Namakan semula..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Sedang memuatkan..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Mel"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Peraturan Penapis"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik untuk menambahkan tugas"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Daripada"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Balas Kepada"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kepada"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Sk"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "St"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Tajuk"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarikh"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "lampiran %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Format tandatangan yang tidak disokong"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Tidak dapat mengesah betul tandatangan dedaun"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Tidak dapat mengesah betul tandatangan dedaun"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "Mendapatkan semula %s"
+msgid "Matches: %d"
+msgstr "Padanan: %d"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 #, fuzzy
 msgid "Unsigned"
 msgstr "Diumpukkan"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 #, fuzzy
 msgid "Valid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 #, fuzzy
 msgid "Invalid signature"
 msgstr "Tandatangan buruk"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
+"Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
+"dapat disah betul."
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unencrypted"
 msgstr "Disampuk"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 #, fuzzy
 msgid "Encrypted, weak"
 msgstr "Kandungan badan indeks"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 #, fuzzy
 msgid "Encrypted"
 msgstr "Penyulitan PGP"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 #, fuzzy
 msgid "Encrypted, strong"
 msgstr "Kandungan badan indeks"
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Sijil"
+
+#: mail/em-format-html-display.c:769
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Sijil masih belum sah"
+
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "oleh %B %d, %Y, %l:%M %P"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Terlewat"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "oleh %B %d, %Y, %l:%M %P"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
+msgstr "_Lihat Dalam Talian"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "_Sembunyikan"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Halaman %d daripada %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Mendapatkan semula %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Bahagian badan luaran tidak sempurna."
@@ -13294,9 +14006,35 @@ msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
 msgid "Formatting message"
 msgstr "Memformat mesej"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Daripada"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Balas Kepada"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kepada"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Sk"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "St"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Pengemel"
 
@@ -13310,109 +14048,45 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "Padanan: %d"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
-"dapat disah betul."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarikh"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "lampiran %s"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1024 mail/em-format.c:1143
+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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "Sijil"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
 
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Sijil masih belum sah"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Format tandatangan yang tidak disokong"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "oleh %B %d, %Y, %l:%M %P"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Terlewat"
+msgid "Error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "oleh %B %d, %Y, %l:%M %P"
-
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr "_Lihat Dalam Talian"
-
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "_Sembunyikan"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Halaman %d daripada %d"
+msgid "Unknown error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13525,7 +14199,7 @@ msgstr "Ha_ntar mesej ke..."
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
@@ -13539,7 +14213,7 @@ msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 msgid "Subscribed"
 msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Folder"
 
@@ -13574,11 +14248,24 @@ msgid "Add address"
 msgstr "Alamat"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mel dari %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Folder Maya"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Tambah"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Sumber VFolder"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14071,65 +14758,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Keutamaan Penggubah"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
-"sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Buat konfigurasi akaun e-mel anda di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kawalan konfigurasi akaun Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponen Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Pengimport Elm Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Penggubah Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Pengimport Mel Netscape Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kawalan konfigurasi penggubah Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Pengimport Outlook Express 4 Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kawalan keutamaan Mel Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Pengimport Pine Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Akaun Mel"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Pengimport peti mel Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Keutamaan Mel"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "Peti Mel (peti mel)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Mel"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14191,34 +14846,6 @@ msgstr "Mengimport"
 msgid "Importing mailbox"
 msgstr "Mengimport Fail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Pengimport Elm Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Pengimport Mel Netscape Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Pengimport Outlook Express 4 Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Pengimport Pine Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Pengimport peti mel Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "Peti Mel (peti mel)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14387,80 +15014,86 @@ msgstr "%s senarai mel"
 msgid "Add Filter Rule"
 msgstr "Tambahkan Peraturan Penapis"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d dipilih"
+msgid_plural "%d deleted"
+msgstr[0] "%d dipilih"
+msgstr[1] "%d dipilih"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d belum dihantar"
+msgid_plural "%d junk"
+msgstr[0] "%d belum dihantar"
+msgstr[1] "%d belum dihantar"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Draf"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Draf"
+msgstr[1] "Draf"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d dihantar"
+msgid_plural "%d sent"
+msgstr[0] "%d dihantar"
+msgstr[1] "%d dihantar"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d belum dihantar"
+msgid_plural "%d unsent"
+msgstr[0] "%d belum dihantar"
+msgstr[1] "%d belum dihantar"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d keseluruhan"
+msgid_plural "%d total"
+msgstr[0] "%d keseluruhan"
+msgstr[1] "%d keseluruhan"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d belum dihantar"
+msgid_plural ", %d unread"
+msgstr[0] "%d belum dihantar"
+msgstr[1] "%d belum dihantar"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder Baru"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Penapis Mel"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Wujudkan kalendar baru"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Menyemak Khidmat"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Sedang disambungkan ke pelayan..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Pengenalan"
@@ -14522,16 +15155,24 @@ msgstr ""
 "ini dalam ruang di bawah. Nama ini akan digunakan untuk tujuan paparan "
 "sahaja."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Menyemak Khidmat"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Sedang disambungkan ke pelayan..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Semak jenis sokongan "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Pralihat"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14809,7 +15450,7 @@ msgstr "Jangan petik mesej asal"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
@@ -15175,6 +15816,119 @@ msgstr "warna"
 msgid "description"
 msgstr "huraian"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Sumber vFolder"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Diterima"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "S_elesai"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Peka Huruf"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Cari dalam Mesej"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Cari:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Tandakan untuk membuat Susulan"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Langganan Folder"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Tiada yang Dipilih"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "P_elayan:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Maklumat Akaun"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Mesej yang anda pilih untuk susulam disenaraikan di bawah.\n"
+"Sila pilih tindakan susulan daripada menu \"Bendera\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Akaun Mel"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Genap tempoh pada:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bendera:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Langgan"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Batalkan langganan"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "folder yang ditetapkan sahaja"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "dengan semua folder jauh yang aktif"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "dengan semua folder jauh yang setempat dan aktif"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "dengan semua folder setempat"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15384,14 +16138,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15497,8 +16243,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Tidak dapat mengalihkan folder: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15549,8 +16296,9 @@ msgstr "Tidak dapat membuka folder sumber: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "dan satu kenalan lain."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15579,8 +16327,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Jangan hapuskan"
+msgstr "_Batalkan hapus"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15644,8 +16393,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Tidak dapat menghapuskan folder:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15687,13 +16439,44 @@ msgstr ""
 "    '%s'\n"
 "Dan telah dikemaskinikan."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Mengeluarkan folder %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Anda mestilah menetapkan folder."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Anda mestilah menamakan vfolder ini."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Pelayan tidak dipilih"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15701,16 +16484,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Tulis ganti"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15872,7 +16655,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15881,46 +16664,21 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Peka Huruf"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Cari dalam Mesej"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Cari:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Maklumat Akaun"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Sedang membatalkan..."
@@ -15956,24 +16714,24 @@ msgstr "Sedang mengemaskinikan..."
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -16030,15 +16788,15 @@ msgstr "Mengemaskinikan vfolder bagi uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
@@ -16102,7 +16860,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -16158,10 +16916,6 @@ msgstr "Sampaikan"
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Baca"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Balas"
@@ -16174,50 +16928,51 @@ msgstr "Balas kepada Semua"
 msgid "Review"
 msgstr "Kaji semula"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Tandakan untuk membuat Susulan"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Badan mengandungi"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "S_elesai"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Badan tidak mengandungi"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Mesej yang anda pilih untuk susulam disenaraikan di bawah.\n"
-"Sila pilih tindakan susulan daripada menu \"Bendera\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Badan atau tajuk mengandungi"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Genap tempoh pada:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Mesej mengandungi"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bendera:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Penerima mengandungi"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Langganan Folder"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Penghantar mengandungi"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Tiada yang Dipilih"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Tajuk mengandungi"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "P_elayan:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Tajuk tidak mengandungi"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Langgan"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Cangkerang Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Batalkan langganan"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Komponen Ujian Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16287,31 +17042,18 @@ msgstr ""
 msgid "mail"
 msgstr "E-mel"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Ralat tak diketahui"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumen tak sah"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Tidak dapat mendaftarkan dalam OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Sambungan Aktif"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Sambungan Aktif"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Ralat generik"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik OK untuk menutup sambungan ini dan pergi ke luar talian"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16499,30 +17241,6 @@ msgstr "Nama folder tidak boleh mengandungi aksara \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' dan '..' ialah nama folder simpanan."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mel ke %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Alat GNOME Pilot tidak dipasang dalam sistem ini."
@@ -16540,113 +17258,94 @@ msgstr "Kawan pepijat tidak dipasang."
 msgid "Bug buddy could not be run."
 msgstr "Kawan pepijat tidak dapat dijalankan."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Kumpulan"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Bekerja Dalam Talian"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Bekerja Luar Talian"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kotak semak"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Baru"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Tugas Baru"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Ujian"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Wujudkan tugas baru"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Sambungan Aktif"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Sambungan Aktif"
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik OK untuk menutup sambungan ini dan pergi ke luar talian"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mel ke %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendar:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kenalan: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Mel:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tugas:"
+msgid "Uknown system error."
+msgstr "Ralat tak diketahui"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Jenis _folder:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumen tak sah"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Buka Folder Pengguna Lain"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Akaun:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Nama Folder:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Ralat generik"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Pengguna:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Baru"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pembantu Persediaan Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Mengimport Fail"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Zon masa "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Selamat Datang"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16660,7 +17359,7 @@ msgstr ""
 "\n"
 "Sila klik butang \"Sampaikan\" untuk meneruskan pengendalian. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16672,19 +17371,20 @@ msgstr ""
 "\n"
 "Klik butang \"Guna\" untuk menyimpan seting anda. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Cangkerang Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Tugas Baru"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Ujian"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Komponen Ujian Evolution"
+msgid "Create a new test item"
+msgstr "Wujudkan tugas baru"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16750,7 +17450,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution boleh mengimport data daripada fail berikut:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16788,7 +17488,7 @@ msgstr ""
 "Kami harap anda memperoleh hasil daripada usaha gigih kami, dan kami\n"
 "tidak sabar menunggu sumbangan anda!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16797,40 +17497,40 @@ msgstr ""
 "Terima kasih\n"
 "Pasukan Ximian Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:507
+#: shell/main.c:472
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Peningkatan paksa fail konfigurasi daripada Evolution 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16905,6 +17605,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17151,6 +17873,12 @@ msgstr "Sijil Anda"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID Kenalan telah wujud"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17382,12 +18110,6 @@ msgstr "ID Unik"
 msgid "Certificate Signature Value"
 msgstr "Kegagalan tandatangan sijil"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID Kenalan telah wujud"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17531,8 +18253,8 @@ 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Tindakan"
@@ -18013,16 +18735,6 @@ msgstr "_Songsangkan Pemilihan"
 msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Tutup tetingkap ini"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Tutup"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18432,6 +19144,16 @@ msgstr "_Alatan"
 msgid "_Undelete"
 msgstr "_Batalkan hapus"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Tutup tetingkap ini"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Tutup"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Lampirkan"
@@ -18514,10 +19236,6 @@ msgstr "Simpan fail semasa dengan menggunakan nama yang berbeza"
 msgid "Save the message in a specified folder"
 msgstr "Simpan mesej dalam fail yang ditetapkan"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Hantarkan"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19094,7 +19812,7 @@ msgid "Evolution Query"
 msgstr "Ringkasan Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19258,28 +19976,273 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Maklum balas pengesahan yang salah daripada pelayan."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Nama _senarai:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "editor-senarai-kenalan"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Simpan Senarai sebagai VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Kumpulan"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Tidak dapat memulakan wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "K_alendar:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opsyen Penggera Audio"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opsyen Penggera Mesej"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opsyen Penggera E-mel"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opsyen Penggera Atur Cara"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opsyen Penggera Tak Diketahui"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Penggera Diulang"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Paparan Mesej"
+
+#~ msgid "Message to Send"
+#~ msgstr "Mesej untuk Dihantar"
+
+#~ msgid "Play sound:"
+#~ msgstr "Dengarkan bunyi:"
+
+#~ msgid "Run program:"
+#~ msgstr "Jalankan atur cara:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Dengan argumen ini:"
+
+#~ msgid "Basics"
+#~ msgstr "Asas"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Tarikh/Masa:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Peringatan"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opsyen..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Buku Alamat..."
+
+#~ msgid "Reminder"
+#~ msgstr "Peringatan"
+
+#~ msgid "B_usy"
+#~ msgstr "S_ibuk"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "S_ulit"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Tarikh/Masa:"
+
+#~ msgid "F_ree"
+#~ msgstr "B_ebas"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Per_sendirian"
+
+#~ msgid "Pu_blic"
+#~ msgstr "A_wam"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Peserta"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Tambahkan Penghantar ke Buku_Alamat"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Pengecualian"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Pralihat:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Peraturan Perulangan"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Perulangan biasa"
+
+#~ msgid "_Modify"
+#~ msgstr "_Ubah suai"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Tiada perulangan"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Kejadian mudah"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Selesai"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Sedang Dijalankan"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Su_lit"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_Folder:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Mula:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Akhir:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Siap:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Genap tempoh:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Tiada</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Terdapat ralat pada sistem CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objek tidak dapat dijumpai\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Anda tidak mendapat kebenaran sah untuk mengemaskinikan kalendar\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Status peserta tidak dapat dikemaskinikan!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Tambahkan Penghantar ke Buku_Alamat"
+
+#~ msgid "_Options"
+#~ msgstr "_Opsyen"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Masa mula _mesyuarat:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Masa akhir _mesyuarat:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ralat dalam %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Gagal mencari sijil bagi \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Wujud_kan Peraturan Daripada Mesej"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Tidak dapat mewujudkan konteks nyahkod S/MIME."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Tidak dapat mewujudkan tetingkap penggubah:\n"
+#~ "Tidak dapat mengaktifkan komponen editor HTML."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Peraturan Skor"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nama Folder"
+
+#~ msgid "_Rename"
+#~ msgstr "_Namakan semula"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Ciri-ciri..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kotak semak"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendar:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kenalan: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Mel:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Tugas:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Jenis _folder:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Buka Folder Pengguna Lain"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Nama Folder:"
+
+#~ msgid "_User:"
+#~ msgstr "_Pengguna:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Gagal disambungkan ke pelayan LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Gagal disahkan dengan pelayan LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Ralat ketika mendapatkan semula maklumat skema"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr ""
-#~ "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  T_unjukkan Asas Sokongan"
 
@@ -19352,9 +20315,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Webcam:"
 #~ msgstr "Laman Web:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Editor kategori tidak ada."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19410,9 +20370,6 @@ msgstr "%s (%d%% siap)"
 #~ "Peristiwa yang sedang dihapuskan ialah mesyuarat, adakah anda ingin "
 #~ "menghantar notis pembatalan?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19430,46 +20387,15 @@ msgstr "%s (%d%% siap)"
 #~ "Entri jurnal yang sedang dihapuskan disiarkan, adakah anda ingin "
 #~ "menghantar notis pembatalan?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Adakah anda pasti ingin menghapuskan tugas tak berjudul ini?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Adakah anda pasti ingin menghapuskan entri jurnal tak berjudul ini?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d temu janji?"
-#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d temu janji?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d tugas?"
-#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d tugas?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
-#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Jemput Orang Lain..."
 
@@ -19502,10 +20428,6 @@ msgstr "%s (%d%% siap)"
 #~ msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Ralat ketika menyimpan mesej secara automatik: %s\n"
@@ -19529,179 +20451,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Maklum balas pelayan tak diketahui: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Selaraskan Skor"
-
-#~ msgid "Assign Color"
-#~ msgstr "Umpukkan Warna"
-
-#~ msgid "Assign Score"
-#~ msgstr "Umpukkan Skor"
-
-#~ msgid "Attachments"
-#~ msgstr "Lampiran"
-
-#~ msgid "Beep"
-#~ msgstr "Bip"
-
-#~ msgid "contains"
-#~ msgstr "mengandungi"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Salin ke Folder"
-
-#~ msgid "Date received"
-#~ msgstr "Tarikh diterima"
-
-#~ msgid "Date sent"
-#~ msgstr "Tarikh dihantar"
-
-#~ msgid "Deleted"
-#~ msgstr "Dihapuskan"
-
-#~ msgid "does not contain"
-#~ msgstr "tidak mengandungi"
-
-#~ msgid "does not end with"
-#~ msgstr "tidak berakhir dengan"
-
-#~ msgid "does not exist"
-#~ msgstr "tidak wujud"
-
-#~ msgid "does not return"
-#~ msgstr "tidak kembali"
-
-#~ msgid "does not sound like"
-#~ msgstr "tidak seperti "
-
-#~ msgid "does not start with"
-#~ msgstr "tidak dimulakan dengan"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Tidak Wujud"
-
-#~ msgid "Draft"
-#~ msgstr "Draf"
-
-#~ msgid "ends with"
-#~ msgstr "berakhir dengan"
-
-#~ msgid "Exist"
-#~ msgstr "Wujud"
-
-#~ msgid "exists"
-#~ msgstr "wujud"
-
-#~ msgid "Expression"
-#~ msgstr "Ungkapan"
-
-#~ msgid "Follow Up"
-#~ msgstr "Susulan"
-
-#~ msgid "is"
-#~ msgstr "adalah"
-
-#~ msgid "is after"
-#~ msgstr "adalah selepas"
-
-#~ msgid "is before"
-#~ msgstr "adalah sebelum"
-
-#~ msgid "is Flagged"
-#~ msgstr "ditandai"
-
-#~ msgid "is greater than"
-#~ msgstr "lebih besar daripada"
-
-#~ msgid "is less than"
-#~ msgstr "kurang daripada"
-
-#~ msgid "is not"
-#~ msgstr "tidak"
-
-#~ msgid "is not Flagged"
-#~ msgstr "tidak ditandai"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Jun"
-
-#~ msgid "Mailing list"
-#~ msgstr "Senarai mel"
-
-#~ msgid "Message Body"
-#~ msgstr "Badan Mesej"
-
-#~ msgid "Message Header"
-#~ msgstr "Pengepala Mesej"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "_Mesej"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Tandakan sebagai _Penting"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Alihkan ke Folder"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Keluar dari atur cara"
-
-#~ msgid "Play Sound"
-#~ msgstr "Dengarkan Bunyi"
-
-#~ msgid "Recipients"
-#~ msgstr "Penerima"
-
-#~ msgid "Regex Match"
-#~ msgstr "Padanan Regex "
-
-#~ msgid "Replied to"
-#~ msgstr "Jawapan kepada"
-
-#~ msgid "returns"
-#~ msgstr "kembali"
-
-#~ msgid "returns greater than"
-#~ msgstr "kembalikan lebih besar daripada"
-
-#~ msgid "returns less than"
-#~ msgstr "kembalikan kurang daripada"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Jalankan atur cara:"
-
-#~ msgid "Sender"
-#~ msgstr "Penghantar"
-
-#~ msgid "Set Status"
-#~ msgstr "Set Status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Saiz (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "seperti"
-
-#~ msgid "Source Account"
-#~ msgstr "Akaun Sumber"
-
-#~ msgid "Specific header"
-#~ msgstr "Pengepala yang khusus"
-
-#~ msgid "starts with"
-#~ msgstr "bermula dengan"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Hentikan Memproses"
-
-#~ msgid "Unset Status"
-#~ msgstr "Batalkan Set Status"
-
 #~ msgid "Working"
 #~ msgstr "Berfungsi"
 
@@ -19912,10 +20661,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Finished"
 #~ msgstr "Selesai"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Kumpulan"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20472,9 +21217,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "component"
 #~ msgstr "komponen"
 
-#~ msgid "Alarms"
-#~ msgstr "Penggera"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Kedudukan Geografi"
 
@@ -21015,10 +21757,6 @@ msgstr "%s (%d%% siap)"
 #~ msgstr "Tidak dapat mewujudkan direktori untuk kalendar baru"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Pilih Kenalan daripada Buku Alamat"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "Hari lahi_r:"
 
@@ -21088,22 +21826,10 @@ msgstr "%s (%d%% siap)"
 #~ msgstr "<b>Opsyen kalendar</b>"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Opsyen kalendar</b>"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Pengelasan"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Tarikh & Masa"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Huraian"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Mula:</b> "
 
@@ -21500,9 +22226,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Menerima hasil carian LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Ralat ketika membuat carian"
-
 #~ msgid "Repository is offline"
 #~ msgstr "Repositori sedang di luar talian"
 
@@ -21747,9 +22470,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Bahagian belakang setempat/LDAP Buku Alamat Evolution"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Bahagian belakang fail setempat Kalendar Evolution"
-
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Bahagian belakang setempat Buku Alamat Evolution"
 
@@ -21849,9 +22569,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Use Score"
 #~ msgstr "Gunakan Skor"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kursor tidak dapat dimuatkan\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Folder mengandungi maklumat kenalan"
 
@@ -24170,9 +24887,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -25556,9 +26270,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25949,9 +26660,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Tasik Mammoth"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -28328,9 +29036,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "South Dakota"
 #~ msgstr "Dakota Selatan"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "Pulau Marsh Selatan"
 
@@ -30553,9 +31258,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "View the selected folder"
 #~ msgstr "Lihat folder yang dipilih"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Salin..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Bar Folder"
 
@@ -30565,18 +31267,12 @@ msgstr "%s (%d%% siap)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Pergi ke Folder..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Alihkan..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Folder Baru"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Keluarkan Folder Pengguna Lain"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Namakan semula..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Bar Jalan Pintas"
 
@@ -30618,9 +31314,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Could not create a S/MIME envelope context."
 #~ msgstr "Tidak dapat mewujudkan konteks sampul surat S/MIME."
 
-#~ msgid "Information"
-#~ msgstr "Maklumat"
-
 #~ msgid "Error"
 #~ msgstr "Ralat"
 
diff --git a/po/nl.po b/po/nl.po
index 370a3f8085..dc27723b5e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-04-03 14:20:47+0100\n"
 "Last-Translator: Daniel van Eeden <daniel_e@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -36,14 +36,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution adresboek"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contacten kop: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minikaart"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "huidige adresboek map"
@@ -64,34 +56,253 @@ msgstr " kaarten"
 msgid " card"
 msgstr " kaart"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contacten kop: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minikaart"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Cursor kon niet worden geladen\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Fout bij het aanmelden bij de LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "De server antwoordde zonder ondersteunde zoekbasis"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Kon het artikel %s niet van de NNTP server verkrijgen"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Kon adresboek niet laden"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Categoriebewerker niet beschikbaar."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Opslaan in het adresboek"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Fout bij laden standaard adresboek."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Fout bij het zoeken"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Wilt u de wijzingen opslaan?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Verwerpen"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "en één andere kaart."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Kan de inhoud van het bericht niet ontleden"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Fout bij toevoegen kaart"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adresboek adresweergave"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Standaard sync-adres:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Kon adresboek niet laden"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonieme verbinding met LDAP server wordt opgezet"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Fout bij het aanmelden.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Auto-afmaken"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificaten"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Hier kunt u auto-afmaken instellen"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adresboek adrespopup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresboek adresweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresboek kaartweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adresboekcomponent"
+
+# vertaling van control hier?
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime certificaatbeheer controle"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution configuratie voor mapinstellingen"
+
+# Fout in het Engels: Manager ipv Manage
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Uw S/Mime certificaten hier beheren"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -125,7 +336,7 @@ msgstr "Nieuw contact"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "Contacten: "
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -150,15 +361,15 @@ msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Op deze computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -167,19 +378,19 @@ msgid "Personal"
 msgstr "Persoonlijk"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Op LDAP servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Auto-afmaak instellingen"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -191,7 +402,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -203,7 +414,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -215,7 +426,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -227,37 +438,46 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresboek '%s' zal worden verwijderd. Weet u zeker dat u wilt doorgaan?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Nieuw adresboek"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Adresboek"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonieme verbinding met LDAP server wordt opgezet"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Fout bij het aanmelden.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -279,63 +499,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI voor de laatst gebruikte map in de slecteer namen dialoog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Auto-afmaken"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificaten"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Hier kunt u auto-afmaken instellen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adresboek adrespopup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresboek adresweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresboek kaartweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution adresboekcomponent"
-
-# vertaling van control hier?
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime certificaatbeheer controle"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution configuratie voor mapinstellingen"
-
-# Fout in het Engels: Manager ipv Manage
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Uw S/Mime certificaten hier beheren"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -343,7 +506,7 @@ msgstr "Uw S/Mime certificaten hier beheren"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -352,8 +515,7 @@ msgstr "Uw S/Mime certificaten hier beheren"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -379,6 +541,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Aanmelding"
@@ -427,13 +590,11 @@ msgid "Anonymously"
 msgstr "Anoniem"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basis"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
@@ -693,33 +854,26 @@ msgid "cards"
 msgstr "kaarten"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuten"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Selecteer contacten uit het adresboek"
+#: 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:208
+msgid "Remove All"
+msgstr "Alle verwijderen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Alle verwijderen"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Contactenlijst weergeven"
@@ -734,7 +888,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML e-mail versturen?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Toevoegen aan contacten"
 
@@ -742,15 +896,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Bron"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Selecteer contacten uit het adresboek"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -772,6 +933,11 @@ msgstr "_Categorie:"
 msgid "_Find"
 msgstr "_Zoeken"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Zoeken"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -819,9 +985,8 @@ msgid "<b>Work</b>"
 msgstr "Werkweek"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -846,7 +1011,6 @@ msgid "Birthday:"
 msgstr "Ge_boortedatum:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "K_alender:"
 
@@ -861,15 +1025,15 @@ msgid "Company:"
 msgstr "Opdracht:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
@@ -980,8 +1144,8 @@ msgstr "Homepage:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -1003,44 +1167,28 @@ msgid "_File under:"
 msgstr "Bestandsnaam:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Server:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Weet u zeker dat u deze\n"
-"contacten wilt verwijderen?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Weet u zeker dat u dit\n"
-"contact wilt verwijderen?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Bewerkbaar"
 
@@ -2012,132 +2160,124 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Dienst"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Lokatie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Gebruikersnaam"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Thuis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Overige"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Bron boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Doel boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Is nieuw contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Veranderd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot de categoriëen:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Herhalingsdatum is ongeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Ongeldig doel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Verwerpen"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Dienst"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Lokatie"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Gebruikersnaam"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
@@ -2155,6 +2295,22 @@ msgstr "_Volledige naam:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Weet u zeker dat u deze\n"
+"contacten wilt verwijderen?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Weet u zeker dat u dit\n"
+"contact wilt verwijderen?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2277,48 +2433,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Selecteer contacten uit het adresboek"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Leden"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Verwijder het geselecteerde bestand uit de lijst van bijlages"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Geselecteerd"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Verberg de adressen bij het sturen van post naar deze lijst"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Lijstnaam:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Contactlijstbewerker"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Boek"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Is nieuwe lijst"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Vereiste Deelnemers"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Lijst opslaan als VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Veranderd contact:"
@@ -2357,421 +2534,11 @@ msgstr ""
 "in deze map. Wilt u het toch toevoegen?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(kaart)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "kaart"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Lijstleden"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisatie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Positie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video conferentie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefoon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "werk"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-# mobieltje? mobiele? pocket?
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiele telefoon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "persoonlijk"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Opmerkingen"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Functie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Homepage"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Succes"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Opslagplaats offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Adresboek bestaat niet"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nieuwe contactenlijst"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Operatie niet toegestaan"
-
-# contact niet gevonden?
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kaart niet gevonden"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Kaart-ID bestaat reeds"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocol niet ondersteund"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Kan bron niet openen"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Aanmelding mislukt"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Aanmelding is vereist"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS is niet beschikbaar"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Een dergelijk bericht bestaat niet"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Onbekende fout"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Wij konden dit adresboek niet openen.  Controleer of het pad bestaat\n"
-"en of u het mag benaderen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Wij konden het adresboek niet openen.  Dit kan komen doordat\n"
-"u een ongeldige URI heeft opgegeven of doordat de LDAP server\n"
-"onbereikbaar is."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Deze versie van Evolution heeft geen LDAP supportmeegecompileerd.  Als u "
-"LDAP wilt gebruiken in Evolutionmoet u het programma vanuit de CVS sources "
-"meecompilerennadat u OpenLDAP van onderstaande link heeft opgehaald."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
-"heeft opgegeven of dat de serveronbereikbaar is."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Er zijn meer resultaten gevonden dan weergegeven kunnen\n"
-"worden. Probeer uw opdracht specifieker te maken of verhoog\n"
-"de limiet voor resultaten in de voorkeuren van het adresboek."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
-"Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
-"bij de instellingen van de adresboekserver."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "De zoekopdracht is niet succesvol beeïndigd"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Fout bij toevoegen lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Fout bij toevoegen kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Fout bij aanpassen ljist"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Fout bij aanpassen van kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Fout bij verwijderen lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Fout bij verwijderen kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s bestaat reeds.\n"
-"Wilt u het overschrijven?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Overschrijven"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Verplaats kaart naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Kopieer kaart naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Verplaats kaarten naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Kopieer kaarten naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Selecteer doel adresboek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Meerdere Vkaarten"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "Vkaart voor %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(geen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primaire e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Kies een actie"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Nieuw contact maken \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Voeg adres toe aan bestand contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Adresboek wordt benaderd..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Contactinformatie bewerken"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-mailadres samenvoegen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "en één andere kaart."
-msgstr[1] "en %d andere kaarten."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Volledige VCard tonen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Compacte VCard tonen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Opslaan in het adresboek"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Geen contacten"
@@ -2785,9 +2552,9 @@ msgstr[1] "%d contacten"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Zoekopdracht"
 
@@ -2803,130 +2570,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Fout bij aanpassen van kaart"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Naam begint met"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-mail begint met"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Uitgebreid..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Opslaan als VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Nieuw contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nieuwe contactlijst..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Ga naar map..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importeren..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Zoek naar contacten..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Adresboekbronnen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot instellingen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Contact doorsturen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Stuur bericht aan contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Envelop afdrukken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Kopieëren naar adresboek..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Verplaatsen naar adresboek..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Knippen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Huidige weergave"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Elke categorie"
@@ -2960,6 +2727,8 @@ msgid "Car Phone"
 msgstr "Autotelefoon"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -2967,6 +2736,21 @@ msgstr "Categorieën"
 msgid "Company Phone"
 msgstr "Bedrijfstelefoon"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mail 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Achternaam"
@@ -3004,14 +2788,30 @@ msgstr "Journaal"
 msgid "Manager"
 msgstr "Manager"
 
+# mobieltje? mobiele? pocket?
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiele telefoon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Bijnaam"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Opmerkingen"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kantoor"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisatie"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Andere Fax"
@@ -3064,29 +2864,21 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Breedte"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Hoogte"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Heeft focus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Geselecteerd"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Heeft cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Veld"
@@ -3103,7 +2895,11 @@ msgstr "Tekst model"
 msgid "Max field name length"
 msgstr "Maximale veldnaam lengte"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolombreedte"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3117,7 +2913,7 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw contact te maken."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3127,13 +2923,390 @@ msgstr ""
 "\n"
 "Er zijn geen items om weer te geven."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolombreedte"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Geselecteerd"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Heeft cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(kaart)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "kaart"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Lijstleden"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Positie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video conferentie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefoon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "werk"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "persoonlijk"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Functie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Homepage"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Succes"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Opslagplaats offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Adresboek bestaat niet"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nieuwe contactenlijst"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Operatie niet toegestaan"
+
+# contact niet gevonden?
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kaart niet gevonden"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Kaart-ID bestaat reeds"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocol niet ondersteund"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Kan bron niet openen"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Aanmelding mislukt"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Aanmelding is vereist"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS is niet beschikbaar"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Een dergelijk bericht bestaat niet"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Onbekende fout"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Wij konden dit adresboek niet openen.  Controleer of het pad bestaat\n"
+"en of u het mag benaderen."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Wij konden het adresboek niet openen.  Dit kan komen doordat\n"
+"u een ongeldige URI heeft opgegeven of doordat de LDAP server\n"
+"onbereikbaar is."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Deze versie van Evolution heeft geen LDAP supportmeegecompileerd.  Als u "
+"LDAP wilt gebruiken in Evolutionmoet u het programma vanuit de CVS sources "
+"meecompilerennadat u OpenLDAP van onderstaande link heeft opgehaald."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
+"heeft opgegeven of dat de serveronbereikbaar is."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Er zijn meer resultaten gevonden dan weergegeven kunnen\n"
+"worden. Probeer uw opdracht specifieker te maken of verhoog\n"
+"de limiet voor resultaten in de voorkeuren van het adresboek."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
+"Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
+"bij de instellingen van de adresboekserver."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "De zoekopdracht is niet succesvol beeïndigd"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Fout bij toevoegen lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Fout bij toevoegen kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Fout bij aanpassen ljist"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Fout bij aanpassen van kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Fout bij verwijderen lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Fout bij verwijderen kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s bestaat reeds.\n"
+"Wilt u het overschrijven?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Verplaats kaart naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Kopieer kaart naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Verplaats kaarten naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Kopieer kaarten naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Selecteer doel adresboek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Meerdere Vkaarten"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "Vkaart voor %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(geen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primaire e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Kies een actie"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Nieuw contact maken \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Voeg adres toe aan bestand contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Adresboek wordt benaderd..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Contactinformatie bewerken"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "E-mailadres samenvoegen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "en één andere kaart."
+msgstr[1] "en %d andere kaarten."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Volledige VCard tonen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Compacte VCard tonen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Opslaan in het adresboek"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3177,6 +3350,11 @@ msgstr "Evolution VCard import assistent"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Envelop afdrukken"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Druk contacten af"
@@ -3186,11 +3364,6 @@ msgstr "Druk contacten af"
 msgid "Print contact"
 msgstr "Druk kaart af"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Envelop afdrukken"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
@@ -3375,6 +3548,22 @@ msgstr "Kaart print test"
 msgid "This should test the contact print code"
 msgstr "Dit zou de kaart print code moeten testen"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Kan bestand niet openen"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Kon adresboek niet laden"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kan het adresboek niet openen"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specificeer het uitvoer bestand inplaats van de standaard uitvoer"
@@ -3433,22 +3622,6 @@ msgstr "In normale mode zou er geen grootte optie hoeven te zijn."
 msgid "Impossible internal error."
 msgstr "Onmogelijke interne fout."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Kan bestand niet openen"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Kon adresboek niet laden"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Kan het adresboek niet openen"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fout bij laden standaard adresboek."
@@ -3465,39 +3638,364 @@ msgstr "Geen bestandsnaam opgegeven."
 msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Niet verwijderen"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Aan:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Weet u zeker dat u deze vergadering wilt annuleren en verwijderen?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Weet u zeker dat u %d taak wilt verwijderen?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Weet u zeker dat u dit dagboek item wilt annuleren en verwijderen?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Weet u zeker dat u %d dagboek ingang wilt verwijderen?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Weet u zeker dat u afspraak `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Weet u zeker dat u %d afspraak wilt verwijderen?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Weet u zeker dat u afspraak `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Afspraak"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Wilt u de wijzingen opslaan?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s U heeft iets veranderd. Deze veranderingen vergeten en de editor sluiten?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Veranderingen verwerpen"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Verzenden"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution kalender backend voor lokale bestanden"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Wachtwoord invoeren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Meerdaagse gebeurtenissen splitsen:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Kon wombat server niet starten"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Kon wombat niet starten"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon kalendergegevens niet uit de pilot lezen"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Standaard prioriteit:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender en Taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender en taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenderconfiguratie"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalender planingsberichtenweergave"
+
+# of: kalender-/taakbeheer
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender- / taakbeheer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution taken-component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Bezig met starten:"
@@ -3597,10 +4095,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Kon bonobo niet initialiseren"
@@ -3741,9 +4235,29 @@ msgstr "Toon de tijd in 24 uurs formaat in plaats van het gebruik van am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigatie"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Samenvatting bevat"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Omschrijving bevat"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Commentaar bevat"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Lokatie bevat"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Niet passend"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3763,8 +4277,8 @@ msgid "Purge events older than"
 msgstr "Verwijderen van items ouder dan"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dagen"
 
@@ -3775,7 +4289,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3828,62 +4342,52 @@ msgstr ""
 "Er is geen agenda beschikbaar voor het creëren van gebeurtenissen en "
 "bijeenkomsten"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalenders"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Ver_gadering"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nieuwe kalender"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alender"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
@@ -3913,26 +4417,6 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Samenvatting bevat"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Omschrijving bevat"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Commentaar bevat"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Lokatie bevat"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Niet passend"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fout bij openen van de kalender"
@@ -3950,226 +4434,133 @@ msgstr "Toegang geweigerd bij openen van de kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Geluid Alarm Opties"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Bericht Alarm Opties"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "E-mail alarm opties"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programma Alarmopties"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Onbekende Alarmopties"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarmherhaling"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Berichten om weer te geven:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Te verzenden bericht"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Speel een geluid af:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Herhaal het Alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Start een programma:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Aan:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Met deze parameters:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "Kalenderinformatie"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "nogmaals"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Omschrijving:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "uren"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Herinneringen"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Actie/Sensor"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Toevoegen"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Stel een nieuw bericht op"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Algemeen"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datum/Tijd"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Be_richten"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Speel een geluid af"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Herinneringen"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Aan:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Verstuur een bericht"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Samenvatting:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Account:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opties..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Start een programma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Herhaal het Alarm"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "na"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "voor"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag(en)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "einde van afspraak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "nogmaals"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "u(u)r(en)"
 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "uren"
+
 # meervoudsvorm?
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuten"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-"U dient een lokatie te geven waar de agenda vandaan gehaalt dient te worden."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "De bron lokatie '%s' is niet goed geformeerd."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "De bronlokatie '%s' is geen webcal bron."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Er bestaat al een bron met de naam '%s' in de geselecteerde groep"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"De groep '%s' is op afstand. U dient een lokatie op te geven waar de lokale "
-"kalender vandaan gehaald dient te worden"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Nieuwe kalender toevoegen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Takenlijst-groep"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Kleuren"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Kies een kleur"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Nieuwe kalender toevoegen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "Groep toe_voegen..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Verversen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Actie/Sensor"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Toevoegen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weken"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmen"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4285,7 +4676,7 @@ msgid "Free/Busy Publishing"
 msgstr "_Vrij/Bezet publicatie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vrijdag"
@@ -4299,7 +4690,7 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Maandag"
@@ -4309,7 +4700,7 @@ msgid "S_un"
 msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Zaterdag"
@@ -4323,7 +4714,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Zondag"
@@ -4337,7 +4728,7 @@ msgid "T_hu"
 msgstr "D_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Donderdag"
@@ -4351,7 +4742,7 @@ msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Dinsdag"
@@ -4361,7 +4752,7 @@ msgid "W_eek starts:"
 msgstr "W_eek begint:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Woensdag"
@@ -4394,7 +4785,8 @@ msgstr "Weekeinden comprimeren in maand weergave"
 msgid "_Day begins:"
 msgstr "_Dag begint:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4444,6 +4836,82 @@ msgstr "_Woe"
 msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+"U dient een lokatie te geven waar de agenda vandaan gehaalt dient te worden."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "De bron lokatie '%s' is niet goed geformeerd."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "De bronlokatie '%s' is geen webcal bron."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Er bestaat al een bron met de naam '%s' in de geselecteerde groep"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"De groep '%s' is op afstand. U dient een lokatie op te geven waar de lokale "
+"kalender vandaan gehaald dient te worden"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Nieuwe kalender toevoegen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Takenlijst-groep"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Kleuren"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Kies een kleur"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Nieuwe kalender toevoegen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Groep toe_voegen..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Verversen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "weken"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Deze gebeurtenis is verwijderd."
@@ -4491,81 +4959,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Verificatiefout: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " tot "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Verloopt "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Verloopdatum "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Opslaan als..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Verificatiefout: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " tot "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Verloopt "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Verloopdatum "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Kan bron niet openen"
@@ -4629,8 +5091,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Dit item kon niet verwijderd worden door een fout"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresboek..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Adresboek"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4640,159 +5103,220 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Herinnering"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informatie"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Vergadering"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Gebeurtenis zonder start datum"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Gebeurtenis zonder eind datum"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Einddatum is fout"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Begintijd is ongeldig"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Eindtijd is fout"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan de agenda '%s' niet openen."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "voor het begin van elke afspraak"
+msgstr[1] "voor het begin van elke afspraak"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "einde van afspraak"
+msgstr[1] "einde van afspraak"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "voor het begin van elke afspraak"
+msgstr[1] "voor het begin van elke afspraak"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Gebeurtenis voor de hele dag"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "voor het begin van elke afspraak"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Bezig"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "voor het begin van elke afspraak"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorieën..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "voor het begin van elke afspraak"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Kalenderinformatie"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classificatie"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Datum & Tijd"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Vertrouwelijk"
+msgid "A_ll day event"
+msgstr "_Gebeurtenis voor de hele dag"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Datum/Tijd"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Aangepaste weergave opslaan..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Vrij"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorieën..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_okatie:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "K_alender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vé"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classificatie"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Open_baar"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Vertrouwelijk"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Tijd tonen als"
+msgid "L_ocation:"
+msgstr "L_okatie:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privé"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Openbaar"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Tijd tonen als"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Sa_menvatting:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmen"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Omschrijving:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Geen"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "De geselecteerde organisator heeft geen account meer."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Er moet een organisator ingesteld worden."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Verwijderen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4832,35 +5356,45 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "_Aanwezige toevoegen"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Begint:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Afzender aan adresboe_k toevoegen"
+msgid "<b>Organizer</b>"
+msgstr "<b>Dan</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Organisator _veranderen"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Coordinator"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Adresboek"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Organisator _veranderen"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Coordinator"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4933,147 +5467,141 @@ msgstr "Deze keer en komende keren"
 msgid "All Instances"
 msgstr "Alle keren"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen die Evolution niet kan bewerken."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Herhalingsdatum is ongeldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "op"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "eerste"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "tweede"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "derde"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "vierde"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "laatste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Andere datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "op de"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Datum/Tijd"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Omschrijving:"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Voorbeeld</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Herhaling"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Elke"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Uitzonderingen"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Voorbeeld"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Herhalingsregel"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Aangepaste herhaling"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Aa_npassen"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Geen herhaling"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Verwijderen"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Eenvoudige herhaling"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Afspraak bewerken"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "voor"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "eeuwig"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "maand(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "tot"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "we(e)k(en)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "ja(a)r(en)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Selecteer doel %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Doel map:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Takenlijst"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Voltooiingsdatum is ongeldig"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Bericht lettertype</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Voltooid:"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Waarschuwingen</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -5085,8 +5613,8 @@ msgstr "Hoog"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "In behandeling"
@@ -5098,22 +5626,22 @@ msgid "Low"
 msgstr "Laag"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Niet gestart"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Voortgang"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Procent voltooid: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5137,36 +5665,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "Homepage:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Taak"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is incorrect"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan taken in '%s' niet openen."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Vertrouwelijk"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opties</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Verwijder mail</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Map:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Be_gindatum:"
@@ -5175,52 +5709,58 @@ msgstr "Be_gindatum:"
 msgid "_Due date:"
 msgstr "Verloop_datum:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Authenticatie gegevens voor HTTP server"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Groep:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Agenda's geselecteerd voor publicatie"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalender opties</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Dagelijks"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publicatie frequentie"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Vrij/Bezet bewerker"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Vrij/Bezet publicatie lokatie"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Vrij/Bezet publicatie lokatie"
+msgid "Free/Busy Editor"
+msgstr "Vrij/Bezet bewerker"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Login naam:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Dagelijks"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Wachtwoord:"
+#, fuzzy
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publicatie frequentie"
+#, fuzzy
+msgid "_Password:"
+msgstr "Wachtwoord:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Onthoud dit wachtwoord"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Gebruikers_naam:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publicaties door gebruiker"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Wekelijks"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5302,7 +5842,7 @@ msgstr "%s bij %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Klik hier om %s te openen"
@@ -5311,6 +5851,11 @@ msgstr "Klik hier om %s te openen"
 msgid "Untitled"
 msgstr "Naamloos"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Samenvatting:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5322,7 +5867,7 @@ msgstr "Verloopdatum:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Status:"
 
@@ -5336,20 +5881,93 @@ msgstr "Prioriteit:"
 msgid "Web Page:"
 msgstr "Homepage:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Openbaar"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Einddatum"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privé"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Begindatum"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Vertrouwelijk"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Vrij"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Bezig"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"De geografische positie moet ingevoerd worden in het formaat: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nee"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Herhalend"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Toegewezen"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5395,95 +6013,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Vrij"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Bezig"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Open _website"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Opslaan als..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Af_drukken..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiëren"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Plakken"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "Taak _toewijzen"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "Doorsturen als i_Kalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "Markeren als Voltooid"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Geselecteerde taken als voltooid markeren"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Verwijderen"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Verwijder de Geselecteerde Taken"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Opslaan als..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Klik hier om een taak toe te voegen"
 
@@ -5492,174 +6116,105 @@ msgstr "Klik hier om een taak toe te voegen"
 msgid "% Complete"
 msgstr "% Voltooid:"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Voltooid"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Voltooiingsdatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Verloop datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Begindatum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Verplaatsen van berichten"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Berichten worden gekopieerd"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nieuwe taak"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selec_teer vandaag"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "_Selecteer dag..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda kopiëren..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iKalender"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Instellingen..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Einddatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Begindatum"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Herhalend"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Toegewezen"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nee"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"De geografische positie moet ingevoerd worden in het formaat: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5683,36 +6238,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuten delingen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5779,37 +6334,36 @@ msgid ", ending on "
 msgstr ", eindigend op "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Begint:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Eindigt: <b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Voltooid:</b>"
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Voltooid:</b>"
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Verloopdatum "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5817,309 +6371,289 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Geen</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Lokatie: "
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-msgid "Object could not be found\n"
-msgstr "Object kan niet worden gevonden\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
@@ -6148,6 +6682,10 @@ msgstr "Kalender wordt geladen"
 msgid "Loading calendar..."
 msgstr "Kalender wordt geladen..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Coordinator"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Server Bericht:"
@@ -6164,11 +6702,6 @@ msgstr "begindatum"
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Vereiste Deelnemers"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optionele Deelnemers"
@@ -6236,6 +6769,28 @@ msgstr "Overgedragen"
 msgid "In Process"
 msgstr "In uitvoer"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d-%m-%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afwezig"
@@ -6244,98 +6799,64 @@ msgstr "Afwezig"
 msgid "No Information"
 msgstr "Geen informatie"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Afzender aan adresboe_k toevoegen"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opties"
+msgid "O_ptions"
+msgstr "Opties"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Alleen kantooruren t_onen"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Uitge_zoomd tonen"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Vrij/Bezet _actualiseren"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automatisch uitzoeken"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Alle mensen en hulpbronnen"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Alle _mensen en één hulpbron"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vereiste mensen"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Aanvang _bijeenkomst:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "_Einde bijeenkomst:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d-%m-%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6344,117 +6865,51 @@ msgstr ""
 "Fout bij %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Taken laden"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Fout bij openen %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Taken laden"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Taken"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Objecten worden ververst"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Bezig met het laden van afspraken uit %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Bezig met het laden van taken uit %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Legen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender en Taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender en taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenderconfiguratie"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalender planingsberichtenweergave"
-
-# of: kalender-/taakbeheer
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender- / taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution taken-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Taken"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6800,10 +7255,6 @@ msgstr "Geselecteerde maand (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Geselecteerde jaar (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Taak"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6834,7 +7285,7 @@ msgid "Contacts: "
 msgstr "Contacten: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -6863,7 +7314,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d kaarten"
 msgstr[1] "%d kaarten"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6886,35 +7337,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Er is geen agenda beschikbaar voor het aanmaken van taken"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nieuwsgroepen"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Takenlijst-groep"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Nieuwe taak aanmaken"
@@ -8592,69 +9037,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ongeldige berichtenstroom ontvangen van %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Fout bij interpreten bestand: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Fout bij uitvoeren filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Kan de spoolmap niet openen"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Kan de spoolmap niet verwerken"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Ophalen bericht %d(%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Kan bericht niet opnemen"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Faalde bij bericht %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Map wordt gesynchroniseerd"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Bezig met ophalen van bericht %d van %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Faalde bij bericht %d van %d"
@@ -8676,42 +9121,6 @@ msgstr "Ongeldige argumenten voor (gebruiker)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Verplaatsen van berichten"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Berichten worden gekopieerd"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Veranderen troep status"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Bezig met filteren van nieuwe berichten."
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8757,7 +9166,43 @@ msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met zoeken naar onbekende koptekst: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Opdracht wordt niet ondersteund: bericht achteraan toevoegen: voor %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Opdracht wordt niet ondersteund: zoeken op expressie: voor %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Opdracht wordt niet ondersteund: zoeken op uids: voor %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Verplaatsen van berichten"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Berichten worden gekopieerd"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Veranderen troep status"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Bezig met filteren van nieuwe berichten."
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8768,15 +9213,15 @@ msgstr ""
 "\n"
 "%s "
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Interpretatie van de gpg userid hint is mislukt."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Fout tijdens het verwerken van de gpg wachtwoord aanvraag."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8785,31 +9230,31 @@ msgstr ""
 "U heeft een wachtwoord nodig om de sleutel voor\n"
 "gebruiker \"%s\" te mogen gebruiken"
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Onverwacht antwoord van GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8820,62 +9265,82 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s mislukt: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ondertekeningsdata niet genereren: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kon gpg niet starten: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Kon gpg niet starten."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan ondertekening niet verifiëren: Onjuist bericht formaat"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan versleutelingsdata niet genereren: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Versleutelde inhoud"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Kan de inhoud van het bericht niet ontleden"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kon de 'locking helper pipe' niet maken: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kon locking helper niet forken: %s"
+
+#: 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 "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kon niet vergrendelen: '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8898,26 +9363,6 @@ msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kon de 'locking helper pipe' niet maken: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kon locking helper niet forken: %s"
-
-#: 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 "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kon niet vergrendelen: '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9172,7 +9617,7 @@ msgstr "De referentie-informatie is verlopen."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -9261,55 +9706,55 @@ msgstr "POP voor SMTP gebruikmakend van een niet-POP bron"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compileren van reguliere expressie mislukt: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaamcomponent nodig"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een machinenaamcomponent nodig"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een padcomponent nodig"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolving \"%s\""
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Fout bij opzoeken naam: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Opzoeken host mislukt: kan draad niet creëren: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Machine niet gevonden: %s machine niet gevonden"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Machine opzoeken faalde: %s onbekende reden"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Adres wordt opgezocht"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Opzoeken mislukt: computer niet gevonden"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Opzoeken mislukt: onbekende fout"
 
@@ -9385,7 +9830,7 @@ msgstr "Encry_ptie certificaat:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Kon geen S/MIME decode context maken"
@@ -9476,7 +9921,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Geldige handtekening"
 
 #: camel/camel-smime-context.c:651
@@ -9491,49 +9936,48 @@ msgstr "DATA-commando mislukt"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Kon certificaat voor \"%s\" niet vinden."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Vinden van een algemeen bulkalgoritme is mislukt."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Regel aanmaken van bericht"
+msgid "Cannot create CMS Message"
+msgstr "Kan bericht niet opnemen"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Kan bericht niet opnemen"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Kan bestand %s niet bijvoegen: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Kan bestand %s niet bijvoegen: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Kan bericht niet opnemen"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Kon geen S/MIME decode context maken"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9580,7 +10024,8 @@ msgstr "Kan map `%s' niet aanmaken: map bestaat reeds"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
@@ -9589,8 +10034,8 @@ msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Troep"
 
@@ -9710,7 +10155,7 @@ msgstr "Sleutelgebruik ondersteunt geen ondertekenen van certificaten"
 msgid "Error in application verification"
 msgstr "Fout bij toepassingsverificatie"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9723,11 +10168,11 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "SLECHT"
 
@@ -9751,7 +10196,7 @@ msgstr ""
 "Wilt u het alsnog accepteren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9766,7 +10211,7 @@ msgstr ""
 "\n"
 "Wilt u dit accepteren?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9775,7 +10220,7 @@ msgstr ""
 "Certificaatprobleem: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9784,7 +10229,7 @@ msgstr ""
 "Slechte certificaatomgeving: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9793,7 +10238,7 @@ msgstr ""
 "Certificaat verlopen op: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9802,7 +10247,7 @@ msgstr ""
 "Certificaat herroepingslijst is verlopen op: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
@@ -9826,7 +10271,7 @@ msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
@@ -9845,8 +10290,8 @@ msgid "Checking for new mail"
 msgstr "Zoeken naar nieuwe e-mail"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Controleer op nieuwe berichten in alle mappen"
 
@@ -9876,8 +10321,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Voor benadering van Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9897,321 +10342,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Onverwacht antwoord van IMAP-server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan de map `%s' niet selecteren: Ongeldige mailbox naam"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Kreeg BYE antwoord"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kan map niet verkrijgen `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kan map niet verkrijgen `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Kan bericht %s uit folder %s niet verkrijgen\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Kan bericht %s uit folder %s niet verkrijgen\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan bericht %s uit folder %s niet verkrijgen\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan bericht %s uit folder %s niet verkrijgen\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mappen"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Laat alleen de aangemelde mappen zien"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Overschrijf servergegeven mappen naamruimte"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Naamruimte:"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Voor het lezen en opslaan van post op IMAP servers."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
-"als platte tekst."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-dienst voor %s op %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Kon niet verbinden met %s (poort %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL is niet beschikbaar"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Verbinding geannuleerd"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Fout bij opzetten van beveiligde verbinding met IMAP-server %s: De server \n"
-"ondersteund geen STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Onbekende fout"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Authenticatie met de IMAP-server %s met het authenticatie mechanisme %s is "
-"mislukt"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVoer het IMAP wachtwoord in voor %s op host %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kan map niet verkrijgen `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan de map `%s' niet aanmaken: Ongeldige mailbox naam"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kan de map `%s' niet aanmaken: Ongeldig commando"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan de map %s niet verwijderen: Speciale map"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan de map `%s' niet verwijderen: Ongeldige mailbox naam"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Opdracht:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kan map niet aanmaken: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Kan map niet aanmaken: `%s': %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Onverwacht antwoord van IMAP-server: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Geen taken"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10280,7 +10432,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10352,6 +10504,27 @@ msgstr "Gebruik een aangepast commando om met de server te verbinden"
 msgid "Command:"
 msgstr "Opdracht:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mappen"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Laat alleen de aangemelde mappen zien"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Overschrijf servergegeven mappen naamruimte"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Naamruimte:"
+
 #: 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"
@@ -10372,43 +10545,92 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-dienst voor %s op %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Kon niet verbinden met %s (poort %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL is niet beschikbaar"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Verbinding geannuleerd"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extensie niet ondersteund"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kon niet verbinden met commando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10419,30 +10641,280 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan map `%s' niet aanmaken: map bestaat reeds."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Identificatie op POP-server %s mislukt: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Onverwacht antwoord van IMAP-server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet selecteren: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Kreeg BYE antwoord"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Voor het lezen en opslaan van post op IMAP servers."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
+"als platte tekst."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Fout bij opzetten van beveiligde verbinding met IMAP-server %s: De server \n"
+"ondersteund geen STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Authenticatie met de IMAP-server %s met het authenticatie mechanisme %s is "
+"mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVoer het IMAP wachtwoord in voor %s op host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan de map %s niet verwijderen: Speciale map"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet verwijderen: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kan de map %s niet verwijderen: Speciale map"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Opdracht:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Geen taken"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10613,18 +11085,26 @@ msgstr "Kon samenvatting %s niet opslaan: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan geen bericht toevoegen aan de korte inhoud: onbekende reden"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Inbox"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir bericht toevoegen geannuleerd"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan bericht niet toevoegen aan maildir-map: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10640,48 +11120,48 @@ msgstr ""
 "Kan bericht %s uit folder %s niet verkrijgen\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Ongeldige berichtinhoud"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kan map niet verkrijgen `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Kan `%s' map niet verkrijgen: map bestaat niet."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Kan map niet aanmaken: `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Kan map `%s' niet verkrijgen: is geen maildir map."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kon map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11279,20 +11759,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Kon niet verbinden met POP-server %s (poort %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Identificatie op POP-server %s mislukt: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Fout bij opzetten van beveiligde verbinding met POP-server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kon niet verbinden met POP-server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11301,28 +11786,28 @@ msgstr ""
 "Kon niet verbinden met POP-server %s: Geen ondersteuning voor de ingestelde "
 "aanmeldingsmethode."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' aanmelding mislukt bij POP-server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan niet inloggen bij POP server %s: SASL protocol fout"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Identificatie op POP-server %s mislukt: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sVoer het POP3-wachtwoord voor %s op host %s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11331,7 +11816,16 @@ msgstr ""
 "Fout bij verbinden met de POP-server %s.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Fout bij verbinden met de POP-server %s.\n"
+"Fout bij het versturen van het wachtwoord: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
@@ -11543,93 +12037,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Postaflevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Kan bericht niet versturen: service niet verbonden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan berichten niet versturen: afzender niet geldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Bericht wordt verstuurd"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan bericht niet versturen: Geen ontvangers gespecificeerd."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan bericht niet versturen: een of meerdere ongeldige ontvangers"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Begroeting"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "HELO-commando mislukt: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "HELO command mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Aanmelding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Fout bij aanmaken van SASL aanmeldingsobject"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "AUTH-commando mislukt: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "AUTH-commando mislukt: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Fout aanmeldingsantwoord van server.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM commando mislukt: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "MAIL FROM-commando mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO commando mislukt: %s: bericht niet verzonden"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA-commando mislukt: %s : bericht niet verstuurd"
@@ -11637,26 +12131,26 @@ msgstr "DATA-commando mislukt: %s : bericht niet verstuurd"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "DATA-commando mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "RSET-commando mislukt: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "RSET-commando mislukt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "QUIT-commando mislukt: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "QUIT-commando mislukt: %s"
 
@@ -11719,105 +12213,6 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
-"van account"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Kan uitgaand bericht niet versleutelen: Geen encryptie certificaat "
-"ingesteldvoor account afzender"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Kan bestand niet openen"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Kon bericht niet van editor halen"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Naamloos Bericht"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Bestand openen"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automatisch gegenereerd"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Handtekening:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Bestand bijgevoegd"
-msgstr[1] "<b>%d</b> Bestanden bijgevoegd"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Verberg bijl_agen-balk (drop bijlagen hier)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Toon bijl_agen-balk (drop bijlagen hier)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Stel een nieuw bericht op"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Kon het venster Opstellen niet aanmaken:\n"
-"Kan adresselectie niet activeren."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Kon het venster voor het opstellen van het bericht niet maken:\n"
-"Niet in staat de HTML bewerkingscomponent te activeren.\n"
-"Controleer alstublieft de geïnstalleerde versie  van\n"
-"gtkhtml en libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Kon het venster voor het opstellen van het bericht niet maken:\n"
-"Niet in staat de HTML editor component te activeren."
-
-# # Het origineel heeft <b> in plaats van </b>
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Dit is een berichtinhoud anders dan tekst en kan daarom niet bewerk "
-"worden.)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Doel van bericht"
@@ -11898,17 +12293,96 @@ msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
+"van account"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Kan uitgaand bericht niet versleutelen: Geen encryptie certificaat "
+"ingesteldvoor account afzender"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kan bestand niet openen"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kon bericht niet van editor halen"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Naamloos Bericht"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Bestand openen"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatisch gegenereerd"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Handtekening:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Bestand bijgevoegd"
+msgstr[1] "<b>%d</b> Bestanden bijgevoegd"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Verberg bijl_agen-balk (drop bijlagen hier)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Toon bijl_agen-balk (drop bijlagen hier)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Stel een nieuw bericht op"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Doorgestuurd bericht - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Originele bericht bijvoegen"
+msgstr[1] "Originele bericht bijvoegen"
+
+# # Het origineel heeft <b> in plaats van </b>
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Dit is een berichtinhoud anders dan tekst en kan daarom niet bewerk "
+"worden.)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Voeg een bestand bij het bericht"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11926,54 +12400,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kon de pijp niet maken: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Ongelezen"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Wilt u de wijzingen opslaan?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Niet verwijderen"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Verwijderen"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kon handtekening-bestand niet opslaan: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Waarschuwing: Veranderd Bericht"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11981,57 +12469,74 @@ msgid ""
 msgstr "Weet u zeker dat u deze naamloze afspraak wilt verwijderen?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Veranderingen verwerpen"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Bericht opslaan..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Kon de pijp niet maken: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Kon handtekening-bestand niet opslaan: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "U dient een account in te stellen voordat u post kunt versturen."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Kon de pijp niet maken: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Kon het venster Opstellen niet aanmaken:\n"
+"Kan adresselectie niet activeren."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Kon het venster voor het opstellen van het bericht niet maken:\n"
+"Niet in staat de HTML bewerkingscomponent te activeren.\n"
+"Controleer alstublieft de geïnstalleerde versie  van\n"
+"gtkhtml en libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "De Ximian Evolution werkgroep suite"
@@ -12335,10 +12840,6 @@ msgstr "%d/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Selecteer een tijd om mee te vergelijken"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Filter regels"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12367,19 +12868,8 @@ msgstr "U dient een bestandsnaam te geven."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Het bestand '%s' bestaat niet of is geen normaal bestand"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "verplaatsen map %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "U moet een map geven."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12387,155 +12877,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Opdracht"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "U moet deze filter een naam geven."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "U moet deze vfolder een naam geven."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Geen server geselecteerd"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Dan</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Map selecteren"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Filter regels</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vMap-bronnen</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Vergelijk met"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Inkomend"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"12 uur 's middags op de datum die u hier invoert."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"een tijd relatief aan het moment dat de filter wordt gestart."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"De datum van het bericht zal vergeleken worden met\n"
-"de huidige tijd."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "Een tijd relatief aan de huidige tijd"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "geleden"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "maanden"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "seconden"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "alleen specifieke mappen"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "de huidige tijd"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "de tijd die u specificeert"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "met alle actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "met alle lokale en actieve niet-lokale mappen"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "met alle lokale folders"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "jaren"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Belangrijk"
 
@@ -12603,6 +12975,70 @@ msgstr "inkomend"
 msgid "outgoing"
 msgstr "uitgaand"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Filter regels</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Vergelijk met"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Inkomend"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"12 uur 's middags op de datum die u hier invoert."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"een tijd relatief aan het moment dat de filter wordt gestart."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"De datum van het bericht zal vergeleken worden met\n"
+"de huidige tijd."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "Een tijd relatief aan de huidige tijd"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "geleden"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "maanden"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "seconden"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "de huidige tijd"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "de tijd die u specificeert"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "jaren"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Regel Toevoegen"
@@ -12615,58 +13051,73 @@ msgstr "Regel bewerken"
 msgid "Rule name"
 msgstr "Regelnaam"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Score regels"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Bericht opstellen - Voorkeuren"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Inhoud bevat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Inhoud bevat niet"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
+"berichten instellen."
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Inhoud of onderwerp bevat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Hier kunt u uw e-mail accounts instellen"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Bericht bevat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-mail"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Geadresseerden bevatten"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-mail accountconfiguratie"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Verzender bevat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-mailcomponent"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Onderwerp bevat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution nieuw bericht opstellen"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Onderwerp bevat niet"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution configuratie voor opstellen van nieuw bericht"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Virtuele mappen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-mail voorkeuren"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Toevoegen"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Post"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VMap-bron"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "E-mailvoorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Post:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12698,45 +13149,305 @@ msgstr "Handtekening script toevoegen"
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------Doorgestuurd bericht-------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Op %a %d-%m-%Y, om %H:%M %%+05d uur schreef %%s:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Filter regels"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Map selecteren"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Score aanpassen"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Geef Kleur"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Geef Score"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Bijlages"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Piep"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "bevat"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Naar map kopiëren"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Ontvangstdatum"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Verzendingsdatum"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Verwijderd"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "bevat niet"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "eindigt niet op"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "bestaat niet"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "komt niet terug"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "begint niet met"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "bestaat niet"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Klad"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "eindigt op"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Bestaat"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "bestaat"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expressie"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Antwoord"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "is"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "is na"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "is voor"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "is gemarkeerd"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "is groter dan"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "is kleiner dan"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "is niet"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "Is niet gemarkeerd"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Troep test"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Mailinglijst"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Berichtinhoud"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Berichtkop"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Bericht is troep"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Bericht is geen troep"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Naar map verplaatsen"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Naar programma doorsluizen"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Geluid afspelen"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Gelezen"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Geadresseerden"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Overeenkomende regex"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Beantwoord aan"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "komt terug"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "geeft groter dan"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "geeft kleiner dan"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Start een programma"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Afzender"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Stel Status in"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Grootte (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "klinkt als"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Source-Account"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Specifieke kop"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "begint met"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Stop met Verwerken"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Status herstellen"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Dan</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "_VMap van zoekopdracht maken..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Map-eigenschappen"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Eigenschappen"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Mapnaam"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Berichtentotaal"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Berichtentotaal"
+msgstr[1] "Berichtentotaal"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Ongelezen"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Ongelezen"
+msgstr[1] "Ongelezen"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12746,458 +13457,294 @@ msgstr "<klik hier om een map te selecteren>"
 msgid "Create New Folder"
 msgstr "Nieuwe map aanmaken"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Map_naam:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VMappen"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Bezig met laden..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "verplaatsen map %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Bezig met kopieëren van map %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieërd naar map %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet droppen in hoogste nivo opslag."
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Annuleer Taak"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiëren"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Bezig met aanmaken map `%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Map aanmaken"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Beel_d"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Open in _Nieuw Venster"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "Kopiëren..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "Verplaatsen..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Hernoemen"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Eigenschappen..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VMappen"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "He_rnoemen..."
 
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Bezig met laden..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Post"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Af_drukken"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Iedereen beantwoorden"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Vervolg_acties..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Als voltooid markeren"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Als gelezen mar_keren"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Als belan_grijk markeren"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Als _onbelangrijk markeren"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Als troep markeren"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Als niet-troep markeren"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Naar map _verplaatsen..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan adresboe_k toevoegen"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Filters _toepassen"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "Troep f_ilteren"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VMap op afze_nder"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter op afzen_der"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Standaard"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Bericht afdrukken"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik hier om mail te versturen naar %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Van"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Antwoordadres"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Aan"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Nieuwsgroepen"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s bijlage"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Handtekening in niet ondersteund formaat"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Fout bij het verifiëren van ondertekening"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Onbekende fout bij het verifiëren van ondertekening"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Bezig met ophalen `%s'"
-
-# Niet ondertekend of positief getal?
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Niet getekend"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Geldige handtekening"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Ongeldige handtekening"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Geldige handtekening, kan afzender niet verifiëren"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Niet versleuteld"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Versleuteld, zwak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Versleuteld"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Versleuteld, sterk"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Misvormd extern-berichtgedeelte"
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Verwijzing naar FTP site (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Verwijzing naar lokaal bestand (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Verwijzing naar externe gegevens (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Bezig met opmaken van bericht"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "E-mailprogramma"
-
-# a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Klopt: %d"
 
-#: mail/em-format-html-display.c:644
+# Niet ondertekend of positief getal?
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Niet getekend"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13205,7 +13752,11 @@ msgstr ""
 "Dit bericht is niet ondertekend, Er kan niet worden aangetoond dat het "
 "authentiek is."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Geldige handtekening"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13213,7 +13764,11 @@ msgstr ""
 "Dit bericht is geldig en is ondertekend, de afzender van dit bericht is zeer "
 "waarschijnlijk degene die hij claimt te zijn."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Ongeldige handtekening"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13221,11 +13776,11 @@ msgstr ""
 "De handtekening van dit bericht kan niet worden geverifieerd, het is "
 "onderweg mogelijk gewijzigd."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13233,7 +13788,11 @@ msgstr ""
 "Dit bericht is ondertekend met een geldige handtekening maar de afzender van "
 "het bericht kan niet worden geverifieerd."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Niet versleuteld"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13242,7 +13801,11 @@ msgstr ""
 "Dit bericht is niet versleuteld.  De inhoud kan mogelijk bekeken worden "
 "tijdens de wegdie het bericht op het internet aflegd."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Versleuteld, zwak"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13252,7 +13815,11 @@ msgstr ""
 "moeilijk maar niet onmogelijk voor een buitenstaander om de inhoud van dit "
 "bericht te bekijken in een redelijke tijd."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Versleuteld"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13260,7 +13827,11 @@ msgstr ""
 "Dit bericht is versleuteld.  His is moeilijk voor een buitenstaander om de "
 "inhoud van het bericht te bekijken."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Versleuteld, sterk"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13270,40 +13841,164 @@ msgstr ""
 "moelijklijk voor een buitenstaander ome de inhoud van het bericht te "
 "bekijken in een redelijke tijd."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Dit certificaat is niet weer te geven"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Afgerond op %B %d, %Y, %l:%M %p"
 
 # overtijd
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Te laat:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "op %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "In bericht weerge_ven"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Bezig met ophalen `%s'"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Geldige handtekening, kan afzender niet verifiëren"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Misvormd extern-berichtgedeelte"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Verwijzing naar FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Verwijzing naar lokaal bestand (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Verwijzing naar externe gegevens (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Bezig met opmaken van bericht"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Van"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Antwoordadres"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Aan"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "E-mailprogramma"
+
+# a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Nieuwsgroepen"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s bijlage"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Handtekening in niet ondersteund formaat"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Fout bij het verifiëren van ondertekening"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Onbekende fout bij het verifiëren van ondertekening"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ingebouwd)"
@@ -13416,7 +14111,7 @@ msgstr "_Bericht sturen aan..."
 msgid "_Add to Addressbook"
 msgstr "Aan adresboek _toevoegen"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
@@ -13431,7 +14126,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Map"
 
@@ -13465,11 +14160,23 @@ msgid "Add address"
 msgstr "Adres toevoegen"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Berichten van %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Virtuele mappen"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VMap-bron"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Automatisch herkennen van links"
@@ -13971,66 +14678,33 @@ msgstr "port voor het starten van gebruikersmode spamd"
 msgid "spamd port"
 msgstr "spamd poort"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Bericht opstellen - Voorkeuren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Hier kunt u uw e-mail accounts instellen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-mail accountconfiguratie"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution e-mailcomponent"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution nieuw bericht opstellen"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape mail-import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importeerassistent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-mail voorkeuren"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution pine-import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-mail accounts"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "E-mailvoorkeuren"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Post:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14088,34 +14762,6 @@ msgstr "Importeren `%s'"
 msgid "Importing mailbox"
 msgstr "Bezig met Importeren mailbox"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape mail-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importeerassistent"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution pine-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-import"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14280,77 +14926,83 @@ msgstr "%s mailinglijst"
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d geselecteerd"
+msgid_plural "%d deleted"
+msgstr[0] "%d geselecteerd"
+msgstr[1] "%d geselecteerd"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d niet verzonden"
+msgid_plural "%d junk"
+msgstr[0] "%d niet verzonden"
+msgstr[1] "%d niet verzonden"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d dag"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d dag"
+msgstr[1] "%d dag"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d verzonden"
+msgid_plural "%d sent"
+msgstr[0] "%d verzonden"
+msgstr[1] "%d verzonden"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d niet verzonden"
+msgid_plural "%d unsent"
+msgstr[0] "%d niet verzonden"
+msgstr[1] "%d niet verzonden"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d totaal"
+msgid_plural "%d total"
+msgstr[0] "%d totaal"
+msgstr[1] "%d totaal"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d totaal, %d ongelezen"
+msgid_plural ", %d unread"
+msgstr[0] "%d totaal, %d ongelezen"
+msgstr[1] "%d totaal, %d ongelezen"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nieuwe berichten map"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "Mail _Map"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Maak een berichten map aan"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Dienst wordt gecontroleerd"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Verbinden met server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteit"
@@ -14414,14 +15066,22 @@ msgstr ""
 "mailaccount. Geef een naam aan dit account in de ruimte hieronder. Deze naam "
 "is alleen nodig voor de lijstweergave."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Dienst wordt gecontroleerd"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Verbinden met server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Control_eren op ondersteunde types "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Voorbeeld</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL wordt niet ondersteund in deze versie van Evolution</b>"
@@ -14681,7 +15341,7 @@ msgstr ""
 "Aanvragen voor bijeenkomsten _niet ondertekenen (voor Outlook "
 "compatibiliteit)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klaar"
 
@@ -15024,6 +15684,119 @@ msgstr "kleur"
 msgid "description"
 msgstr "omschrijving"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vMap-bronnen</b>"
+
+# Digitaal != Electronisch
+# Electronisch wordt meer gebruikt
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Electronische handtekening</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encryptie</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Geaccepteerd"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "V_oltooid"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Hoofdlettergevoelig"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Vind in bericht"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Zoek:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Vlaggen voor vervolgactie"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Mapabonnementen"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Sleutel overeenkomst"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Niets geselecteerd"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Server:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Beveiligingsinformatie"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"De door u gekozen berichten staan in de lijst hieronder.\n"
+"Kies een vervolgactie uit het \"Vlag\"-menu."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lijst met accounts"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Verloopdatum:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Vlag:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Abonneren"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Afmelden"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "alleen specifieke mappen"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "met alle actieve niet-lokale mappen"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "met alle lokale en actieve niet-lokale mappen"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "met alle lokale folders"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15232,14 +16005,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15344,8 +16109,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Kan map niet verplaatsen: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15396,8 +16162,9 @@ msgstr "Kan bron niet openen"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "en één andere kaart."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15426,8 +16193,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Niet verwijderen"
+msgstr "_Herstellen"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15491,8 +16259,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Kon map niet verwijderen:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15534,13 +16305,44 @@ msgstr ""
 "    '%s'\n"
 "En zijn aangepast."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "verplaatsen map %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "U moet een map geven."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "U moet deze vfolder een naam geven."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Geen server geselecteerd"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15548,16 +16350,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Overschrijven"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15719,7 +16521,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15728,47 +16530,21 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Hoofdlettergevoelig"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Vind in bericht"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Zoek:"
-
-# Digitaal != Electronisch
-# Electronisch wordt meer gebruikt
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Electronische handtekening</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encryptie</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Beveiligingsinformatie"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Annuleren..."
@@ -15804,24 +16580,24 @@ msgstr "Aan het Actualiseren ..."
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "Dit wachtwoord onthouden tot het einde van deze sessie"
 
@@ -15877,15 +16653,15 @@ msgstr "Actualiseren vfolders voor uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
@@ -15949,7 +16725,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -16005,10 +16781,6 @@ msgstr "Doorsturen"
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Gelezen"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Beantwoorden"
@@ -16021,49 +16793,49 @@ msgstr "Iedereen beantwoorden"
 msgid "Review"
 msgstr "Beoordelen"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Vlaggen voor vervolgactie"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Inhoud bevat"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "V_oltooid"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Inhoud bevat niet"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"De door u gekozen berichten staan in de lijst hieronder.\n"
-"Kies een vervolgactie uit het \"Vlag\"-menu."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Inhoud of onderwerp bevat"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Verloopdatum:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Bericht bevat"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Vlag:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Geadresseerden bevatten"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Mapabonnementen"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Verzender bevat"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Niets geselecteerd"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Onderwerp bevat"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Server:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Onderwerp bevat niet"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Abonneren"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution shell"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Afmelden"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution testcomponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16133,31 +16905,17 @@ msgstr "Toon het waarschuwings dialoog voor de development versie"
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
-#, fuzzy
-msgid "Uknown system error."
-msgstr "Onbekende fout"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Ongeldige argumenten"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Kan niet registreren op OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Actieve verbindingen</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Configuratiedatabase niet gevonden"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Actieve verbindingen"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generieke fout"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16344,29 +17102,6 @@ msgstr "Mapnaam mag geen \"#\" bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution is bezig offline te gaan."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Post versturen naar %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Het gereedschap voor GNOME Pilot lijkt niet geïnstalleerd te zijn."
@@ -16384,108 +17119,93 @@ msgstr "Bug-buddy is niet geïnstalleerd."
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Offline _werken"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Aankruisvakje"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nieuw"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Nieuwe taak"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Test"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Maak een nieuwe test item aan"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Actieve verbindingen</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Actieve verbindingen"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
+#: shell/e-shell-window.c:344
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution is bezig offline te gaan."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alender:"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "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/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Contacten: "
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Post versturen naar %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Post:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Taken:"
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Onbekende fout"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Map_type:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Ongeldige argumenten"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Map van andere gebruikers openen"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Kan niet registreren op OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Account:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Mapnaam:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generieke fout"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Gebruiker:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nieuw"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Instellingen Assistent"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Bezig met Importeren Bestanden"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tijdzone "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Welkom"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16499,7 +17219,7 @@ msgstr ""
 "\n"
 "Klik op \"Volgende\" om te beginnen."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16511,17 +17231,17 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution shell"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Nieuwe taak"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution test"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution testcomponent"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Maak een nieuwe test item aan"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16584,7 +17304,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16621,7 +17341,7 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16630,39 +17350,39 @@ msgstr ""
 "Bedankt!\n"
 "Het Ximian Evolution team\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution met activatie van het gespecificeerde component"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle onderdelen van Evolution stoppen"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Geforceerde migratie van Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16737,6 +17457,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16983,6 +17725,11 @@ msgstr "Uw certificaten"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificaat bestaat reeds"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
@@ -17184,11 +17931,6 @@ msgstr "Unieke ID van de persoon"
 msgid "Certificate Signature Value"
 msgstr "Certificaatondertekenings waarde"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Certificaat bestaat reeds"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bestand wachtwoord"
@@ -17329,8 +18071,8 @@ msgstr "Huidige contact weergeven"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acties"
@@ -17807,16 +18549,6 @@ msgstr "Selectie in_verteren"
 msgid "_Threaded Message List"
 msgstr "_Berichtenlijst met discussies"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Dit venster sluiten"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Sl_uiten"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Afzender aan a_dresboek toevoegen"
@@ -18220,6 +18952,16 @@ msgstr "E_xtra"
 msgid "_Undelete"
 msgstr "_Herstellen"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Dit venster sluiten"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Sl_uiten"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage toevoegen"
@@ -18302,10 +19044,6 @@ msgstr "Het huidige bestand opslaan onder een andere naam"
 msgid "Save the message in a specified folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Verzenden"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18871,7 +19609,7 @@ msgid "Evolution Query"
 msgstr "Evolution samenvatting"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19030,6 +19768,253 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Authenticatie gegevens voor HTTP server"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Agenda's geselecteerd voor publicatie"
+
+#~ msgid "Login name:"
+#~ msgstr "Login naam:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Publicaties door gebruiker"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Contactlijstbewerker"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Lijst opslaan als VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Kon wombat niet starten"
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alender"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Geluid Alarm Opties"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Bericht Alarm Opties"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "E-mail alarm opties"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programma Alarmopties"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Onbekende Alarmopties"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarmherhaling"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Berichten om weer te geven:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Te verzenden bericht"
+
+#~ msgid "Play sound:"
+#~ msgstr "Speel een geluid af:"
+
+#~ msgid "Run program:"
+#~ msgstr "Start een programma:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Met deze parameters:"
+
+#~ msgid "Basics"
+#~ msgstr "Algemeen"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datum/Tijd"
+
+#~ msgid "Reminders"
+#~ msgstr "Herinneringen"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opties..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresboek..."
+
+#~ msgid "Reminder"
+#~ msgstr "Herinnering"
+
+#~ msgid "B_usy"
+#~ msgstr "_Bezig"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Vertrouwelijk"
+
+#~ msgid "Date & Time"
+#~ msgstr "Datum/Tijd"
+
+#~ msgid "F_ree"
+#~ msgstr "Vrij"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vé"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Open_baar"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "_Aanwezige toevoegen"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Afzender aan adresboe_k toevoegen"
+
+#~ msgid "Exceptions"
+#~ msgstr "Uitzonderingen"
+
+#~ msgid "Preview"
+#~ msgstr "Voorbeeld"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Herhalingsregel"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Aangepaste herhaling"
+
+#~ msgid "_Modify"
+#~ msgstr "Aa_npassen"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Geen herhaling"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Eenvoudige herhaling"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Voltooid:"
+
+#~ msgid "Progress"
+#~ msgstr "Voortgang"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Vertrouwelijk"
+
+#~ msgid "Folder:"
+#~ msgstr "Map:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Begint:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Eindigt: <b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Voltooid:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Voltooid:</b>"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Geen</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Er is een fout opgetreden in het CORBA-systeem\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Object kan niet worden gevonden\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Afzender aan adresboe_k toevoegen"
+
+#~ msgid "_Options"
+#~ msgstr "_Opties"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Aanvang _bijeenkomst:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "_Einde bijeenkomst:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Fout bij openen %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Kon certificaat voor \"%s\" niet vinden."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Regel aanmaken van bericht"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kon geen S/MIME decode context maken"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Kon het venster voor het opstellen van het bericht niet maken:\n"
+#~ "Niet in staat de HTML editor component te activeren."
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Score regels"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Op %a %d-%m-%Y, om %H:%M %%+05d uur schreef %%s:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Mapnaam"
+
+#~ msgid "_Rename"
+#~ msgstr "_Hernoemen"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Eigenschappen..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Aankruisvakje"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alender:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "_Contacten: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Post:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Taken:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Map_type:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Map van andere gebruikers openen"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Mapnaam:"
+
+#~ msgid "_User:"
+#~ msgstr "_Gebruiker:"
+
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "Ondersteunde bases _weergeven"
 
@@ -19115,9 +20100,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "_Invite Others..."
 #~ msgstr "Anderen uit_nodigen..."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Kon het artikel %s niet van de NNTP server verkrijgen"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Plaatsen niet toegestaan door nieuwsserver"
 
@@ -19151,174 +20133,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Onbekend server-antwoord: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Score aanpassen"
-
-#~ msgid "Assign Color"
-#~ msgstr "Geef Kleur"
-
-#~ msgid "Assign Score"
-#~ msgstr "Geef Score"
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlages"
-
-#~ msgid "Beep"
-#~ msgstr "Piep"
-
-#~ msgid "contains"
-#~ msgstr "bevat"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Naar map kopiëren"
-
-#~ msgid "Date received"
-#~ msgstr "Ontvangstdatum"
-
-#~ msgid "Date sent"
-#~ msgstr "Verzendingsdatum"
-
-#~ msgid "Deleted"
-#~ msgstr "Verwijderd"
-
-#~ msgid "does not contain"
-#~ msgstr "bevat niet"
-
-#~ msgid "does not end with"
-#~ msgstr "eindigt niet op"
-
-#~ msgid "does not exist"
-#~ msgstr "bestaat niet"
-
-#~ msgid "does not return"
-#~ msgstr "komt niet terug"
-
-#~ msgid "does not sound like"
-#~ msgstr "klinkt niet als"
-
-#~ msgid "does not start with"
-#~ msgstr "begint niet met"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "bestaat niet"
-
-#~ msgid "Draft"
-#~ msgstr "Klad"
-
-#~ msgid "ends with"
-#~ msgstr "eindigt op"
-
-#~ msgid "Exist"
-#~ msgstr "Bestaat"
-
-#~ msgid "exists"
-#~ msgstr "bestaat"
-
-#~ msgid "Expression"
-#~ msgstr "Expressie"
-
-#~ msgid "Follow Up"
-#~ msgstr "Antwoord"
-
-#~ msgid "is"
-#~ msgstr "is"
-
-#~ msgid "is after"
-#~ msgstr "is na"
-
-#~ msgid "is before"
-#~ msgstr "is voor"
-
-#~ msgid "is Flagged"
-#~ msgstr "is gemarkeerd"
-
-#~ msgid "is greater than"
-#~ msgstr "is groter dan"
-
-#~ msgid "is less than"
-#~ msgstr "is kleiner dan"
-
-#~ msgid "is not"
-#~ msgstr "is niet"
-
-#~ msgid "is not Flagged"
-#~ msgstr "Is niet gemarkeerd"
-
-#~ msgid "Junk Test"
-#~ msgstr "Troep test"
-
-#~ msgid "Mailing list"
-#~ msgstr "Mailinglijst"
-
-#~ msgid "Message Body"
-#~ msgstr "Berichtinhoud"
-
-#~ msgid "Message Header"
-#~ msgstr "Berichtkop"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Bericht is troep"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Bericht is geen troep"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Naar map verplaatsen"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Naar programma doorsluizen"
-
-#~ msgid "Play Sound"
-#~ msgstr "Geluid afspelen"
-
-#~ msgid "Recipients"
-#~ msgstr "Geadresseerden"
-
-#~ msgid "Regex Match"
-#~ msgstr "Overeenkomende regex"
-
-#~ msgid "Replied to"
-#~ msgstr "Beantwoord aan"
-
-#~ msgid "returns"
-#~ msgstr "komt terug"
-
-#~ msgid "returns greater than"
-#~ msgstr "geeft groter dan"
-
-#~ msgid "returns less than"
-#~ msgstr "geeft kleiner dan"
-
-#~ msgid "Run Program"
-#~ msgstr "Start een programma"
-
-#~ msgid "Sender"
-#~ msgstr "Afzender"
-
-#~ msgid "Set Status"
-#~ msgstr "Stel Status in"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Grootte (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "klinkt als"
-
-#~ msgid "Source Account"
-#~ msgstr "Source-Account"
-
-#~ msgid "Specific header"
-#~ msgstr "Specifieke kop"
-
-#~ msgid "starts with"
-#~ msgstr "begint met"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Stop met Verwerken"
-
-#~ msgid "Unset Status"
-#~ msgstr "Status herstellen"
-
 #~ msgid "Brought to you by"
 #~ msgstr "U gebracht door"
 
@@ -19344,31 +20158,16 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Kan geen verbinding krijgen met LDAP server"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Fout bij het aanmelden bij de LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Kan geen query uitvoeren op de Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "De server antwoordde zonder ondersteunde zoekbasis"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Fout bij het laden van schema informatie"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
-
 #, fuzzy
 #~ msgid "Job title:"
 #~ msgstr "_Functie:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Categoriebewerker niet beschikbaar."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19404,9 +20203,6 @@ msgstr "%s (%d%% voltooid)"
 #~ "De gebeurtenis geselecteerd voor verwijdering is een bijeenkomst; wilt u "
 #~ "een afmeldingsbericht sturen? "
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Weet u zeker dat u deze vergadering wilt annuleren en verwijderen?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19424,42 +20220,15 @@ msgstr "%s (%d%% voltooid)"
 #~ "De dagboek ingang geselecteerd voor verwijdering is gepubliceerd; wilt u "
 #~ "een afmeldingsbericht sturen? "
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Weet u zeker dat u afspraak `%s' wilt verwijderen?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Weet u zeker dat u deze naamloze afspraak wilt verwijderen?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Weet u zeker dat u de taak `%s' wilt verwijderen?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Weet u zeker dat u deze naamloze taak wilt verwijderen?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Weet u zeker dat u dagboek entry `%s' wilt verwijderen?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Weet u zeker dat u dit naamloze dagboekelement wilt verwijderen?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Weet u zeker dat u %d afspraak wilt verwijderen?"
-#~ msgstr[1] "Weet u zeker dat u %d afspraken wilt verwijderen?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Weet u zeker dat u %d taak wilt verwijderen?"
-#~ msgstr[1] "Weet u zeker dat u de %d taken wilt verwijderen?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Weet u zeker dat u %d dagboek ingang wilt verwijderen?"
-#~ msgstr[1] "Weet u zeker dat u %d dagboek ingangen wilt verwijderen?"
-
 #~ msgid ""
 #~ "This event has been changed, but has not been saved.\n"
 #~ "\n"
@@ -19723,9 +20492,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Finished"
 #~ msgstr "Klaar"
 
-#~ msgid "Group:"
-#~ msgstr "Groep:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20270,9 +21036,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "component"
 #~ msgstr "component"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmen"
-
 #~ msgid "Geographical position"
 #~ msgstr "Geografische positie"
 
@@ -20874,22 +21637,10 @@ msgstr "%s (%d%% voltooid)"
 #~ msgstr "Kalenderinformatie"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Kalenderinformatie"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Classificatie"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Datum & Tijd"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Omschrijving:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Begint:</b> "
 
@@ -21311,9 +22062,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "LDAP zoekresultaten worden ingelezen..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Fout bij het zoeken"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Opslagplaats offline"
@@ -21455,9 +22203,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution adresboek lokaal / LDAP-backend"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution kalender backend voor lokale bestanden"
-
 #, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolution adresboek lokaal / LDAP-backend"
@@ -21555,9 +22300,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Use Score"
 #~ msgstr "Gebruik score"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Cursor kon niet worden geladen\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Map met contactinformatie"
 
@@ -23837,9 +24579,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -25223,9 +25962,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25619,9 +26355,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27998,9 +28731,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "South Dakota"
 #~ msgstr "Zuid Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Eiland"
 
@@ -30220,9 +30950,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "View the selected folder"
 #~ msgstr "Toon de geselecteerde map"
 
-#~ msgid "_Copy..."
-#~ msgstr "Kopiëren..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Mappenbalk"
 
@@ -30232,27 +30959,18 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Ga naar map..."
 
-#~ msgid "_Move..."
-#~ msgstr "Verplaatsen..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Nieuwe map"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Map van andere gebruiker verwijderen"
 
-#~ msgid "_Rename..."
-#~ msgstr "He_rnoemen..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Snelkoppelingsbalk"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Snelkoppeling..."
 
-#~ msgid "Information"
-#~ msgstr "Informatie"
-
 #~ msgid "Error"
 #~ msgstr "Fout"
 
diff --git a/po/nn.po b/po/nn.po
index f9f8505a50..78100a872b 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-29 11:57+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -24,16 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution adressebok"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontaktar: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution alarm"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -58,35 +48,253 @@ msgstr "kort"
 msgid " card"
 msgstr "kort"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktar: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution alarm"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Oppføringen kan ikkje sendast!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Kunne ikkje laga katalog\n"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Klarte ikkje å lasta adressebok"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategoriredigering ikkje tilgjengeleg."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Lagra i addressebok"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Feil ved lasting av standard addressebok."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Kan ikkje prosessera spool-mappa"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Vil du lagra endringane?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Forkast"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "og ein annan kontakt."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Kunne ikkje motta fil"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Feil når kontakt vart lagt til"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution adressebok adressevisar"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Klarte ikkje å lasta adressebok"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
-# TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Hentar data frå LDAP-tenar anonymt"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Kan ikkje autentisera.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autofullføring"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSkriv inn passord for %s (brukar %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Set opp autofullføring her"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime-sertifikatstyring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution oppsettkontroll for mappeinnstillingar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -119,7 +327,7 @@ msgstr "Ny kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontaktar: "
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -143,15 +351,15 @@ msgid "Migrating `%s':"
 msgstr "Overfører «%s»:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "På denne datamaskina"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -160,19 +368,19 @@ msgid "Personal"
 msgstr "Personleg"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "På LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Autofullføringsinnstillingar"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -184,7 +392,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -196,7 +404,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -208,7 +416,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -220,38 +428,48 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresseboka «%s» vil verta fjerna. Er du sikker på at du vil halda fram?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
+# TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Hentar data frå LDAP-tenar anonymt"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Kan ikkje autentisera.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSkriv inn passord for %s (brukar %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -272,61 +490,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresse til mappa som vart sist brukt i vel namn-dialogen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Set opp autofullføring her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime-sertifikatstyring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution oppsettkontroll for mappeinnstillingar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -334,7 +497,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -343,8 +506,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -370,6 +532,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentisering"
@@ -419,13 +582,11 @@ msgid "Anonymously"
 msgstr "Anonymt"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Enkel"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljar"
 
@@ -684,33 +845,26 @@ msgid "cards"
 msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutt"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Vel kontaktar frå adresseboka"
+#: 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:208
+msgid "Remove All"
+msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -725,7 +879,7 @@ msgid "Send HTML Mail?"
 msgstr "Send e-post i HTML-format?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Legg til kontakter"
 
@@ -733,15 +887,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Kjelde"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Vel kontaktar frå adresseboka"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -763,6 +924,11 @@ msgstr "K_ategori:"
 msgid "_Find"
 msgstr "_Finn"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Søk"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -808,9 +974,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Skal vera ferdig:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -835,7 +1000,6 @@ msgid "Birthday:"
 msgstr "_Fødselsdag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
@@ -850,15 +1014,15 @@ msgid "Company:"
 msgstr "Kommando:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -967,8 +1131,8 @@ msgstr "_Nettsideaddresse:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -990,44 +1154,28 @@ msgid "_File under:"
 msgstr "Filnamn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_kvar"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"sletta desse kontaktane?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-" slette denne kontakta?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Kan redigerast"
 
@@ -2008,135 +2156,127 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+# TRN: «Send» betre enn «post»?
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Teneste"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 #, fuzzy
-msgid "GroupWise"
-msgstr "Gruppe"
+msgid "Location"
+msgstr "Plassering"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Brukarnamn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Anna"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Gruppe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Endra"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten høyrer til desse kategoriane:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Slett dei valde kontaktane"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Datoen dette skal skje igjen er ikkje gyldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d kontaktar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-# TRN: «Send» betre enn «post»?
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Teneste"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Plassering"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Brukarnamn"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ny kontakt - raskt"
@@ -2154,6 +2294,22 @@ msgstr "_Fullt namn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"sletta desse kontaktane?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+" slette denne kontakta?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2279,48 +2435,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Vel kontaktar frå adresseboka"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Medlemar"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Fjern det valte programmet frå lista"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Vald"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Gøym adresser når du sender e-post til denne lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Listenamn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv ei e-post-adresse eller dra ein kontakt til lista under:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Er ny liste"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Deltakarar som må vera med"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Lagra liste som VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Endra kontakt:"
@@ -2359,430 +2536,11 @@ msgstr ""
 "alt i denne mappa. Vil du leggja han til likevel?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Listemedlemmar"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisasjon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Skildring"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Gruppe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Bil-telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Arbeid"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Vevlogg"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Personleg"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Merknad"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Jobbtittel:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Heimeside"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Vellukka"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Fråkopla lager"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adresseboka finst ikkje"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Ny kontaktliste"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Nekta tilgang"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Fann ikkje kontakt"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Kontakt-ID finst frå før"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokollen er ikkje støtta"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Avbroten"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Klarte ikkje opna kjelde"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Autentisering feila"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Treng autentisering"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS er ikkje tilgjengeleg"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Ingen slik melding"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Anna feil"
-
-# TRN. «Aksessera». Blæ.
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Kan ikkje opna denne adresseboka. Sjå etter at stien finst og at du har "
-"løyve til å aksessera han."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
-"ugyldig adresse, eller at LDAP-tenaren ikkje kan nåast."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Denne versjonen av Evolution er ikkje kompilert med LDAP-støtte. Dersom du "
-"ynsjer å bruka LDAP i Evolution, må du kompilera programmet frå kjeldekoden "
-"i CVS etter at du har henta OpenLDAP frå lenkja under."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
-"ugyldig adresse, eller at tenaren ikkje kan nåast."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Det var fleire treff på dette søket enn tenaren er satt opp\n"
-"til å returnera, eller fleire treff enn Evolution er satt opp\n"
-"til å visa. Gjer søket ditt meir spesifikt eller hev\n"
-"resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Dette søket tok lengre tid å utføra enn tenaren tillet eller tidsgrensa\n"
-"du har satt for denne adresseboka. Gjer søket ditt meir presist eller\n"
-"auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
-"for denne adresseboka."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Feil ved tillegging av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Feil når kontakt vart lagt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Feil ved endring av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Feil ved endring av kontakt"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Feil ved fjerning av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Feil ved fjerning av kontakt"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Å opna %d kontaktar vil også opna %d nye vindauge på skjermen.\n"
-"Vil du verkeleg visa alle desse kontaktane?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s eksisterar allereide\n"
-"Vil du skrive over?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Skriv over"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Flytt kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Kopiér kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Flytt kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Kopiér kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Vel kontaktar frå adresseboka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Fleire VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(ingen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primær e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vel ei handling"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Lag ny kontakt «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Legg til addresser for eksisterande kontakt «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Spør adresseboka ..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Rediger kontaktinformasjon"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Flett e-postadresser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "og ein annan kontakt."
-msgstr[1] "og ein annan kontakt."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Vis fullt VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Vis kompakt VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Lagra i addressebok"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ingen kontaktar"
@@ -2796,9 +2554,9 @@ msgstr[1] "%d kontaktar"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Spør"
 
@@ -2814,134 +2572,134 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Lagra som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Gå til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importér ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressebokkjelder ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot-innstillingar ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Aktiv vising"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Einkvar kategori"
@@ -2975,6 +2733,8 @@ msgid "Car Phone"
 msgstr "Bil-telefon"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategoriar"
 
@@ -2982,6 +2742,21 @@ msgstr "Kategoriar"
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-post 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Etternamn"
@@ -3018,14 +2793,29 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Sjef"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenamn"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Merknad"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisasjon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alternativ faks"
@@ -3078,29 +2868,21 @@ msgstr "Eining"
 msgid "Web Site"
 msgstr "Nettstad"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Breidd"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Høgd"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Har fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Vald"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
@@ -3117,7 +2899,11 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Største lengd på feltnamn"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebreidd"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3131,7 +2917,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å laga ein ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3141,13 +2927,399 @@ msgstr ""
 "\n"
 "Det er ingen oppføringar i denne visinga."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebreidd"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Vald"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Listemedlemmar"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Skildring"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Bil-telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Arbeid"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Vevlogg"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Personleg"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Jobbtittel:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Heimeside"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Vellukka"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Fråkopla lager"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Adresseboka finst ikkje"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Ny kontaktliste"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Nekta tilgang"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Fann ikkje kontakt"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Kontakt-ID finst frå før"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokollen er ikkje støtta"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Avbroten"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Klarte ikkje opna kjelde"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autentisering feila"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Treng autentisering"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS er ikkje tilgjengeleg"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Ingen slik melding"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Anna feil"
+
+# TRN. «Aksessera». Blæ.
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Kan ikkje opna denne adresseboka. Sjå etter at stien finst og at du har "
+"løyve til å aksessera han."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
+"ugyldig adresse, eller at LDAP-tenaren ikkje kan nåast."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Denne versjonen av Evolution er ikkje kompilert med LDAP-støtte. Dersom du "
+"ynsjer å bruka LDAP i Evolution, må du kompilera programmet frå kjeldekoden "
+"i CVS etter at du har henta OpenLDAP frå lenkja under."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
+"ugyldig adresse, eller at tenaren ikkje kan nåast."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Det var fleire treff på dette søket enn tenaren er satt opp\n"
+"til å returnera, eller fleire treff enn Evolution er satt opp\n"
+"til å visa. Gjer søket ditt meir spesifikt eller hev\n"
+"resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Dette søket tok lengre tid å utføra enn tenaren tillet eller tidsgrensa\n"
+"du har satt for denne adresseboka. Gjer søket ditt meir presist eller\n"
+"auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
+"for denne adresseboka."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Feil ved tillegging av liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Feil når kontakt vart lagt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Feil ved endring av liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Feil ved endring av kontakt"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Feil ved fjerning av liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Feil ved fjerning av kontakt"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Å opna %d kontaktar vil også opna %d nye vindauge på skjermen.\n"
+"Vil du verkeleg visa alle desse kontaktane?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s eksisterar allereide\n"
+"Vil du skrive over?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Skriv over"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Flytt kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Kopiér kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Flytt kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Kopiér kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Vel kontaktar frå adresseboka"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Fleire VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(ingen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Primær e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Vel ei handling"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Lag ny kontakt «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Legg til addresser for eksisterande kontakt «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Spør adresseboka ..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Rediger kontaktinformasjon"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Flett e-postadresser"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "og ein annan kontakt."
+msgstr[1] "og ein annan kontakt."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Vis fullt VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Vis kompakt VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Lagra i addressebok"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3194,6 +3366,11 @@ msgstr "Evolution vCalendar-import"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Skriv ut konvolutt"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Skriv ut kontaktar"
@@ -3203,11 +3380,6 @@ msgstr "Skriv ut kontaktar"
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Skriv ut konvolutt"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3392,6 +3564,22 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Kan ikkje opna fil"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Klarte ikkje å lasta adressebok"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ikkje i stand å opna adresseboka"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Spesifiser utfil som skal brukast i staden for standard ut."
@@ -3448,22 +3636,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Kan ikkje opna fil"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Klarte ikkje å lasta adressebok"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ikkje i stand å opna adresseboka"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil ved lasting av standard addressebok."
@@ -3480,39 +3652,365 @@ msgstr "Filnamn ikkje oppgjeve."
 msgid "Unnamed List"
 msgstr "Liste utan namn"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ikkje slett"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Send til:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Er du sikker på at du vil sletta og avlysa dette møtet?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Er du sikker på at du vil sletta %d oppgåver?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Er du sikker på at du vil sletta %d journaloppføringar?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Er du sikker på at du vil sletta %d avtalar?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Avtale"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Vil du lagra endringane?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Forkast endringar"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lagra melding ..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar-import"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Skriv inn passord"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendingar som går over fleire dagar:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Klarte ikkje å starte wombat-tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Klarte ikkje å starte wombat."
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kan ikkje lesa kalender-applikasjonsblokka på kalenderen"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Standard prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa applikasjonsblokka for hugseliste i piloten"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalenderar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Oppsettkontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender-/oppgåve-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalenderkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution oppgåvekomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalenderar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalender alarmpåminningsteneste"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Startar:"
@@ -3612,11 +4110,6 @@ 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
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmpåminningsteneste"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kan ikkje initialisera Bonobo"
@@ -3757,9 +4250,30 @@ msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timars"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om vekenummer skal visast i minikalenderen"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Samandrag inneheld"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Skildring inneheld"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Merknad inneheld"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Skildring inneheld"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ikkje truffe"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3780,8 +4294,8 @@ msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dagar"
 
@@ -3792,7 +4306,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%d. %a %b"
@@ -3842,62 +4356,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalenderar"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Avtale for heile _dagen"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alender"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalender"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Lag ein ny kalender"
 
@@ -3927,27 +4431,6 @@ msgstr "Vekesvising"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Samandrag inneheld"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Skildring inneheld"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Merknad inneheld"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Skildring inneheld"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Ikkje truffe"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Feil under opning av kalenderen"
@@ -3965,224 +4448,133 @@ msgstr "Nekta tilgang til å opna kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Val for lydlarm"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Eigenskapar meldingsalarm"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Alternativ for e-postalam"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Alternativ for program-alarmar"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Alternativ for ukjente alarmar"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarmgjentaking"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Melding å visa:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Melding som skal sendast"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Spel lyd:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repeter alarmen"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Køyr program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Send til:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Skal vera ferdig:</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Med desse argumenta:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "   Alternativ for oppgåveliste</b>                <b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Skal vera ferdig:</b>"
 
-# TRN: Bør ha ulik tekst for minutt og for time.
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "gongar kvar(t)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "timar"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Skriv ei melding"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Le_gg til"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Enkel"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Dato/tid:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Meldingar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Spel ein lyd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Påminningar"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Køyr eit program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send til:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Send ein e-post"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Samandrag:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Konto:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Køyr program:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repeter alarmen"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Val ..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Send"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "slutt på avtale"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+# TRN: Bør ha ulik tekst for minutt og for time.
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "gongar kvar(t)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "time/timar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "timar"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutt"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Du må oppgje ei adresse å henta kalenderen frå."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kjeldeadressa «%s» er ikkje velforma."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Kjelda «%s» er ikkje ei webcal-kjelde."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Kjelde med namnet «%s» finst frå før i den valde gruppa"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "Gruppa «%s» er ekstern. Du må oppgje ei adresse å henta kalenderen frå"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Oppgåvelistegruppe"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "F_argar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Vel ein farge"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Ny gruppe ..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Oppdater"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Le_gg til"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "veker"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmar"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4298,7 +4690,7 @@ msgid "Free/Busy Publishing"
 msgstr "_offentleggjering av ledig/oppteken-tid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Fredag"
@@ -4312,7 +4704,7 @@ msgid "Minutes"
 msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Måndag"
@@ -4322,7 +4714,7 @@ msgid "S_un"
 msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laurdag"
@@ -4336,7 +4728,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Søndag"
@@ -4350,7 +4742,7 @@ msgid "T_hu"
 msgstr "T_or"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torsdag"
@@ -4364,7 +4756,7 @@ msgid "Time format:"
 msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tysdag"
@@ -4374,7 +4766,7 @@ msgid "W_eek starts:"
 msgstr "_Veka byrjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Onsdag"
@@ -4407,7 +4799,8 @@ msgstr "_Komprimer helger i månadsvising"
 msgid "_Day begins:"
 msgstr "_Dagen byrjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4457,6 +4850,80 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Du må oppgje ei adresse å henta kalenderen frå."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kjeldeadressa «%s» er ikkje velforma."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Kjelda «%s» er ikkje ei webcal-kjelde."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Kjelde med namnet «%s» finst frå før i den valde gruppa"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "Gruppa «%s» er ekstern. Du må oppgje ei adresse å henta kalenderen frå"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Legg til ny kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Oppgåvelistegruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "F_argar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Vel ein farge"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Legg til ny kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Ny gruppe ..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Oppdater"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "veker"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
@@ -4504,81 +4971,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Ferdig"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Ferdig"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Lagra som ..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Kan ikkje bruka noverande versjon!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfeil: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Ferdig"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Ferdig"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Klarte ikkje opna kjelde"
@@ -4640,8 +5101,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein feil"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adressebok ..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakter"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4651,161 +5113,222 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Påminning"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Retning"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Forfallsdato er før startdato"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Sluttdato er feil"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Starttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Sluttid er feil"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Kan ikkje opna kalenderen «%s»."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "før kvar avtale"
+msgstr[1] "før kvar avtale"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "slutt på avtale"
+msgstr[1] "slutt på avtale"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "før kvar avtale"
+msgstr[1] "før kvar avtale"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Varer heile _dagen"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "før kvar avtale"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Oppteke"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "før kvar avtale"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriar ..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "før kvar avtale"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "   Alternativ for oppgåveliste</b>                <b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klassifisering"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Skal vera ferdig:</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Ko_nfidensiell"
+msgid "A_ll day event"
+msgstr "Varer heile _dagen"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Dato og tid"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Lagra tilpassa framvising ..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Ledig"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegoriar ..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr ""
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalender:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klassifisering"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Offentleg"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Konfidensiell"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Vis tid som"
+msgid "L_ocation:"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Offentleg"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Vis tid som"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Sa_mandrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmar"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Skildring:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Slutt-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Den valde organisatoren har ikkje konto lenger."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Det må vera ein organisator."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Slett"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Fje_rn"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4844,35 +5367,45 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Legg _til deltakar"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Skal vera ferdig:</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "_Legg til avsendar i adresseboka"
+msgid "<b>Organizer</b>"
+msgstr "<b>Skal vera ferdig:</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Endre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organisator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakter"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Endre organisator"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organisator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4940,150 +5473,144 @@ msgstr "Denne og framtidige instansar"
 msgid "All Instances"
 msgstr "Alle instansane"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen skal gjenta seg på ein måte som Evolution ikkje kan redigera."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Datoen dette skal skje igjen er ikkje gyldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "fyrste"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "siste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Annan dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Dato/klokkeslett"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Kvar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Unntak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Førehandsvising"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Regel for gjentaking"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Sjølvvald repetering"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Endre"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Inga repetering"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Repetering"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Fje_rn"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Kvar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Enkel repetering"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "R_edigér avtale"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "for alltid"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "månad(er)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "inntil"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "veke(r)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Vel målkjelde"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Målet er skrivebeskytta"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Oppgåveliste"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
 
-# TRN: Må ikkje denne skrivast "\%" eller "%%"?
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Påminning ved ny e-post"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _ferdig"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Send meldingar"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -5095,8 +5622,8 @@ msgstr "Høg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
@@ -5108,22 +5635,22 @@ msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikkje starta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Framgang"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Prosent ferdig: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5147,36 +5674,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Oppgåve"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidensielt"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Påminning ved ny e-post"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Send meldingar"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Skildring:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Mappe:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5187,52 +5720,57 @@ msgstr "Sta_rt-dato:"
 msgid "_Due date:"
 msgstr "Forfalls_dato:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Gruppe:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "   Kalenderalternativ</b>                <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Dagleg"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Redigering av ledig/oppteken-informasjon"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Adresse for offentleggjering av ledig/oppteken-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Adresse for offentleggjering av ledig/oppteken-informasjon"
+msgid "Free/Busy Editor"
+msgstr "Redigering av ledig/oppteken-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Påloggingsnamn:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Dagleg"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Passord:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_E-post:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Passord:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Hugs dette passordet"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Br_ukarnamn:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Kvar veke"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5314,7 +5852,7 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjent utløysartype"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å opna %s"
@@ -5323,6 +5861,11 @@ msgstr "Klikk for å opna %s"
 msgid "Untitled"
 msgstr "Utan tittel"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Samandrag:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5334,7 +5877,7 @@ msgstr "Forfallsdato:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Status:"
 
@@ -5347,20 +5890,94 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "_Nettsideaddresse:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Offentleg"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Dato"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privat"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Start-dato"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Konfidensiell"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Samandrag"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Oppteke"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske posisjonen må skrivast inn på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nei"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Repeterande"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Tildelt"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5406,95 +6023,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Oppteke"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Opna"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_kriv ut"
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Tildel oppgåve"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "Send _vidare som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Merk som komplett"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valde oppgåver som ferdige"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Slett"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Slett _den valde oppgåver"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Lagra som ..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
@@ -5503,182 +6126,112 @@ msgstr "Trykk her for å leggje til ei oppgåve"
 msgid "% Complete"
 msgstr "prosent ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Fullføringsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Forfallsdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Start-dato"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Samandrag"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Flyttar meldingar"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopierer meldingar"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vel _tråd"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Vel ..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopier til mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Innstillingar ..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Dato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Start-dato"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukjend"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Repeterande"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nei"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske posisjonen må skrivast inn på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5703,36 +6256,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutt oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutt oppdeling"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5799,37 +6352,35 @@ msgid ", ending on "
 msgstr ", sluttar på"
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Byrjar:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Sluttar:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Status"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Fullført:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Skal vera ferdig:</b>"
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Ferdig"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5837,311 +6388,291 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ingen</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 #, fuzzy
 msgid "Location:"
 msgstr "Plassering:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> bar publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 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:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-msgid "Object could not be found\n"
-msgstr "Fann ikkje objekt.\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
@@ -6170,6 +6701,10 @@ msgstr "Lastar kalender"
 msgid "Loading calendar..."
 msgstr "Lastar melding ..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organisator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Tenarmelding:"
@@ -6186,11 +6721,6 @@ msgstr "start-dato"
 msgid "Chair Persons"
 msgstr "Møteleiarar"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Deltakarar som må vera med"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
@@ -6258,6 +6788,28 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under prossering"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute av kontoret"
@@ -6266,98 +6818,64 @@ msgstr "Ute av kontoret"
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "_Legg til avsendar i adresseboka"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Val"
+msgid "O_ptions"
+msgstr "Val"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Vis kun _arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoplukk"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Påkravde deltakarar"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Påkravde folk _og ein ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Tida møtet _startar:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Møt_e slutttid:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Skriv inn passordet for %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6366,116 +6884,51 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Lastar oppgåver"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Feil under opning av %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Lastar oppgåver"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Oppgåver"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Oppdaterar objekt"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Tømmer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Oppsettkontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender-/oppgåve-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalenderkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution oppgåvekomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalenderar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgåver"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6815,10 +7268,6 @@ msgstr "Vald månad (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vald år (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Oppgåve"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6849,7 +7298,7 @@ msgid "Contacts: "
 msgstr "Kontaktar: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
@@ -6877,7 +7326,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d kontaktar"
 msgstr[1] "%d kontaktar"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6898,35 +7347,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Oppgåvelistegruppe"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opprett ei ny oppgåve"
@@ -8602,69 +9045,69 @@ msgstr "Gjer mappa «%s» klar for fråkopla bruk"
 msgid "You must be working online to complete this operation"
 msgstr "Du må vera tilkopla for å fullføra denne handlinga"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ugyldig meldingsstraum motteken frå %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Synkroniserar mapper"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under køyring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Kan ikkje prosessera spool-mappa"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Hentar melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Kan ikkje opna melding"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feila på melding %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Synkroniser mapper"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Hentar melding %d av %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feila på melding %d av %d"
@@ -8687,42 +9130,6 @@ msgstr "Ugyldige argument til (brukar-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under køyring av filtersøk: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Ikkje støtta operasjon: søk etter uttrykk: etter %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Ikkje støtta operasjon: søk etter UID: etter %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Flyttar meldingar"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopierer meldingar"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Åtvaring"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrerer nye meldingar"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8766,7 +9173,43 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Ikkje støtta operasjon: søk etter uttrykk: etter %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Ikkje støtta operasjon: søk etter UID: etter %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Flyttar meldingar"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopierer meldingar"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Åtvaring"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrerer nye meldingar"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8777,44 +9220,44 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar frå GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
 # TRN: Denne bør skrivast om.
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8826,83 +9269,63 @@ msgstr ""
 "%s"
 
 # TRN: Sjå førre.
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Kan ikkje køyra gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Feil under køyring av gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Kan ikkje stadfesta signaturen på meldinga: Feil format på meldinga"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Klarte ikkje å laga krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Kryptert innhald"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikkje motta fil"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kan ikkje laga låsfil for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8924,6 +9347,26 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Kan ikkje låsa «%s»"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Kan ikkje laga låsfil for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9161,7 +9604,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9244,55 +9687,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URLen «%s» treng ein bruknamn-komponent"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Slår opp: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i namneoppslag: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Namneoppslag feila: Kan ikkje laga tråd: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Slår opp addresse"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Namneoppslag feila: vert ikkje funnen"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Namneoppslag feila: ukjend grunn"
 
@@ -9368,7 +9811,7 @@ msgstr "_Sertifikat-ID:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Kan ikkje låsa mappa «%s»: %s"
@@ -9463,7 +9906,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Legg til kriterium"
 
 #: camel/camel-smime-context.c:651
@@ -9478,48 +9921,47 @@ msgstr "IMAP-kommando feila: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "_Lag regel frå melding"
+msgid "Cannot create CMS Message"
+msgstr "Kan ikkje opna melding"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Kan ikkje opna melding"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Kan ikkje leggja ved fila «%s»: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Kan ikkje leggja ved fila «%s»: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Kan ikkje opna melding"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Kan ikkje låsa mappa «%s»: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9566,7 +10008,8 @@ msgstr "Kan ikkje laga mappa: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
@@ -9575,8 +10018,8 @@ msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juni"
@@ -9700,7 +10143,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9709,11 +10152,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -9737,7 +10180,7 @@ msgstr ""
 "Vil du akseptera likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9752,35 +10195,35 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
@@ -9805,7 +10248,7 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
@@ -9826,8 +10269,8 @@ msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Sjå etter ny e-post i alle mappene"
 
@@ -9861,8 +10304,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9882,323 +10325,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "liste"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Uventa svar frå IMAP-tenaren: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kan ikkje henta mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kan ikkje henta mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Kan ikkje laga mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kan ikkje henta mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kan ikkje henta mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abbonerte mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namnerom"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For lesing og lagring av e-post på IMAP-tenarar."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Dette valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-tenar %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-teneste for %s på %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Klarte ikkje å kople til %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS er ikkje tilgjengeleg"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilknytning avbroten"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Ukjend feil"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Kan ikkje kopla til POP-tenaren %s: Den etterpsurde autentiseringsmetoden er "
-"ikkje støtta."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sSkriv inn SMTP-passordet for %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Kan ikkje henta mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%c»"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kan ikkje laga mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Kommando:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kan ikkje laga mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Kan ikkje laga mappa: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Uventa svar frå IMAP-tenaren: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Ingen data gjevne"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ukjend feil"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10267,7 +10415,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10342,6 +10490,27 @@ msgstr "Klarte ikkje å kople til LDAP-tenar"
 msgid "Command:"
 msgstr "Kommando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Vis kun abbonerte mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Namnerom"
+
 #: 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"
@@ -10364,43 +10533,93 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-tenar %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-teneste for %s på %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Klarte ikkje å kople til %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS er ikkje tilgjengeleg"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilknytning avbroten"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidinga er ikkje støtta."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kan ikkje kopla til med kommandoen «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tenaren %s søttar ikkje den ønska autentiseringstypa %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentiseringstype %s er ikkje støtta"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSkriv inn IMAP-passordet for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10410,30 +10629,281 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappa «%s» finst ikkje"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%c»"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Foreldermappa kan ikkje ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend opphavsmappe: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventa svar frå IMAP-tenaren: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Uventa svar frå IMAP-tenaren: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For lesing og lagring av e-post på IMAP-tenarar."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dette valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kan ikkje kopla til POP-tenaren %s: Den etterpsurde autentiseringsmetoden er "
+"ikkje støtta."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSkriv inn SMTP-passordet for %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Kommando:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventa svar frå IMAP-tenaren: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Ingen data gjevne"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr ""
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10604,18 +11074,26 @@ msgstr "Kan ikkje lagra samandrag: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kan ikkje leggja til melding i samandraget. Årsaken er ukjend."
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Innboks"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Operasjonen å leggja til ei melding i ei maildir vart avbroten"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikkje leggja til melding i maildir-mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10631,48 +11109,48 @@ msgstr ""
 "Kan ikkje henta melding: %s frå mappa «%s»\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhald"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Kan ikkje henta mappa: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mappa «%s» eksisterar ikkje."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "«%s» er ikkje ein maildir-katalog."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kan ikkje sletta mappa «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ikkje ein maildir-katalog"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11262,20 +11740,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Kan ikkje kopla til POP-tenaren %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kan ikkje kopla til POP-tenaren %s på ein sikker måte: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kan ikkje kopla til POP-tenaren %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11284,28 +11767,28 @@ msgstr ""
 "Kan ikkje kopla til POP-tenaren %s: Den etterpsurde autentiseringsmetoden er "
 "ikkje støtta."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL «%s»-innlogging feila for POP-tenaren «%s»: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sSkriv inn POP-passordet for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11314,7 +11797,16 @@ msgstr ""
 "Kan ikkje kopla til POP-tenaren «%s».\n"
 "Feil ved sending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Kan ikkje kopla til POP-tenaren «%s».\n"
+"Feil ved sending av passord: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
@@ -11531,101 +12023,101 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tenar %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 #, fuzzy
 msgid "Sending message"
 msgstr "Sen melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Meldinga har ingen sendar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Møte"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentisering:"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Tidsavbrot for «RCPT TO»-førespurnad: %s: meldinga vart ikkje sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Tidsavbrot for DATA-førespurnad: %s: meldinga vart ikkje sendt."
@@ -11633,28 +12125,28 @@ msgstr "Tidsavbrot for DATA-førespurnad: %s: meldinga vart ikkje sendt."
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP-kommando feila: %s"
@@ -11722,93 +12214,6 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Kan ikkje opna fil"
-
-#: composer/e-msg-composer.c:1291
-#, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikkje motta fil"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Fleire meldingar"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Opna fil"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-#, fuzzy
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Skriv ei melding"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr "Kan ikkje laga nytt vindauge.\n"
-
-#: composer/e-msg-composer.c:3279
-#, 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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -11894,17 +12299,90 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Attach file(s)"
 msgstr "Legg ved fil"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kan ikkje opna fil"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikkje motta fil"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Fleire meldingar"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Opna fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Skriv ei melding"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Vidaresendt melding - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Kunne ikkje lagra melding(ar)."
+msgstr[1] "Kunne ikkje lagra melding(ar)."
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11922,54 +12400,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Kan ikkje laga røyr: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Neste _ulesne melding"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Vil du lagra endringane?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ikkje fjern"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Fjern"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kan ikkje lagra signaturfil: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Feil ved lagring av snavegar."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Åtvaring: Melding er endra"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11977,60 +12469,70 @@ msgid ""
 msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Forkast endringar"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Lagra melding ..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Kan ikkje laga røyr: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Kan ikkje lagra signaturfil: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Kan ikkje laga røyr: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr "Kan ikkje laga nytt vindauge.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12332,11 +12834,6 @@ msgstr "%d. %a %b %Y"
 msgid "Select a time to compare against"
 msgstr "Vel ei biletefil"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Filter-reglar"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12367,20 +12864,8 @@ msgstr "Stilnamn:"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Fjernar mappe %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "Stilnamn:"
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12388,158 +12873,38 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Tildeling"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Du gi dette filteret eit namn."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Du må gje denne mappa eit namn."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Ingen tenar har vorte vald"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 #, fuzzy
 msgid "Choose a file"
 msgstr "Vel ei handling:"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Skal vera ferdig:</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Vel mappe"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Filter-reglar"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "vMappe-kjelder"
-
-#: filter/filter.glade.h:4
-#, fuzzy
-msgid "Compare against"
-msgstr "Kompilatoråtvaringar"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Innkomande"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:13
-#, fuzzy
-msgid "a time relative to the current time"
-msgstr "Vis hendingane for denne dagen"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "sidan"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "månader"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekund"
-
-#: filter/filter.glade.h:20
-#, fuzzy
-msgid "specific folders only"
-msgstr "Den oppgitte fila finst ikkje"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "tid no"
-
-#: filter/filter.glade.h:22
-#, fuzzy
-msgid "the time you specify"
-msgstr "ei tid du spesifiserar"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr ""
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "år"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Viktig"
 
@@ -12609,6 +12974,68 @@ msgstr "inkomande"
 msgid "outgoing"
 msgstr "Utgåande"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filter-reglar"
+
+#: filter/filter.glade.h:2
+#, fuzzy
+msgid "Compare against"
+msgstr "Kompilatoråtvaringar"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Innkomande"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+#, fuzzy
+msgid "a time relative to the current time"
+msgstr "Vis hendingane for denne dagen"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "sidan"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "månader"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekund"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "tid no"
+
+#: filter/filter.glade.h:19
+#, fuzzy
+msgid "the time you specify"
+msgstr "ei tid du spesifiserar"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "år"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Legg til regel"
@@ -12621,60 +13048,70 @@ msgstr "Rediger regel"
 msgid "Rule name"
 msgstr "Regelnamn"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Poengreglar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Poengsum"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Redigerarinstillingar"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Kropp inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Kropp inneheld ikkje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Kropp eller emne inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Set opp e-postkontoar"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Meldinga inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Mottakar inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution oppsettkontroll for e-postkontoar"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Avsendar inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Emne inneheld"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigerar"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Emne inneheld ikkje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution oppsettkontroll for e-postredigerar"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtuelle mapper"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-postinnstillingskontroll"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Legg til"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "E-post"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "vMappe-kjelde"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "E-postinnstillingar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_E-post:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12709,51 +13146,323 @@ msgstr "_HTML-signatur:"
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Filter-reglar"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Vel mappe"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
+msgid "Adjust Score"
+msgstr "Juster poeng"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Tildel farge"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Tildel farge"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Vedlegg"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Pipelyd"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "inneheld"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopier til mappe"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Dato motteke"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Dato sendt"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Sletta"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "inneheld ikkje"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "sluttar ikkje med"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "finst ikkje"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "finst ikkje"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "høyres ikkje ut som"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "startar ikkje med"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Eksisterar ikkje"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Kladd"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "sluttar med"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Eksisterar"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "eksisterar"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Uttrykk"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "_Følg opp ..."
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Liste"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "var etter"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "var før"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "er flagga"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "er større enn"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "er mindre enn"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "er ikkje"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "er ikkje flagga"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Juni"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etikett"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "E-postliste"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Meldingskropp"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Meldingshovud"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Meldingar"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Marker som v_iktig"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Avslutt programmet"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Spel lyd:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lesen"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Mottakarar"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Treff på regulært uttrykk"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Svart til"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "returnerer"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "returnerer større enn"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "returnerer mindre enn"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Køyr program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Poengsum"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Avsendar"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Sett status"
+
+# TRN: Det skal ikkje vera KiB?
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Storleik (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "høyres ut som"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Avsendarkonto"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Spesifikk linje i hovud"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "byrjar med"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Stopp prosessering"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Emne"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Nullstill status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Skal vera ferdig:</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe frå søk ..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
-msgstr "Eigenskapar"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+msgid "Folder Properties"
 msgstr "Eigenskapar"
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "_Mappenamn:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Lagra melding"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Lagra melding"
+msgstr[1] "Lagra melding"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Neste _ulesne melding"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Neste _ulesne melding"
+msgstr[1] "Neste _ulesne melding"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12763,416 +13472,435 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Create New Folder"
 msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "vMapper"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Lastar ..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Berre sjekk for ny e-post."
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Avbryt oppgåve"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopier"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visning"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Kopier"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Flytt"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ny mappe"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Gje nytt namn"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ei_genskapar ..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "vMapper"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Innboks"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Lastar ..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "E-post"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Eigenskapar"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etikett"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 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:935
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filter-reglar"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Forvald"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Frå"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Treff:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Svar-til"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Legg til kriterium"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc:"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Emne"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Legg til kriterium"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s vedlegg"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikkje senda meldinga: %s"
+msgid "Unencrypted"
+msgstr "Avbroten"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Ustøtta skjema"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+msgid "Encrypted"
+msgstr "Kryptert"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Hentar melding %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Tildelt"
+msgid "_View Certificate"
+msgstr "_Sertifikat-ID:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Legg til kriterium"
+msgid "This certificate is not viewable"
+msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Legg til kriterium"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+#, fuzzy
+msgid "Overdue:"
+msgstr "&Syntaksmerkingsmodusar"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Avbroten"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Vis innvevd"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Kryptert"
+msgid "_Hide"
+msgstr "_Gøym"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d av %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Hentar melding %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13209,9 +13937,35 @@ msgstr ""
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Frå"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "E-postprogram"
 
@@ -13225,105 +13979,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Treff:"
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s vedlegg"
 
-#: mail/em-format-html-display.c:654
-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.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikkje senda meldinga: %s"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Sertifikat-ID:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Denne meldinga er ikkje tilgjengeleg."
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d. %b %k:%M"
-
-#: mail/em-format-html-display.c:1015
-#, fuzzy
-msgid "Overdue:"
-msgstr "&Syntaksmerkingsmodusar"
-
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%d. %b %k:%M"
+msgid "Unsupported signature format"
+msgstr "Ustøtta skjema"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Vis innvevd"
+msgid "Error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "_Gøym"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d av %d"
+msgid "Unknown error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13440,7 +14136,7 @@ msgstr "Sender ei melding til ein nettverksspelar"
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
@@ -13455,7 +14151,7 @@ msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mappe"
 
@@ -13491,11 +14187,24 @@ msgid "Add address"
 msgstr "Adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Melding frå %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuelle mapper"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Legg til"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "vMappe-kjelde"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -13989,63 +14698,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Redigerarinstillingar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Set opp e-postkontoar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution oppsettkontroll for e-postkontoar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importerar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigerar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importerar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution oppsettkontroll for e-postredigerar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4-importerar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-postinnstillingskontroll"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importerar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-postkontoar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importerar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "E-postinnstillingar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_E-post:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14107,34 +14786,6 @@ msgstr "Importerar"
 msgid "Importing mailbox"
 msgstr "Importerer filer"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importerar"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14303,81 +14954,86 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Sletta"
+msgid_plural "%d deleted"
+msgstr[0] "Sletta"
+msgstr[1] "Sletta"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d dagar"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d dagar"
+msgstr[1] "%d dagar"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d sekund"
+msgid_plural "%d sent"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekund"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d sekund"
+msgid_plural "%d unsent"
+msgstr[0] "%d sekund"
+msgstr[1] "%d sekund"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "%d kontaktar"
+msgid_plural "%d total"
+msgstr[0] "%d kontaktar"
+msgstr[1] "%d kontaktar"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny vMappe"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-postfilter"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Lag ein ny kalender"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Sjekkar teneste"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-#, fuzzy
-msgid "Connecting to server..."
-msgstr " Koplar til tenar ..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
@@ -14429,16 +15085,25 @@ msgid ""
 "purposes only."
 msgstr ""
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sjekkar teneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+#, fuzzy
+msgid "Connecting to server..."
+msgstr " Koplar til tenar ..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Førehandsvising"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14703,7 +15368,7 @@ msgstr "Ikkje siter opprinneleg melding"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
@@ -15062,6 +15727,123 @@ msgstr "farge"
 msgid "description"
 msgstr "skildring"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vMappe-kjelder"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Akseptert"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Ferdig"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Skil mellom store og små bokstavar"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Finn i melding"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Finn:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Handsam abonnement"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Valde:"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "_kvar"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Tryggleiksinformasjon"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "E-postkontoar"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Ferdig"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Flag:"
+msgstr "_Flagg:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Abbonér"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Fjern abbonnment"
+
+#: mail/mail-dialogs.glade.h:30
+#, fuzzy
+msgid "specific folders only"
+msgstr "Den oppgitte fila finst ikkje"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr ""
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15271,14 +16053,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15381,8 +16155,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Kan ikkje flytta mappe: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15433,8 +16208,9 @@ msgstr "Klarte ikkje opna kjelde"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "og ein annan kontakt."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15463,8 +16239,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ikkje slett"
+msgstr "_Angra slett"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15509,8 +16286,9 @@ msgstr ""
 "Vil du leggja til fleire trekk?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Forkast endringar"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -15527,8 +16305,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Kan ikkje sletta mappa:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15562,13 +16343,45 @@ msgid ""
 "And have been updated."
 msgstr " s."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Fjernar mappe %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "Stilnamn:"
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Du må gje denne mappa eit namn."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ingen tenar har vorte vald"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15576,16 +16389,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Skriv over"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Send"
@@ -15746,7 +16559,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15755,46 +16568,21 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Skil mellom store og små bokstavar"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Finn i melding"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Finn:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Tryggleiksinformasjon"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Avbryt ..."
@@ -15831,25 +16619,25 @@ msgstr "Oppdaterar ..."
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15907,15 +16695,15 @@ msgstr "Lagrar mappe «%s»"
 msgid "Updating vFolders for '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
@@ -15979,7 +16767,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -16041,10 +16829,6 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lesen"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
@@ -16058,53 +16842,51 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "Førehandsvising"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneheld"
 
-#: mail/message-tags.glade.h:2
-#, fuzzy
-msgid "C_ompleted"
-msgstr "Ferdig"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneheld ikkje"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneheld"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Ferdig"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Meldinga inneheld"
 
-#: mail/message-tags.glade.h:7
-#, fuzzy
-msgid "_Flag:"
-msgstr "_Flagg:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottakar inneheld"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Handsam abonnement"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Avsendar inneheld"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Valde:"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne inneheld"
 
-#: mail/subscribe-dialog.glade.h:3
-#, fuzzy
-msgid "S_erver:"
-msgstr "_kvar"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne inneheld ikkje"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Abbonér"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skal"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Fjern abbonnment"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution testkomponent"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16173,31 +16955,18 @@ msgstr ""
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d. %b"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Ukjend feil"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Ugyldige argument"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Kan ikkje registrera i OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktive tilkoplingar"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Oppsettsdatabasen ikkje funnen"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktive tilkoplingar"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generell feil"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klikk OK for å late att desse tilknytningane og for å kople av"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16387,28 +17156,6 @@ msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution held på å kopla frå."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "E-post til %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16427,114 +17174,92 @@ msgstr "Bug Buddy er ikkje installert."
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Gruppe"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Avkryssingsboks"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Ny"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Ny oppgåve"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "_Test"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Opprett ei ny oppgåve"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution held på å kopla frå."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktive tilkoplingar"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktive tilkoplingar"
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klikk OK for å late att desse tilknytningane og for å kople av"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post til %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alender:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d. %b"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontaktar: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_E-post:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Oppgåver:"
+msgid "Uknown system error."
+msgstr "Ukjend feil"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Mappe_type:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Ugyldige argument"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Opna annan brukar si mappe"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Kan ikkje registrera i OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Konto:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Mappenamn:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generell feil"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "Br_ukar:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Ny"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution oppsettassistent"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidssone"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkomen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16547,7 +17272,7 @@ msgstr ""
 "\n"
 "Klikk på «Neste» for å gå vidare. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16559,19 +17284,20 @@ msgstr ""
 "\n"
 "Trykk på «Bruk»-knappen for å lagra innstillingane dine."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skal"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Ny oppgåve"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "_Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution testkomponent"
+msgid "Create a new test item"
+msgstr "Opprett ei ny oppgåve"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16637,7 +17363,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frå desse filene:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16675,7 +17401,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16684,39 +17410,39 @@ msgstr ""
 "Takk frå\n"
 "Ximian Evolution-utviklarane\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16791,6 +17517,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17057,6 +17805,12 @@ msgstr "Dine sertifikat"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-id eksisterar allereide"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17291,12 +18045,6 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Signaturfil:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-id eksisterar allereide"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17441,8 +18189,8 @@ msgstr "Vis den valde kontakten"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlingar"
@@ -17926,16 +18674,6 @@ msgstr "_Invertér val"
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Lukk vindauge"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18385,6 +19123,16 @@ msgstr "Verk_tøy"
 msgid "_Undelete"
 msgstr "_Angra slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Lukk vindauge"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -18467,10 +19215,6 @@ msgstr "Lagra fila med eit anna namn"
 msgid "Save the message in a specified folder"
 msgstr "Lagra meldinga i spesifisert mappe"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Send"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19054,7 +19798,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19224,27 +19968,253 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ferdig)"
 
+#~ msgid "Login name:"
+#~ msgstr "Påloggingsnamn:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Lagra liste som VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Gruppe"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Klarte ikkje å starte wombat."
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alender"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Val for lydlarm"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Eigenskapar meldingsalarm"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Alternativ for e-postalam"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Alternativ for program-alarmar"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Alternativ for ukjente alarmar"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarmgjentaking"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Melding å visa:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Melding som skal sendast"
+
+#~ msgid "Play sound:"
+#~ msgstr "Spel lyd:"
+
+#~ msgid "Run program:"
+#~ msgstr "Køyr program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Med desse argumenta:"
+
+#~ msgid "Basics"
+#~ msgstr "Enkel"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Dato/tid:"
+
+#~ msgid "Reminders"
+#~ msgstr "Påminningar"
+
+#~ msgid "_Options..."
+#~ msgstr "_Val ..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adressebok ..."
+
+#~ msgid "Reminder"
+#~ msgstr "Påminning"
+
+#~ msgid "B_usy"
+#~ msgstr "_Oppteke"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Ko_nfidensiell"
+
+#~ msgid "Date & Time"
+#~ msgstr "Dato og tid"
+
+#~ msgid "F_ree"
+#~ msgstr "_Ledig"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Offentleg"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Legg _til deltakar"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "_Legg til avsendar i adresseboka"
+
+#~ msgid "Preview"
+#~ msgstr "Førehandsvising"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regel for gjentaking"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Sjølvvald repetering"
+
+#~ msgid "_Modify"
+#~ msgstr "_Endre"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Inga repetering"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Enkel repetering"
+
+# TRN: Må ikkje denne skrivast "\%" eller "%%"?
+#~ msgid "% _Complete"
+#~ msgstr "% _ferdig"
+
+#~ msgid "Progress"
+#~ msgstr "Framgang"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Kon_fidensielt"
+
+#~ msgid "Folder:"
+#~ msgstr "Mappe:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Byrjar:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Sluttar:</b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Fullført:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Skal vera ferdig:</b>"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ingen</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Det oppstod ein feil i CORBA-systemet\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Fann ikkje objekt.\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "_Legg til avsendar i adresseboka"
+
+#~ msgid "_Options"
+#~ msgstr "_Val"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Tida møtet _startar:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Møt_e slutttid:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Feil under opning av %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Kan ikkje laga mappa: %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "_Lag regel frå melding"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kan ikkje låsa mappa «%s»: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr "Kan ikkje laga nytt vindauge.\n"
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Poengreglar"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Mappenamn:"
+
+#~ msgid "_Properties..."
+#~ msgstr "Ei_genskapar ..."
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Avkryssingsboks"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alender:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontaktar: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_E-post:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Oppgåver:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Mappe_type:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Opna annan brukar si mappe"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Mappenamn:"
+
+#~ msgid "_User:"
+#~ msgstr "Br_ukar:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Klarte ikkje å kopla til LDAP-tenar"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Kunne ikke utføra spørjing på Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Feil ved henting av skjemainformasjon"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  V_is støtta basar "
 
@@ -19316,9 +20286,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Webcam:"
 #~ msgstr "Nettside:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategoriredigering ikkje tilgjengeleg."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19368,9 +20335,6 @@ msgstr "%s (%d%% ferdig)"
 #~ "Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om "
 #~ "avlysing?"
 
-#~ 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?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19388,47 +20352,16 @@ msgstr "%s (%d%% ferdig)"
 #~ "Journaloppføringa som vert sletta er publisert. Vil du senda ei melding "
 #~ "om kansellering?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
-
 #~ 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?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Er du sikker på at du vil sletta %d avtalar?"
-#~ msgstr[1] "Er du sikker på at du vil sletta %d avtalar?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Er du sikker på at du vil sletta %d oppgåver?"
-#~ msgstr[1] "Er du sikker på at du vil sletta %d oppgåver?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Er du sikker på at du vil sletta %d journaloppføringar?"
-#~ msgstr[1] "Er du sikker på at du vil sletta %d journaloppføringar?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Inviter andre ..."
 
@@ -19441,9 +20374,6 @@ msgstr "%s (%d%% ferdig)"
 #~ "\n"
 #~ "Vil du lagra endringane?"
 
-#~ msgid "_Discard Changes"
-#~ msgstr "_Forkast endringar"
-
 #~ msgid "Save Event"
 #~ msgstr "Lagra hending"
 
@@ -19460,10 +20390,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Kunne ikkje laga katalog\n"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Feil under automatisk lagring av meldinga: %s\n"
@@ -19487,181 +20413,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Ukjent svar frå tenaren: %s"
 
-#, fuzzy
-#~ msgid "Adjust Score"
-#~ msgstr "Juster poeng"
-
-#~ msgid "Assign Color"
-#~ msgstr "Tildel farge"
-
-#~ msgid "Attachments"
-#~ msgstr "Vedlegg"
-
-#, fuzzy
-#~ msgid "Beep"
-#~ msgstr "Pipelyd"
-
-#~ msgid "contains"
-#~ msgstr "inneheld"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopier til mappe"
-
-#~ msgid "Date received"
-#~ msgstr "Dato motteke"
-
-#~ msgid "Date sent"
-#~ msgstr "Dato sendt"
-
-#~ msgid "Deleted"
-#~ msgstr "Sletta"
-
-#~ msgid "does not contain"
-#~ msgstr "inneheld ikkje"
-
-#~ msgid "does not end with"
-#~ msgstr "sluttar ikkje med"
-
-#~ msgid "does not exist"
-#~ msgstr "finst ikkje"
-
-#, fuzzy
-#~ msgid "does not return"
-#~ msgstr "finst ikkje"
-
-#~ msgid "does not sound like"
-#~ msgstr "høyres ikkje ut som"
-
-#~ msgid "does not start with"
-#~ msgstr "startar ikkje med"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Eksisterar ikkje"
-
-#~ msgid "Draft"
-#~ msgstr "Kladd"
-
-#~ msgid "ends with"
-#~ msgstr "sluttar med"
-
-#~ msgid "Exist"
-#~ msgstr "Eksisterar"
-
-#~ msgid "exists"
-#~ msgstr "eksisterar"
-
-#~ msgid "Expression"
-#~ msgstr "Uttrykk"
-
-#, fuzzy
-#~ msgid "is"
-#~ msgstr "Liste"
-
-#, fuzzy
-#~ msgid "is after"
-#~ msgstr "var etter"
-
-#, fuzzy
-#~ msgid "is before"
-#~ msgstr "var før"
-
-#~ msgid "is Flagged"
-#~ msgstr "er flagga"
-
-#~ msgid "is greater than"
-#~ msgstr "er større enn"
-
-#~ msgid "is less than"
-#~ msgstr "er mindre enn"
-
-#~ msgid "is not"
-#~ msgstr "er ikkje"
-
-#~ msgid "is not Flagged"
-#~ msgstr "er ikkje flagga"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Juni"
-
-#~ msgid "Mailing list"
-#~ msgstr "E-postliste"
-
-#~ msgid "Message Body"
-#~ msgstr "Meldingskropp"
-
-#~ msgid "Message Header"
-#~ msgstr "Meldingshovud"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Meldingar"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Marker som v_iktig"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Flytt til mappe"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Avslutt programmet"
-
-#, fuzzy
-#~ msgid "Play Sound"
-#~ msgstr "Spel lyd:"
-
-#~ msgid "Recipients"
-#~ msgstr "Mottakarar"
-
-#~ msgid "Regex Match"
-#~ msgstr "Treff på regulært uttrykk"
-
-#~ msgid "Replied to"
-#~ msgstr "Svart til"
-
-#~ msgid "returns"
-#~ msgstr "returnerer"
-
-#~ msgid "returns greater than"
-#~ msgstr "returnerer større enn"
-
-#~ msgid "returns less than"
-#~ msgstr "returnerer mindre enn"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Køyr program:"
-
-#~ msgid "Sender"
-#~ msgstr "Avsendar"
-
-#~ msgid "Set Status"
-#~ msgstr "Sett status"
-
-# TRN: Det skal ikkje vera KiB?
-#~ msgid "Size (kB)"
-#~ msgstr "Storleik (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "høyres ut som"
-
-#~ msgid "Source Account"
-#~ msgstr "Avsendarkonto"
-
-#~ msgid "Specific header"
-#~ msgstr "Spesifikk linje i hovud"
-
-#~ msgid "starts with"
-#~ msgstr "byrjar med"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Stopp prosessering"
-
-#~ msgid "Unset Status"
-#~ msgstr "Nullstill status"
-
 #~ msgid "Working"
 #~ msgstr "Arbeidar"
 
@@ -19864,9 +20615,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Finished"
 #~ msgstr "Ferdig"
 
-#~ msgid "Group:"
-#~ msgstr "Gruppe:"
-
 # TRN: «Kryptografisk». For eit vakkert ord.
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
@@ -20387,9 +21135,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "component"
 #~ msgstr "komponent"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmar"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Geografisk plassering"
 
diff --git a/po/no.po b/po/no.po
index f0efbd650b..be3c94e56e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-28 16:24+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-28 16:19+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution adressebok"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "topptekst for kontakt: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minikort"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "aktiv adressebokmappe "
@@ -49,6 +41,14 @@ msgstr " kort"
 msgid " card"
 msgstr " kort"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "topptekst for kontakt: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minikort"
+
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
 msgid "This addressbook could not be opened."
@@ -108,17 +108,6 @@ msgid "Could not remove addressbook."
 msgstr "Kunne ikke fjerne adressebok."
 
 #. addressbook:remove-addressbook secondary
-#. addressbook:generic-error primary
-#. addressbook:load-error secondary
-#. addressbook:search-error secondary
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: addressbook/addressbook-errors.xml.h:22
 #: addressbook/addressbook-errors.xml.h:26
 #: addressbook/addressbook-errors.xml.h:34
@@ -136,8 +125,6 @@ msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
 #. addressbook:generic-error secondary
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
 #: addressbook/addressbook-errors.xml.h:28
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
@@ -223,20 +210,64 @@ msgstr "Kunne ikke laste adressebok"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Aksesserer LDAP-tjener anonymt"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Kunne ikke autentisere.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autofullføring"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSkriv inn passord for %s (bruker %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "K_ontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikater"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Konfigurer automatisk fullføring her"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Håndter dine S/MIME-sertifikater her"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -290,7 +321,6 @@ msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
@@ -299,9 +329,6 @@ msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -390,12 +417,20 @@ msgstr "Slett"
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1044
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Aksesserer LDAP-tjener anonymt"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Kunne ikke autentisere.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSkriv inn passord for %s (bruker %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -416,58 +451,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikater"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Konfigurer automatisk fullføring her"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Håndter dine S/MIME-sertifikater her"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -475,6 +458,7 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -483,7 +467,7 @@ msgstr "Håndter dine S/MIME-sertifikater her"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -509,6 +493,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
@@ -783,32 +768,26 @@ msgid "cards"
 msgstr "kort"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Velg kontakter fra adresseboken"
+#: 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:208
+msgid "Remove All"
+msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -831,15 +810,22 @@ 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
 #: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Kilde"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Velg kontakter fra adresseboken"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -1036,8 +1022,8 @@ msgstr "Weblogg:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -1060,22 +1046,6 @@ msgstr "_Lagre under:"
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette disse kontaktene?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakten?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -1083,16 +1053,16 @@ msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:498
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2064,43 +2034,65 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL øyeblikksmeldinger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Tjeneste"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Lokasjon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Brukernavn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Andre"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Kildebok"
@@ -2159,28 +2151,6 @@ msgid ""
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL øyeblikksmeldinger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Tjeneste"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Lokasjon"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Brukernavn"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
@@ -2198,6 +2168,22 @@ msgstr "_Fullt navn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktene?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakten?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2361,8 +2347,8 @@ msgstr "dialog1"
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:221
-#: addressbook/gui/widgets/e-minicard-view.c:484
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Bok"
 
@@ -2423,6 +2409,398 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Ingen kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakter"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Spør"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Feil under henting av bokvisning"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Modell"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Feil ved endring av kort"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Navn begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-post begynner med"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategorien er"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Et felt inneholder"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Avansert..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "Adressebok"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Lagre som VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Ny kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Ny kontaktliste..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Gå til mappe..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Importer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Søk etter kontakter..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "Adressebok-kilder..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Innstillinger for pilot..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Videresend kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Send melding til kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Skriv ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Skriv ut konvolutt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "Kopier til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "Flytt til adressebok..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopier"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Lim inn"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Aktiv visning"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Enhver kategori"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Assistents telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Faks på arbeid"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Arbeidstelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Arbeidstelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Telefon for tilbakeringing"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Biltelefon"
+
+#: 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:3
+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:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: 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 "Given Name"
+msgstr "Gitt navn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Hjemmetelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Hjemmetelefon 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN-telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Journal"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Leder"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Kontor"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Annen faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Annen telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Personsøker"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Primær telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: 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 "Tittel"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Enhet"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Nettside"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Høyde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Felt"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Tekstmodell"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maksimal lengde på feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Ingen oppføringer i denne visningen\n"
+"\n"
+"Dobbelklikk her for å opprette en ny kontakt."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Ingen oppføringer i denne visningen."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Adapter"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2443,11 +2821,6 @@ msgstr "Listemedlemmer"
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organisasjon"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Stilling"
@@ -2478,30 +2851,14 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Kommentar"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-post"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Hjemmeside"
@@ -2558,8 +2915,8 @@ msgstr "Protokollen er ikke støttet"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
 #: camel/camel-service.c:724 camel/camel-service.c:762
 #: camel/camel-service.c:846 camel/camel-service.c:886
 #: camel/providers/pop3/camel-pop3-store.c:456
@@ -2759,16 +3116,6 @@ msgstr "(ingen)"
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Velg en handling"
@@ -2815,368 +3162,6 @@ msgstr "Vis kompakt VCard"
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Ingen kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakter"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:235
-#: addressbook/gui/widgets/e-minicard-view.c:491
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Spør"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Feil under henting av bokvisning"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Modell"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Feil ved endring av kort"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-msgid "Name begins with"
-msgstr "Navn begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Email begins with"
-msgstr "E-post begynner med"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-#: calendar/gui/cal-search-bar.c:55
-msgid "Category is"
-msgstr "Kategorien er"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:50
-msgid "Any field contains"
-msgstr "Et felt inneholder"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: addressbook/gui/widgets/e-addressbook-view.c:176
-msgid "Advanced..."
-msgstr "Avansert..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:242
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Type"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:539
-msgid "Address Book"
-msgstr "Adressebok"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-#: addressbook/gui/widgets/e-addressbook-view.c:2093
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Lagre som VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "New Contact..."
-msgstr "Ny kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "New Contact List..."
-msgstr "Ny kontaktliste..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Go to Folder..."
-msgstr "Gå til mappe..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
-msgid "Import..."
-msgstr "Importer..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1097
-msgid "Search for Contacts..."
-msgstr "Søk etter kontakter..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1098
-msgid "Address Book Sources..."
-msgstr "Adressebok-kilder..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-msgid "Pilot Settings..."
-msgstr "Innstillinger for pilot..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Videresend kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
-msgid "Send Message to Contact"
-msgstr "Send melding til kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Skriv ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Print Envelope"
-msgstr "Skriv ut konvolutt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-msgid "Copy to Address Book..."
-msgstr "Kopier til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-msgid "Move to Address Book..."
-msgstr "Flytt til adressebok..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1116
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopier"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1118
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Lim inn"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "Aktiv visning"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1678
-#: calendar/gui/cal-search-bar.c:361
-msgid "Any Category"
-msgstr "Enhver kategori"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Assistents telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Faks på arbeid"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Arbeidstelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Arbeidstelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Telefon for tilbakeringing"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Biltelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-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: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 "Given Name"
-msgstr "Gitt navn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Hjemmetelefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Hjemmetelefon 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN-telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Journal"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Leder"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Kontor"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Annen telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Personsøker"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Primær telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: 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:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: 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 "Tittel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Enhet"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Nettside"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Bredde"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Høyde"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Har fokus"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Felt"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Feltnavn"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Tekstmodell"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maksimal lengde på feltnavn"
-
-#: addressbook/gui/widgets/e-minicard-view.c:164
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen\n"
-"\n"
-"Dobbelklikk her for å opprette en ny kontakt."
-
-#: addressbook/gui/widgets/e-minicard-view.c:167
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Ingen oppføringer i denne visningen."
-
-#: addressbook/gui/widgets/e-minicard-view.c:477
-msgid "Adapter"
-msgstr "Adapter"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kortvisning"
@@ -3185,17 +3170,17 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Opphavsrett © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3219,6 +3204,11 @@ msgstr "Evolution VCard-import"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Skriv ut konvolutt"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
@@ -3228,11 +3218,6 @@ msgstr "Skriv ut kontakter"
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Skriv ut konvolutt"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pkt. Tahoma"
@@ -3417,6 +3402,20 @@ msgstr "Test på utskrift av kontakt"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Kan ikke åpne fil"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke hente en liste med adressebøker"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "kunne ikke åpne adressebok"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Oppgi utdatafil i stedet for standard utdata"
@@ -3471,20 +3470,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Umulig intern feil."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Kan ikke åpne fil"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Kunne ikke hente en liste med adressebøker"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "kunne ikke åpne adressebok"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
@@ -3502,7 +3487,6 @@ msgid "Unnamed List"
 msgstr "Liste uten navn"
 
 #. calendar:prompt-cancel-meeting primary
-#. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr ""
@@ -3550,8 +3534,6 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Er du sikker på at du vil slette denne oppgaven?"
 
 #. calendar:prompt-delete-task secondary
-#. calendar:prompt-delete-named-task secondary
-#. calendar:prompt-delete-task secondary
 #: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
 #: calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
@@ -3588,7 +3570,6 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Er du sikker på at du vil slette avtalen med navn «{0}»?"
 
 #. calendar:prompt-delete-titled-appointment secondary
-#. calendar:prompt-delete-appointment secondary
 #: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
@@ -3610,7 +3591,6 @@ msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "Er du sikker på at du vil slette journaloppføringen «{0}»?"
 
 #. calendar:prompt-delete-named-journal secondary
-#. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
@@ -3778,6 +3758,72 @@ msgstr "Forvalgt prioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendere"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Konfigurasjonskontroll for Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visning for møteplanlegging i Evolution kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Redigering av kalender/oppgaver for Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalenderkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Oppgavekomponent for Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Kalendere"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Oppgaver"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starter:"
@@ -3875,10 +3921,6 @@ 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
-msgid "Evolution Calendar alarm notification service"
-msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
@@ -4019,6 +4061,26 @@ msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sammendrag inneholder"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Beskrivelse inneholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Kommentar inneholder"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Lokasjon inneholder"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Ingen treff"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
@@ -4041,6 +4103,7 @@ msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
 #: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dager"
@@ -4051,12 +4114,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -4104,11 +4163,6 @@ msgstr "Kan ikke åpne kalender «%s» for oppretting av hendelser og møter"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 
-#: calendar/gui/calendar-component.c:1060
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendere"
-
 #: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Ny avtale"
@@ -4183,26 +4237,6 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sammendrag inneholder"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Beskrivelse inneholder"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Comment contains"
-msgstr "Kommentar inneholder"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Location contains"
-msgstr "Lokasjon inneholder"
-
-#: calendar/gui/cal-search-bar.c:365 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Ingen treff"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
@@ -4220,76 +4254,134 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Varsel</b> "
 
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Unntak</b>"
 
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Generell</b> "
 
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "_Varsel"
 
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Skriv en melding"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
-"Gruppen «%s» er ekstern. Du må oppgi en lokasjon å hente kalenderen fra"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Legg til kalender"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Meldinger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Legg til oppgavegruppe"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Spill en lyd"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "F_arge:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Vis varsling"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Velg en farge"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Kjør et program"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Legg til kalender"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Send til:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Legg til gruppe"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Send en melding"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Oppdater:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "K_onto::"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Type:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Kjør program"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Gjenta alarmen"
 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Send"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
+msgid "after"
+msgstr "etter"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
+msgid "before"
+msgstr "før"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "day(s)"
+msgstr "dag(er)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
+#, fuzzy
+msgid "end of appointment"
+msgstr "start på avtale"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "ekstra ganger hver"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
+msgid "hour(s)"
+msgstr "time(r)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "uker"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
+msgid "minute(s)"
+msgstr "minutt(er)"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
+msgid "start of appointment"
+msgstr "start på avtale"
+
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Handling/utløser"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Le_gg til"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "_Varsel"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4558,6 +4650,73 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kildelokasjon «%s» er ikke riktig utformet."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Gruppen «%s» er ekstern. Du må oppgi en lokasjon å hente kalenderen fra"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Legg til kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Legg til oppgavegruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "F_arge:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Velg en farge"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Legg til kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Legg til gruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Oppdater:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "uker"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
@@ -4604,6 +4763,31 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Fullført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Ferdig "
+
 #: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
@@ -4648,31 +4832,6 @@ msgstr ""
 msgid "Unable to use current version!"
 msgstr "Kan ikke bruke denne versjonen!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfeil: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Fullført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Fullført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Ferdig "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Kunne ikke åpne kilde"
@@ -4861,9 +5020,8 @@ msgid "Classi_fication:"
 msgstr "Klassi_fisering"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
 msgid "Confidential"
 msgstr "Konfidensiell"
 
@@ -4872,16 +5030,15 @@ msgid "L_ocation:"
 msgstr "L_okasjon:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
-#: calendar/gui/dialogs/task-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
 msgid "Private"
 msgstr "Privat"
 
 #: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
 #: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
 msgid "Public"
 msgstr "Offentlig"
 
@@ -4907,21 +5064,16 @@ msgid "_Description:"
 msgstr "_Beskrivelse:"
 
 #: calendar/gui/dialogs/event-page.glade.h:21
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
 #: calendar/gui/dialogs/event-page.glade.h:22
-#: calendar/gui/e-meeting-time-sel.c:596
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:313
 #: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
@@ -5020,7 +5172,7 @@ msgid "Change Or_ganizer"
 msgstr "Endre or_ganisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:415
 msgid "Con_tacts..."
 msgstr "Kon_takter..."
 
@@ -5166,10 +5318,6 @@ msgstr "Hver"
 msgid "This appointment rec_urs"
 msgstr "Denne avtalen _gjeninntreffer"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "day(s)"
-msgstr "dag(er)"
-
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "for"
@@ -5222,8 +5370,8 @@ msgstr "<span weight=\"bold\">Status</span>"
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -5237,8 +5385,8 @@ msgstr "Høy"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Under arbeid"
@@ -5250,16 +5398,15 @@ msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ikke startet"
 
@@ -5334,52 +5481,53 @@ msgstr "Fer_dig-dato:"
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Autentiseringsdata for HTTP-tjener"
-
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Kalendere valgt for publisering"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Kalenderalternativer</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Daglig"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Publiseringsfrekvens"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Redigering av ledig/opptatt-informasjon"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Lokasjon for publisering av ledig/opptatt-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Lokasjon for publisering av ledig/opptatt-informasjon"
+msgid "Free/Busy Editor"
+msgstr "Redigering av ledig/opptatt-informasjon"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Påloggingsnavn:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Daglig"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Passord:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_E-post"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Publiseringsfrekvens"
+#, fuzzy
+msgid "_Password:"
+msgstr "Passord:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Husk passord"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Bruker_navn:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Bruker publiserer"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Ukentlig"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5417,22 +5565,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Spill en lyd"
-
-#: calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Vis varsling"
-
-#: calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Send en melding"
-
-#: calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Kjør et program"
-
 #: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Ukjent handling som skal utføres"
@@ -5514,6 +5646,94 @@ msgstr "Prioritet:"
 msgid "Web Page:"
 msgstr "Nettside:"
 
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Sluttdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Startdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Sammendrag"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Ledig"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Opptatt"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Den geografiske posisjonen må skrives inn på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Ja"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nei"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Gjeninntreffer"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Tildelt"
+
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
@@ -5558,15 +5778,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "Opptatt"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
@@ -5587,7 +5798,7 @@ msgstr "_Åpne nettside"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:900 mail/em-popup.c:693 mail/em-popup.c:809
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
@@ -5610,7 +5821,7 @@ msgstr "Kli_pp ut"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:966 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5644,7 +5855,7 @@ msgstr "_Merk valgte oppgaver som fullført"
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
 #: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2616 mail/em-folder-view.c:923
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5691,11 +5902,6 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "Sammendrag"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Oppgavesortering"
@@ -5772,95 +5978,13 @@ msgstr "_Gå til dato..."
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Sluttdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Startdato"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1255
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Gjeninntreffer"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Tildelt"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Ja"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nei"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Ø"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske posisjonen må skrives inn på formatet: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5877,43 +6001,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters oppdeling"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -6396,7 +6513,7 @@ msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativ"
 
@@ -6409,94 +6526,86 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:432
 msgid "O_ptions"
 msgstr "Al_ternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "K_un vis arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Alle personer og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Alle _personer og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "_Obligatoriske personer"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Obligatoriske personer _og en ressurs"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2055
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2088
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: calendar/gui/e-tasks.c:710 calendar/gui/gnome-cal.c:2159
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6505,38 +6614,27 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:756
+#: calendar/gui/e-tasks.c:755
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
 #: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:963
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:986
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:1013
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:1089
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:874 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Oppgaver"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Oppdaterer spørring"
@@ -6560,55 +6658,6 @@ msgstr "Åpner %s"
 msgid "Purging"
 msgstr "Sletter"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Konfigurasjonskontroll for Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visning for møteplanlegging i Evolution kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Redigering av kalender/oppgaver for Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalenderkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Oppgavekomponent for Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Kalendere"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgaver"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -7077,7 +7126,7 @@ msgstr "Ikke spør meg igjen."
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: calendar/gui/weekday-picker.c:327
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -8814,41 +8863,6 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Ustøttet operasjon: legg til melding: for %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Ustøttet operasjon: søk på uid: etter %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Flytter meldinger"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopierer meldinger"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Oppdaterer data om søppel"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Oppdaterer data om gyldige meldinger"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrerer ny(e) melding(er)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8894,6 +8908,41 @@ 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:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Ustøttet operasjon: legg til melding: for %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Ustøttet operasjon: søk etter uttrykk: etter %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Ustøttet operasjon: søk på uid: etter %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Flytter meldinger"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopierer meldinger"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Oppdaterer data om søppel"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Oppdaterer data om gyldige meldinger"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrerer ny(e) melding(er)"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -9011,26 +9060,6 @@ msgstr "Kryptert innhold"
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kunne ikke opprette låsfil for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Feil under låsing ved bruk av fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Feil under låsing ved bruk av flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9051,6 +9080,26 @@ msgstr "Kunne ikke låse «%s»: protokollfeil med låshjelper"
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke låse «%s»"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Kunne ikke opprette låsfil for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Feil under låsing ved bruk av fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Feil under låsing ved bruk av flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9500,7 +9549,7 @@ msgstr "Kan ikke legge til sertifikat for kryptering"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Kan ikke legge til SignerInfo for CMS"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
@@ -9586,7 +9635,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Gyldig signatur"
 
 #: camel/camel-smime-context.c:651
@@ -9599,46 +9648,48 @@ msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "Kan ikke finne sertifikat for «%s»"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Kan ikke opprette signedData for CMS"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Kan ikke legge ved signedData for CMS"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Kan ikke legge ved CMS-data"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Kan ikke opprette SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
-msgstr ""
-
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Kan ikke opprette kontekst for koding"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
+msgstr "Kan ikke legge til SignerInfo for CMS"
 
 #: camel/camel-smime-context.c:888
 #, fuzzy
@@ -9685,7 +9736,7 @@ msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
 #: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -9935,7 +9986,7 @@ msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
@@ -9954,8 +10005,8 @@ msgid "Checking for new mail"
 msgstr "Ser etter nye meldinger"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
@@ -9985,8 +10036,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For å aksessere Novell Groupwise-tjenere"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10006,324 +10057,6 @@ msgstr ""
 msgid "Checklist"
 msgstr "Sjekkliste"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, fuzzy, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Uventet svar fra IMAP4-tjener %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, fuzzy, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4-tjener %s koblet fra uventet: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Mottok svaret BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:513
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:650
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Kan ikke tømme mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:655
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:845
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
-
-#: camel/providers/imap4/camel-imap4-folder.c:850
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:975
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1083
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1087
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1095
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1099
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abonnerte mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Overstyr tjeners navneområde for mapper"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Navneområde"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "For lesing og lagring av e-post på IMAP-tjenere."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
-"passord."
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-tjener %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:177
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-tjeneste for %s på %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap4/camel-imap4-store.c:235
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:220
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL er ikke tilgjengelig"
-
-#: camel/providers/imap4/camel-imap4-store.c:232
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilkobling avbrutt"
-
-#: camel/providers/imap4/camel-imap4-store.c:271
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:296
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:297
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:543
-#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
-msgid "Unknown error"
-msgstr "Ukjent feil"
-
-#: camel/providers/imap4/camel-imap4-store.c:383
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Kunne ikke koble til POP-tjener %s: Ingen støtte for forespurt "
-"autentiseringsmekanisme."
-
-#: camel/providers/imap4/camel-imap4-store.c:428
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:502
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:733
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Finner ikke mappe: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:796
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
-
-#: camel/providers/imap4/camel-imap4-store.c:847
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:853
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:884
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
-
-#: camel/providers/imap4/camel-imap4-store.c:943
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:948
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:968
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
-
-#: camel/providers/imap4/camel-imap4-store.c:1000
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
-
-#: camel/providers/imap4/camel-imap4-store.c:1005
-#, fuzzy, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:1253
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1255
-msgid "Bad command"
-msgstr "Ugyldig kommando"
-
-#: camel/providers/imap4/camel-imap4-store.c:1331
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:1336
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1396
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-
-#: camel/providers/imap4/camel-imap4-store.c:1401
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Kan ikke opprette mappe «%s»: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Uventet svar fra IMAP-tjener: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Ingen data"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP-tjener %s koblet fra uventet: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -10337,6 +10070,15 @@ msgstr "Operasjon avbrutt"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Ukjent feil"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10476,6 +10218,27 @@ msgstr "Bruk egendefinert kommando for å koble til tjener"
 msgid "Command:"
 msgstr "Kommando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerte mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Overstyr tjeners navneområde for mapper"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Navneområde"
+
 #: 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"
@@ -10496,6 +10259,55 @@ msgstr "IMAP"
 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-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP-tjener %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-tjeneste for %s på %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Kunne ikke koble til %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL er ikke tilgjengelig"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilkobling avbrutt"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
+
 #: camel/providers/imap/camel-imap-store.c:676
 #: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
@@ -10549,6 +10361,14 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
+
 #: camel/providers/imap/camel-imap-store.c:1939
 #: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
@@ -10567,6 +10387,237 @@ msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventet svar fra IMAP4-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan ikke velge mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4-tjener %s koblet fra uventet: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Mottok svaret BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kan ikke synkronisere flagg til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan ikke tømme mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan ikke tømme mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Kan ikke hente melding %s fra mappe «%s»: Meldingen finnes ikke"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Kan ikke hente melding: %s fra mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikke legge til melding i mappe «%s»: Ukjent feil"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikke legge til melding i mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "For lesing og lagring av e-post på IMAP-tjenere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
+"passord."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kunne ikke koble til POP-tjener %s: Ingen støtte for forespurt "
+"autentiseringsmekanisme."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVennligst skriv inn IMAP-passord for %s på vert %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikke slette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Kan ikke slette mappe «%s»: Spesiell mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig navn på postboks"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Ugyldig kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan ikke opprette mappe «%s»: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Ingen data"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP-tjener %s koblet fra uventet: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -11858,86 +11909,6 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
-"denne kontoen"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
-"denne kontoen"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Kunne ikke åpne fil"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente melding fra editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Melding uten navn"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Åpne fil"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Generert automatisk"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
-msgid "Compose a message"
-msgstr "Skriv en melding"
-
-#: composer/e-msg-composer.c:2649
-#, fuzzy, c-format
-msgid "Attached message - %s"
-msgstr "Videresendt melding - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "Vedlagt melding"
-msgstr[1] "%d vedlagte meldinger"
-
-#: composer/e-msg-composer.c:4332
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
-"kan redigeres.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destinasjon for post"
@@ -12018,6 +11989,86 @@ msgstr "Klikk her for å velge mapper å poste til"
 msgid "Attach file(s)"
 msgstr "Legg ved fil(er)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
+"denne kontoen"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
+"denne kontoen"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Kunne ikke åpne fil"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente melding fra editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Melding uten navn"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Åpne fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Generert automatisk"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Skjul _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Vis _vedleggsfeltet (slipp vedlegg her)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Skriv en melding"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Videresendt melding - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Vedlagt melding"
+msgstr[1] "%d vedlagte meldinger"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
+"kan redigeres.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
@@ -12048,11 +12099,6 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr "Kunne ikke opprette melding."
 
 #. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
 #: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
 #: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -12148,7 +12194,6 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "Du må konfigurere en konto før du kan skrive meldinger."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
 #, fuzzy
@@ -12329,16 +12374,12 @@ msgstr "Synkroniser kategorier:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
@@ -12390,31 +12431,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12507,7 +12540,6 @@ msgid "Missing file name."
 msgstr "Mangler filnavn."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
@@ -12528,7 +12560,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Mangler navn."
@@ -12552,6 +12583,71 @@ msgstr "Vennligst velg et annet navn."
 msgid "Choose a file"
 msgstr "Velg en fil"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Viktig"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Oppgaver"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "Senere"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Regelnavn:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Hvis</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er møtt"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "hvis ethvert kriterie er møtt"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Utfør handlinger"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "Alle relaterte"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "Svar"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "Svar med opphav"
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "Ta med tråder"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "innkommende"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "utgående"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>_Filterregler</b>"
@@ -12616,82 +12712,82 @@ msgstr "tiden du spesifiserer"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
-msgid "Important"
-msgstr "Viktig"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Legg til regel"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:148
-msgid "To Do"
-msgstr "Oppgaver"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Rediger regel"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "Senere"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Regelnavn"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Regelnavn:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Brukervalg for redigering"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Hvis</b> "
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er møtt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "hvis ethvert kriterie er møtt"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfigurer e-post-kontoer her"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Utfør handlinger"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Alle relaterte"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Svar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Svar med opphav"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigering"
 
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Ta med tråder"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "innkommende"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "utgående"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "E-post"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Legg til regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Rediger regel"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Brukervalg for e-post"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Regelnavn"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_E-post"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12744,7 +12840,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "_Filterregler"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:493
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Velg mappe"
@@ -12983,8 +13079,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -13028,7 +13124,7 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2331
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -13041,130 +13137,123 @@ msgstr "Opprett"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:847
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFoldere"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "UTEN TREFF"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Laster..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:849
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:856 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:858 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:874
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: mail/em-folder-tree.c:965 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:967 mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
 #: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:969 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: mail/em-folder-tree.c:2105 mail/em-folder-tree.c:2118
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
 #: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2105 mail/em-folder-view.c:816
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "K_opier"
 
-#: mail/em-folder-tree.c:2145
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2331 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2527
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2529
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2604 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2605
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2609
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Flytt..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2614
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "End_re navn..."
 
-#: mail/em-folder-tree.c:2620 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "Egenska_per..."
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "VFoldere"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "UTEN TREFF"
-
-#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
-msgid "Loading..."
-msgstr "Laster..."
-
-#: mail/em-folder-view.c:418 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "E-post"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:899 mail/em-popup.c:692
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
@@ -13177,17 +13266,17 @@ msgstr "S_kriv ut"
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:905 mail/em-popup.c:813
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:906 mail/em-popup.c:814
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:907 mail/em-popup.c:816
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
@@ -13307,162 +13396,16 @@ msgstr "_Kopier lokasjon for lenke"
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Fra"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Nyhetsgrupper"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s-vedlegg"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Ustøttet signaturformat"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Feil under verifisering av signatur"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Ukjent feil under verifisering av signatur"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter «%s»"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:641
-msgid "Unsigned"
-msgstr "Usignert"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:642
-msgid "Valid signature"
-msgstr "Gyldig signatur"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:643
-msgid "Invalid signature"
-msgstr "Ugyldig signatur"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Gyldig signatur, men ikke verifisere avsender"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:650
-msgid "Unencrypted"
-msgstr "Ukryptert"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:651
-msgid "Encrypted, weak"
-msgstr "Kryptert, svak"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:652
-msgid "Encrypted"
-msgstr "Kryptert"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:653
-msgid "Encrypted, strong"
-msgstr "Kryptert, sterk"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Feilutformet del for ekstern kropp."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peker til FTP-tjener (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peker til lokal fil (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peker til eksterne data (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peker til ukjente eksterne data («%s»-type)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatterer melding"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Usignert"
+
 #: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13471,6 +13414,10 @@ msgstr ""
 "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
 "autentisk."
 
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Gyldig signatur"
+
 #: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13479,6 +13426,10 @@ msgstr ""
 "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
 "sannsynlig er autentisk."
 
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Ugyldig signatur"
+
 #: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13499,6 +13450,10 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Ukryptert"
+
 #: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13507,6 +13462,10 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan ses under overføring over "
 "Internett."
 
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Kryptert, svak"
+
 #: mail/em-format-html-display.c:651
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13517,6 +13476,10 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Kryptert"
+
 #: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
@@ -13525,6 +13488,10 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Kryptert, sterk"
+
 #: mail/em-format-html-display.c:653
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13567,6 +13534,128 @@ msgstr "_Skjul"
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Henter «%s»"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Gyldig signatur, men ikke verifisere avsender"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Feilutformet del for ekstern kropp."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peker til FTP-tjener (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peker til lokal fil (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peker til eksterne data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peker til ukjente eksterne data («%s»-type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatterer melding"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Fra"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Svar-til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Til"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dato"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Nyhetsgrupper"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s-vedlegg"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Ustøttet signaturformat"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Feil under verifisering av signatur"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Ukjent feil under verifisering av signatur"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
@@ -13647,36 +13736,36 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:702
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:720
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:810
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:812
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:862
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:863
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:987
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -13733,11 +13822,11 @@ msgstr "Meldinger fra %s"
 msgid "Virtual _Folders"
 msgstr "Virtuelle _mapper"
 
-#: mail/em-vfolder-rule.c:493
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "_Legg til"
 
-#: mail/em-vfolder-rule.c:573
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
@@ -14196,63 +14285,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "port for spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Brukervalg for redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Konfigurer e-post-kontoer her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import fra Elm for Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigering"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Import av Netscape e-post for Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import fra Outlook Express 4 for Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Brukervalg-kontroll for Evolution e-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Import fra Pine for Evolutions"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "mbox-import for Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Brukervalg for e-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (.mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_E-post"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14310,34 +14369,6 @@ msgstr "Importerer «%s»"
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import fra Elm for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Import av Netscape e-post for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import fra Outlook Express 4 for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Import fra Pine for Evolutions"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "mbox-import for Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (.mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14564,14 +14595,6 @@ msgstr "Opprett en ny e-postmappe"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Sjekker tjeneste"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Kobler til tjener..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
@@ -14634,6 +14657,14 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sjekker tjeneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kobler til tjener..."
+
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14895,7 +14926,7 @@ msgstr "Ikke siter opprinnelig melding"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
@@ -15259,7 +15290,7 @@ msgstr "<span weight=\"bold\">Kryptering</span>"
 msgid "Accept License"
 msgstr "Godta lisensen"
 
-#: mail/mail-dialogs.glade.h:11
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
 msgid "C_ompleted"
 msgstr "F_ullført"
 
@@ -15276,6 +15307,7 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -15299,7 +15331,7 @@ msgstr "Tj_ener:"
 msgid "Security Information"
 msgstr "Sikkerhetsinformasjon"
 
-#: mail/mail-dialogs.glade.h:23
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15311,11 +15343,11 @@ msgstr ""
 msgid "Tick this to accept the license agreement"
 msgstr "Kryss av her for å godta lisensen"
 
-#: mail/mail-dialogs.glade.h:26
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "_Ferdig til:"
 
-#: mail/mail-dialogs.glade.h:27
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Flagg:"
 
@@ -15389,8 +15421,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Send"
+msgstr "Send"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15405,7 +15438,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
@@ -15470,7 +15502,6 @@ msgid ""
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15554,8 +15585,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15592,7 +15621,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15618,19 +15646,19 @@ msgstr "Vil du virkelig slette mappe «%s» og alle dens undermapper?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
+#, fuzzy
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr ""
+msgstr "Hvis du fortsetter vil kontoinformasjonen bli slettet permanent."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Kunne ikke flytte mappe: %s"
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15643,26 +15671,22 @@ msgid "Because \"{2}\"."
 msgstr "Fordi «{2}»."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe: %s"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15679,7 +15703,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
@@ -16292,6 +16315,50 @@ msgstr "Svar til alle"
 msgid "Review"
 msgstr "Gjennomgå"
 
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Kropp inneholder"
+
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Kropp inneholder ikke"
+
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Kropp eller emne inneholder"
+
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Melding inneholder"
+
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Mottakere inneholder"
+
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Avsender inneholder"
+
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Emne inneholder"
+
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Emne inneholder ikke"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skall"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Testkomponent for Evolution"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -16353,30 +16420,17 @@ msgstr ""
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktive forbindelser</b>"
 
-#: shell/e-shell.c:774
-msgid "Uknown system error."
-msgstr "Ukjent systemfeil."
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktive tilkoblinger"
 
-#: shell/e-shell.c:1131
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:1133
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:1135
-msgid "Configuration Database not found"
-msgstr "Konfigurasjonsdatabase ikke funnet"
-
-#: shell/e-shell.c:1137
-msgid "Generic error"
-msgstr "Vanlig feil"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16561,25 +16615,6 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution er i ferd med å koble fra."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Bytt til %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16614,10 +16649,96 @@ msgstr "Ar_beid frakoblet"
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution er i ferd med å koble fra."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Bytt til %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Ukjent systemfeil."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfigurasjonsdatabase ikke funnet"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Vanlig feil"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Ny"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Konfigurasjonsassistent for Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importerer filer"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Tidssone "
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Velkommen"
+
+#: shell/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 ""
+"Velkommen til Evolution. De neste skjermene lar deg\n"
+"konfigurere Evolution til å koble til dine e-post kontoer, og\n"
+"importere filer fra andre applikasjoner. \n"
+"\n"
+"Vennligst klikk «Neste» for å fortsette. "
+
+#: shell/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 ""
+"Du har fullført inntasting av all informasjon\n"
+"som trengs for å konfigurere Evolution.\n"
+"\n"
+"Klikk på «Fullfør» for å lagre dine innstillinger. "
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Ny test"
@@ -16630,18 +16751,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Opprett en ny testoppføring"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skall"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Testkomponent for Evolution"
-
 #: 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."
@@ -16823,13 +16932,11 @@ msgid "Continue"
 msgstr "Fortsett"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Kan ikke starte Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
@@ -17118,6 +17225,11 @@ msgstr "Dine sertifikater"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikatet eksisterer allerede"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17318,11 +17430,6 @@ msgstr "Unik ID for subjekt"
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Sertifikatet eksisterer allerede"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Passord for PKCS12-fil"
@@ -17462,8 +17569,8 @@ msgstr "Vis aktiv kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -17936,16 +18043,6 @@ msgstr "_Reverser utvalg"
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Lukk dette vinduet"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "L_egg til avsender i adressebok"
@@ -18346,6 +18443,16 @@ msgstr "Ve_rktøy"
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Lukk dette vinduet"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -18853,12 +18960,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:425
+#: 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:1130
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19128,6 +19235,30 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Autentiseringsdata for HTTP-tjener"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Kalendere valgt for publisering"
+
+#~ msgid "Login name:"
+#~ msgstr "Påloggingsnavn:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Bruker publiserer"
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Kan ikke finne sertifikat for «%s»"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Kan ikke opprette CMS-melding"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Kan ikke opprette kontekst for koding"
+
 #~ msgid "Groupwise"
 #~ msgstr "Groupwise"
 
@@ -19171,27 +19302,12 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Play sound:"
 #~ msgstr "Spill lyd:"
 
-#~ msgid "Repeat the alarm"
-#~ msgstr "Gjenta alarmen"
-
 #~ msgid "Run program:"
 #~ msgstr "Kjør program:"
 
-#~ msgid "Send To:"
-#~ msgstr "Send til:"
-
 #~ msgid "With these arguments:"
 #~ msgstr "Med disse argumentene:"
 
-#~ msgid "extra times every"
-#~ msgstr "ekstra ganger hver"
-
-#~ msgid "Action/Trigger"
-#~ msgstr "Handling/utløser"
-
-#~ msgid "A_dd"
-#~ msgstr "Le_gg til"
-
 #~ msgid "Basics"
 #~ msgstr "Grunnleggende"
 
@@ -19204,21 +19320,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Options..."
 #~ msgstr "Alte_rnativer..."
 
-#~ msgid "after"
-#~ msgstr "etter"
-
-#~ msgid "before"
-#~ msgstr "før"
-
-#~ msgid "hour(s)"
-#~ msgstr "time(r)"
-
-#~ msgid "minute(s)"
-#~ msgstr "minutt(er)"
-
-#~ msgid "start of appointment"
-#~ msgstr "start på avtale"
-
 #~ msgid "Addressbook..."
 #~ msgstr "Adressebok..."
 
@@ -19313,30 +19414,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Score Rules"
 #~ msgstr "_Poengregler"
 
-#~ msgid "Body contains"
-#~ msgstr "Kropp inneholder"
-
-#~ msgid "Body does not contain"
-#~ msgstr "Kropp inneholder ikke"
-
-#~ msgid "Body or subject contains"
-#~ msgstr "Kropp eller emne inneholder"
-
-#~ msgid "Message contains"
-#~ msgstr "Melding inneholder"
-
-#~ msgid "Recipients contain"
-#~ msgstr "Mottakere inneholder"
-
-#~ msgid "Sender contains"
-#~ msgstr "Avsender inneholder"
-
-#~ msgid "Subject contains"
-#~ msgstr "Emne inneholder"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "Emne inneholder ikke"
-
 #~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 #~ msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
 
@@ -19349,15 +19426,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Checkbox"
 #~ msgstr "Avkryssingsboks"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktive forbindelser</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Aktive tilkoblinger"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
-
 #~ msgid "C_alendar:"
 #~ msgstr "K_alender:"
 
@@ -19376,51 +19444,12 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Åpne annen brukers mappe"
 
-#~ msgid "_Account:"
-#~ msgstr "K_onto::"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Mappenavn:"
 
 #~ msgid "_User:"
 #~ msgstr "Br_uker:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Konfigurasjonsassistent for Evolution"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importerer filer"
-
-#~ msgid "Timezone "
-#~ msgstr "Tidssone "
-
-#~ msgid "Welcome"
-#~ msgstr "Velkommen"
-
-#~ 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 ""
-#~ "Velkommen til Evolution. De neste skjermene lar deg\n"
-#~ "konfigurere Evolution til å koble til dine e-post kontoer, og\n"
-#~ "importere filer fra andre applikasjoner. \n"
-#~ "\n"
-#~ "Vennligst klikk «Neste» for å fortsette. "
-
-#~ 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 ""
-#~ "Du har fullført inntasting av all informasjon\n"
-#~ "som trengs for å konfigurere Evolution.\n"
-#~ "\n"
-#~ "Klikk på «Fullfør» for å lagre dine innstillinger. "
-
 #~ msgid "contact-list-editor"
 #~ msgstr "kontakt-liste-redigering"
 
diff --git a/po/pl.po b/po/pl.po
index bd7c67abb3..3c9749388f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-17 10:38+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-28 14:18+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.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"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -28,15 +28,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "książka adresowa evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "nagłówek kontaktu: "
-
-# FIXME - albo jakoś inaczej?
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minikarta evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "bieżący folder książki adresowej "
@@ -57,34 +48,258 @@ msgstr " kart"
 msgid " card"
 msgstr " kartę"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "nagłówek kontaktu: "
+
+# FIXME - albo jakoś inaczej?
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minikarta evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Nie można wysłać elementu!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Sprawdź czy hasło zostało prawidłowo napisane. Pamiętaj, że wiele haseł jest "
+"wrażliwych na wielkość liter; może być włączony \"caps lock\"."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+"Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw wyszukiwania"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nie można pobrać artykułu %s z serwera NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nie można wczytać książki adresowej"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Edytor kategorii nie jest dostępny."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr "Nie można otworzyć książki adresowej"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Błąd przy odczycie domyślnej książki adresowej."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Nie można przetworzyć folderu kolejki"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Czy chcesz zapisać zmiany?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Porzuć"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "oraz jeden inny kontakt."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
+"można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nie można przeanalizować zawartości listu"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Błąd przy dodawaniu kontaktu"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Przeglądarka adresów książki adresowej Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Domyślny adres do synchronizacji:"
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nie można wczytać książki adresowej"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimowy dostęp do serwera LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Nie można dokonać uwierzytelnienia.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autouzupełnianie"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "K_ontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certyfikaty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Konfiguracja automatycznego uzupełniania"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Książka adresowa Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Przeglądarka adresów książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Przeglądarka kart książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponent książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola konfiguracji ustawień folderu Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Zarządzanie certyfikatami S/Mime"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -115,7 +330,8 @@ msgid "New Contacts Group"
 msgstr "Nowa grupa kontaktów"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Grupa kontaktów"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -138,23 +354,19 @@ msgid "Migrating `%s':"
 msgstr "Migrowanie \"%s\":"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Osobiste"
 
@@ -214,18 +426,18 @@ msgstr ""
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował dane "
 "synchronizacji Pilota..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Książka adresowa \"%s\" zostanie usunięta. Czy na pewno chcesz kontynuować?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -235,17 +447,25 @@ msgstr "Nowa książka adresowa"
 msgid "Delete"
 msgstr "Usuń"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Właściwości..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakty"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimowy dostęp do serwera LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Nie można dokonać uwierzytelnienia.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -267,58 +487,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adres URI folderu ostatnio używanego w oknie wyboru nazw"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autouzupełnianie"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "K_ontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certyfikaty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Konfiguracja automatycznego uzupełniania"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Książka adresowa Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Przeglądarka adresów książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Przeglądarka kart książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Komponent książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola konfiguracji ustawień folderu Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Zarządzanie certyfikatami S/Mime"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -326,7 +494,7 @@ msgstr "Zarządzanie certyfikatami S/Mime"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -335,7 +503,7 @@ msgstr "Zarządzanie certyfikatami S/Mime"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -361,6 +529,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Uwierzytelnianie</b>"
 
@@ -393,7 +562,7 @@ msgid "Address Book Properties"
 msgstr "Właściwości książki adresowej"
 
 #: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Zawsze"
 
@@ -402,13 +571,11 @@ msgid "Anonymously"
 msgstr "Anonimowo"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "Proste"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Szczegóły"
 
@@ -436,12 +603,12 @@ msgstr "Znajdź możliwe podstawy wyszukiwania"
 
 #: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:87 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
 #: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nigdy"
 
@@ -581,7 +748,7 @@ msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
 #: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
@@ -610,7 +777,7 @@ msgid "_Log in:"
 msgstr "_Użytkownik:"
 
 #: addressbook/gui/component/ldap-config.glade.h:53
-#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:172
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nazwa:"
 
@@ -639,33 +806,26 @@ msgid "cards"
 msgstr "karty"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
-#: mail/mail-config.glade.h:184
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Wybór kontaktów z książki adresowej"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Usuń wszystko"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Usuń"
 
-#: 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 "Nazwa"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Usuń wszystko"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Przejrzyj listę kontaktów"
@@ -680,7 +840,7 @@ msgid "Send HTML Mail?"
 msgstr "Wysłanie listu w formacie HTML"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj do kontaktów"
 
@@ -688,15 +848,22 @@ msgstr "Dodaj do kontaktów"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
+#: 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 "Nazwa"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Źródło"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Wybór kontaktów z książki adresowej"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -718,6 +885,11 @@ msgstr "K_ategoria:"
 msgid "_Find"
 msgstr "Z_najdź"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Znajdź"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
@@ -755,7 +927,7 @@ msgid "<b>Work</b>"
 msgstr "<b>Praca</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -777,7 +949,6 @@ msgid "Birthday:"
 msgstr "Urodziny:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendarz:"
 
@@ -790,7 +961,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -798,7 +969,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
@@ -890,10 +1061,10 @@ msgstr "Dziennik WWW:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Praca"
 
@@ -916,22 +1087,6 @@ msgstr "W_idoczny jako:"
 msgid "_Where:"
 msgstr "_Gdzie:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć te kontakty?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć ten kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -939,16 +1094,16 @@ msgid "Address"
 msgstr "Adres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Modyfikowalny"
 
@@ -1920,78 +2075,100 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Komunikator internetowy AOL"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Komunikator Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usługa"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Położenie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Inne"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Książka docelowa"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Zmienione"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynależy do następujących kategorii:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Wybierz obraz dla tego kontaktu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Brak obrazu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1999,11 +2176,11 @@ msgstr ""
 "Dane kontaktu są niepoprawne:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Nieprawidłowy kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2011,12 +2188,7 @@ msgstr ""
 "Nie można zapisać kontaktu do wybranej książki adresowej. Czy porzucić "
 "zmiany?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "_Porzuć"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2024,28 +2196,6 @@ msgstr ""
 "Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
 "można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Komunikator internetowy AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Komunikator Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usługa"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "Położenie"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaktu"
@@ -2055,7 +2205,7 @@ msgid "_Edit Full"
 msgstr "_Pełna edycja"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:167
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Peł_na nazwa:"
 
@@ -2063,6 +2213,22 @@ msgstr "Peł_na nazwa:"
 msgid "E-_mail:"
 msgstr "_E-mail"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć te kontakty?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć ten kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2219,16 +2385,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Wprowadź adres e-mail lub przeciągnij kontakt do poniższej listy:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Książka"
 
@@ -2289,6 +2455,399 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "Brak kontaktów"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d kontakt"
+msgstr[1] "%d kontakty"
+msgstr[2] "%d kontaktów"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Zapytanie"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Błąd przy pobieraniu widoku książki adresowej"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Błąd przy modyfikacji karty"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Nazwa rozpoczyna się od"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-mail rozpoczyna się od"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategorią jest"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Jakiekolwiek pole zawiera"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Zaawansowane..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Rodzaj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "Książka adresowa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "Zapisz jako VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Nowy kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Nowa lista kontaktów..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Przejdź do folderu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Zaimportuj..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Szukaj kontaktów..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "Źródła książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Ustawienia Pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Prześlij kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Wyślij list do kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Wydrukuj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Wydrukuj kopertę"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "Skopiuj do książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "Przenieś do książki adresowej..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Wytnij"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Skopiuj"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Wklej"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Bieżący widok"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Dowolna kategoria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Asystent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Telefon asystenta"
+
+#: 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:4
+msgid "Business Phone"
+msgstr "Telefon służbowy"
+
+#: 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:6
+msgid "Callback Phone"
+msgstr "Telefon callbacka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Telefon samochodowy"
+
+#: 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:3
+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:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Nazwisko"
+
+#: 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 "Given Name"
+msgstr "Imię"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Faks w domu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Telefon domowy"
+
+#: 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:20
+msgid "ISDN Phone"
+msgstr "Telefon ISDN"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "Dziennik"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Menedżer"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefon komórkowy"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Pseudonim"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Notatka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Biuro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacja"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Inny faks"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Inny telefon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Telefon główny"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: 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 "Tytuł"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "Jednostka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Witryna sieci web"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Szerokość"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Wysokość"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Posiada skupienie"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Pole"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Nazwa pola"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Model tekstowy"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maks. długość nazwy pola"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Szerokość kolumny"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Brak elementów do wyświetlenia w tym widoku.\n"
+"\n"
+"Dwukrotne kliknięcie spowoduje utworzenie nowego kontaktu."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Brak elementów do wyświetlenia w tym widoku."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Łącznik"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Wybrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Posiada kursor"
+
 # FIXME - dobrze czy nie?
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
@@ -2311,11 +2870,6 @@ msgstr "Członkowie listy"
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacja"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "Pozycja"
@@ -2346,127 +2900,111 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefon komórkowy"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "osobiste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Notatka"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "Witryna domowa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Sukces"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr "Wsparcie zajęte"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Repozytorium rozłączone"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Address Book does not exist"
 msgstr "Książka adresowa nie istnieje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "No Self Contact defined"
 msgstr "Nie zdefiniowano własnego kontaktu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact not found"
 msgstr "Nie odnaleziono kontaktu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact ID already exists"
 msgstr "Kontakt z tym ID już istnieje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokół nie jest obsługiwany"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Anulowano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Could not cancel"
 msgstr "Nie można anulować"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "No such source"
 msgstr "Brak takiego źródła"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Inny błąd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2474,7 +3012,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Upewnij się, że ścieżka istnieje "
 "oraz że ma ustawione odpowiednie uprawnienia dostępu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2482,7 +3020,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -2491,7 +3029,7 @@ msgstr ""
 "Używana kopia Evolution została skompilowana bez obsługi LDAP. Aby móc "
 "wykorzystać LDAP, należy pobrać Evolution z obsługą LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2499,7 +3037,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2512,7 +3050,7 @@ msgstr ""
 "Spróbuj doprecyzować zapytanie lub zwiększ limit w ustawieniach serwera "
 "katalogowego, powiązanego z tą książką adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2524,48 +3062,48 @@ msgstr ""
 "swoje zapytanie lub zwiększ limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tą książkę adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 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/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 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/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Zapytanie nie zakończyło się pomyślnie."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Błąd przy dodawaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 msgid "Error adding contact"
 msgstr "Błąd przy dodawaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Błąd przy modyfikacji listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying contact"
 msgstr "Błąd przy modyfikacji kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Błąd przy usuwaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 msgid "Error removing contact"
 msgstr "Błąd przy usuwaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2574,7 +3112,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:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2583,45 +3121,45 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Nadpisz"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Move contact to"
 msgstr "Przeniesienie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 msgid "Copy contact to"
 msgstr "Skopiowanie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 msgid "Move contacts to"
 msgstr "Przeniesienie kontaktów do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 msgid "Copy contacts to"
 msgstr "Skopiowanie kontaktów do"
 
 # FIXME - albo wybierz 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 msgid "Select target addressbook."
 msgstr "Wybór docelowej książki adresowej."
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycją %s"
@@ -2631,47 +3169,37 @@ msgstr "Plik VCard z pozycją %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(brak)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Główny e-mail"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Wybór czynności"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Utwórz nowy kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 msgid "Querying Address Book..."
 msgstr "Odpytywanie książki adresowej..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Zmień informacje o kontakcie"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Dołączenie adresu e-mail"
 
@@ -2696,369 +3224,6 @@ msgstr "Wyświetlenie okrojonej wizytówki VCard"
 msgid "Save in addressbook"
 msgstr "Zapisz w książce adresowej"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "Brak kontaktów"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d kontakt"
-msgstr[1] "%d kontakty"
-msgstr[2] "%d kontaktów"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Zapytanie"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Błąd przy pobieraniu widoku książki adresowej"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Błąd przy modyfikacji karty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Nazwa rozpoczyna się od"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "E-mail rozpoczyna się od"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategorią jest"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Jakiekolwiek pole zawiera"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Zaawansowane..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Rodzaj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:535
-msgid "Address Book"
-msgstr "Książka adresowa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "Zapisz jako VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "New Contact..."
-msgstr "Nowy kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-msgid "New Contact List..."
-msgstr "Nowa lista kontaktów..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "Go to Folder..."
-msgstr "Przejdź do folderu..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "Import..."
-msgstr "Zaimportuj..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
-msgid "Search for Contacts..."
-msgstr "Szukaj kontaktów..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Address Book Sources..."
-msgstr "Źródła książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "Pilot Settings..."
-msgstr "Ustawienia Pilota..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Prześlij kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
-msgid "Send Message to Contact"
-msgstr "Wyślij list do kontaktu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Wydrukuj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-msgid "Print Envelope"
-msgstr "Wydrukuj kopertę"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Copy to Address Book..."
-msgstr "Skopiuj do książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-msgid "Move to Address Book..."
-msgstr "Przenieś do książki adresowej..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Wytnij"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Skopiuj"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Wklej"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "Bieżący widok"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Dowolna kategoria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Asystent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Telefon asystenta"
-
-#: 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:4
-msgid "Business Phone"
-msgstr "Telefon służbowy"
-
-#: 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:6
-msgid "Callback Phone"
-msgstr "Telefon callbacka"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Telefon samochodowy"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-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:13
-msgid "Family Name"
-msgstr "Nazwisko"
-
-#: 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 "Given Name"
-msgstr "Imię"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Faks w domu"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Telefon domowy"
-
-#: 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:20
-msgid "ISDN Phone"
-msgstr "Telefon ISDN"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "Dziennik"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Menedżer"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Biuro"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Inny faks"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Inny telefon"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Telefon główny"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: 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:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: 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 "Tytuł"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "Jednostka"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Witryna sieci web"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Szerokość"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Wysokość"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Posiada skupienie"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Wybrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Posiada kursor"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Pole"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Nazwa pola"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model tekstowy"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maks. długość nazwy pola"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Brak elementów do wyświetlenia w tym widoku.\n"
-"\n"
-"Dwukrotne kliknięcie spowoduje utworzenie nowego kontaktu."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Brak elementów do wyświetlenia w tym widoku."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Łącznik"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Szerokość kolumny"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Widok karty"
@@ -3067,17 +3232,17 @@ msgstr "Widok karty"
 msgid "GTK Tree View"
 msgstr "Widok drzewiasty GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test przeformatowania"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Powinno to przetestować element przeformatowania"
 
@@ -3101,6 +3266,11 @@ msgstr "Importer VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Wydrukuj kopertę"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Wydrukuj kontakty"
@@ -3110,11 +3280,6 @@ msgstr "Wydrukuj kontakty"
 msgid "Print contact"
 msgstr "Wydrukuj kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Wydrukuj kopertę"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
@@ -3299,6 +3464,20 @@ msgstr "Test drukowania kontaktów"
 msgid "This should test the contact print code"
 msgstr "Powinno to przetestować kod drukowania kontaktu"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Nie można pobrać listy książek adresowych"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "nie można otworzyć książki"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Podaj plik wyjściowy zamiast standardowego wyjścia"
@@ -3358,20 +3537,6 @@ msgstr "W trybie zwykłym, nie potrzeba opcji rozmiaru."
 msgid "Impossible internal error."
 msgstr "Nieprawdopodobny błąd wewnętrzny."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Nie można pobrać listy książek adresowych"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "nie można otworzyć książki"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Błąd przy odczycie domyślnej książki adresowej."
@@ -3388,6 +3553,269 @@ msgstr "Nie podano nazwy pliku."
 msgid "Unnamed List"
 msgstr "Lista kontaktów bez nazwy"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Nie usuwaj"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Adresat:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Czy na pewno chcesz usunąć %d zadanie?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Czy na pewno chcesz usunąć %d wpis dziennika?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Czy na pewno chcesz usunąć %d termin?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Termin"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Czy chcesz zapisać zmiany?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Porzuć zmiany"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Zapisz wiadomość"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Wyślij"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Druid importu plików vCalendar dla Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3398,29 +3826,93 @@ msgid "Split Multi-Day Events:"
 msgstr "Dzielenie zdarzeń wielodniowych:"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "Nie można uruchomić serwera wombat"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nie można uruchomić wombata"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "Nie można uruchomić serwera wombat"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie można odczytać bloku aplikacji kalendarza Pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Domyślny priorytet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie można odczytać bloku aplikacji \"do zrobienia\" Pilota"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendarz i zadania"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendarze"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendarz i zadania Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola konfiguracji kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Edytor kalendarza/zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponent kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponent zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zadania"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Kalendarze"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zadania"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+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
 msgid "Starting:"
 msgstr "Rozpoczęcie:"
@@ -3518,10 +4010,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przyszłości."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
@@ -3664,8 +4152,28 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Określa, czy wyświetlać numery tygodni w przeglądarce dat"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Zestawienie zawiera"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis zawiera"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentarz zawiera"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Położenie zawiera"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Niedopasowane"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3687,7 +4195,7 @@ msgid "Purge events older than"
 msgstr "Usunięcie zdarzeń starszych niż"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dni"
@@ -3698,12 +4206,8 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3752,64 +4256,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Brak dostępnego kalendarza do utworzenia zdarzeń i spotkań"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Wybrany kalendarz jest tylko do odczytu, nie można tworzyć zdarzeń. Wybierz "
-"kalendarz z możliwością zapisu."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "Spot_kanie"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o spotkanie"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin całodniowy"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alendarz"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendarz"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
@@ -3839,26 +4331,6 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Położenie zawiera"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Niedopasowane"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Błąd podczas otwierania kalendarza"
@@ -3876,215 +4348,135 @@ msgstr "Brak uprawnień do otwarcia kalendarza"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Ustawienia alarmu dźwiękowego"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Ustawienia alarmu z komunikatem"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Ustawienia alarmu z wysłaniem listu"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Ustawienia alarmu z uruchomieniem programu"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Ustawienia nieznanego alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Powtórzenia alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Wyświetlany komunikat:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Treść wysyłanego listu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Odtworzenie dźwięku:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Powtarzanie alarmu"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Uruchamiany program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Adresat:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Argumenty programu:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alarmy</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "dodatkowych razy co"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opcje listy zadań</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
-msgid "hours"
-msgstr "godzin"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Główne</b>"
 
-# FIXME - nie mam koncepci na trigger/spust?
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "Akcja/Uaktywnienie"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Dodawanie kalendarza"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Tworzenie listu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Proste"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Czas:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Wiadomości"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Odtworzenie dźwięku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Wyświetlenie alarmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Przypomnienia"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Uruchomienie programu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Adresat:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Wysłanie listu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zestawienie:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Konto:"
+
+# FIXME - sprawdzić formę
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Uruchamiany program"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Powtarzanie alarmu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcje..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Wyś_lij"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "przed"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "koniec terminu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "dodatkowych razy co"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "godzin"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "godzin"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "początek terminu"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Należy podać położenie kalendarza."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Położenie źródła \"%s\" nie jest poprawne."
-
-# FIXME - webcal - ma ktoś pomysł?
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Położenie źródła \"%s\" nie jest źródłem kalendarza sieciowego."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Źródło o nazwie \"%s\" już istnieje w wybranej grupie"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
-"kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Dodawanie kalendarza"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Dodawanie grupy zadań"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "K_olor:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:111
-msgid "Pick a color"
-msgstr "Wybór koloru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Dodaj kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Dodaj grupę"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Odświeżanie:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Rodzaj:"
+# FIXME - nie mam koncepci na trigger/spust?
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Akcja/Uaktywnienie"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "Adr_es URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "tygodni"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarm o %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4184,7 +4576,7 @@ msgid "Display"
 msgstr "Wyświetlanie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "U_aktywnij"
 
@@ -4193,7 +4585,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publikowanie informacji o zajętości"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piątek"
@@ -4207,7 +4599,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Poniedziałek"
@@ -4217,7 +4609,7 @@ msgid "S_un"
 msgstr "_Nie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sobota"
@@ -4231,7 +4623,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Niedziela"
@@ -4245,7 +4637,7 @@ msgid "T_hu"
 msgstr "_Czw"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Czwartek"
@@ -4259,7 +4651,7 @@ msgid "Time format:"
 msgstr "Format czasu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Środa"
@@ -4269,7 +4661,7 @@ msgid "W_eek starts:"
 msgstr "Początek _tygodnia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Środa"
@@ -4302,8 +4694,9 @@ msgstr "_Kompresowanie weekendów na widoku miesięcznym"
 msgid "_Day begins:"
 msgstr "Początek _dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:10
-#: mail/mail-config.glade.h:163 ui/evolution-addressbook.xml.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 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:43
@@ -4353,6 +4746,75 @@ msgstr "Ś_ro"
 msgid "before every appointment"
 msgstr "przed każdym terminem"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Należy podać położenie kalendarza."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Położenie źródła \"%s\" nie jest poprawne."
+
+# FIXME - webcal - ma ktoś pomysł?
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Położenie źródła \"%s\" nie jest źródłem kalendarza sieciowego."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Źródło o nazwie \"%s\" już istnieje w wybranej grupie"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
+"kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Dodawanie kalendarza"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Dodawanie grupy zadań"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "K_olor:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Wybór koloru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Dodaj kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Dodaj grupę"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Odświeżanie:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Rodzaj:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "Adr_es URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "tygodni"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Zdarzenie zostało usunięte."
@@ -4397,81 +4859,75 @@ msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+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:2258
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Zakończone "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Zakończone"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Należne "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Należne "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Zapisz jako..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Nie można użyć bieżącej wersji!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-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:2258
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Zakończone "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Zakończone"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Należne "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Należne "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Nie można otworzyć źródła"
@@ -4533,8 +4989,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Nie można usunąć elementu na skutek błędu"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Książka adresowa..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakty"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4544,165 +5001,223 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "Przypomnienie"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Rekurencja"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Ułożenie"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Spotkanie"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Zdarzenie bez daty rozpoczęcia"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Zdarzenie bez daty zakończenia"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Data końcowa jest niepoprawna"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Czas początkowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Czas końcowy jest niepoprawny"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nie można otworzyć kalendarza \"%s\"."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "przed każdym terminem"
+msgstr[1] "przed każdym terminem"
+msgstr[2] "przed każdym terminem"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "koniec terminu"
+msgstr[1] "koniec terminu"
+msgstr[2] "koniec terminu"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "przed każdym terminem"
+msgstr[1] "przed każdym terminem"
+msgstr[2] "przed każdym terminem"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Wydarzenie całodni_owe"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "przed każdym terminem"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Z_ajęty"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "przed każdym terminem"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorie..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "przed każdym terminem"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Lista zadań</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasyfikacja"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Czas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Po_ufny"
+msgid "A_ll day event"
+msgstr "Wydarzenie całodni_owe"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data i czas"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Zapisz dostosowany widok..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Wolny"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorie..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "P_ołożenie:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendarz:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "P_rywatny"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasyfikacja"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_bliczny"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Tajny"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Forma wyświetlania czasu"
+msgid "L_ocation:"
+msgstr "P_ołożenie:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Prywatny"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publiczny"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Forma wyświetlania czasu"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Wy_czyść"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Czas zakończenia:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Cza_s rozpoczęcia:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Brak"
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Wybrany organizator nie posiada już konta."
 
-#: calendar/gui/dialogs/meeting-page.c:428
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Wymagany jest organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Usuń"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4748,6 +5263,7 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
@@ -4756,21 +5272,30 @@ msgid "Status"
 msgstr "Stan"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Dodaj uczes_tnika"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alarmy</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Dodaj uczestników z książki adresowej."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Inne</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Zmień organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakty"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Zmień organizatora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4837,150 +5362,140 @@ msgstr "Ta i przyszłe instancje"
 msgid "All Instances"
 msgstr "Wszystkie instancje"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Termin zawiera powtórzenia, których nie można zmieniać za pomocą Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Okresowa data jest niepoprawna"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "pierwszy"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "drugi"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Inna data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dzień"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "w"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "wystąpienia"
 
-#: calendar/gui/dialogs/recurrence-page.c:2364
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/Czas"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Wyjątki"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Podgląd</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Rekurencja"
+
 # FIXME - sprawdzić formę
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Każde"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Wyjątki"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Podgląd"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Reguła powtarzalności"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "D_owolna powtarzalność"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Z_mień"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Brak powtarzalności"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Usuń"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "P_rosta powtarzalność"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "dla"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "zawsze"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "miesięcy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "aż do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "tygodni"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "lat"
 
 # FIXME - A może Wybór miejsca docelowego?
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Wybierz miejsce docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "Miejsce _docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista zadań"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Data zakończenia jest niepoprawna"
 
-# FIXME - sprawdzić formę!!!!
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Czcinki wiadomości</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Ukończenia"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alarmy</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4994,8 +5509,8 @@ msgstr "Wysoki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "W trakcie"
@@ -5007,22 +5522,22 @@ msgid "Low"
 msgstr "Niski"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Zwykły"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nie uruchomiony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Postęp"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Procent zakończenia: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5045,36 +5560,42 @@ msgstr "_Stan:"
 msgid "_Web Page:"
 msgstr "Witryna _web:"
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zadanie"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Przyporządkowanie"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie można otworzyć zadań w \"%s\"."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Taj_ny"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opcje</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Usuwanie poczty</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:72
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Folder:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Data _rozpoczęcia:"
@@ -5083,52 +5604,58 @@ msgstr "Data _rozpoczęcia:"
 msgid "_Due date:"
 msgstr "_Czas zakończenia:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Dane uwierzytelniania serwera HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Kalendarze wybrane do publikacji"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opcje kalendarza</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Codziennie"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Częstotliwość publikacji"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Edytor zajętości"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Położenie publikacji informacji o zajętości"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Położenie publikacji informacji o zajętości"
+msgid "Free/Busy Editor"
+msgstr "Edytor zajętości"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nazwa użytkownika:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Codziennie"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Hasło:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Poczta"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Częstotliwość publikacji"
+#, fuzzy
+msgid "_Password:"
+msgstr "Hasło:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Zapamiętanie hasła"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "Adres URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nazwa _użytkownika:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publikacja ręczna"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Co tydzień"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5215,7 +5742,7 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2350
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknij, aby otworzyć %s"
@@ -5224,6 +5751,11 @@ msgstr "Kliknij, aby otworzyć %s"
 msgid "Untitled"
 msgstr "Bez nazwy"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zestawienie:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5247,20 +5779,93 @@ msgstr "Priorytet:"
 msgid "Web Page:"
 msgstr "Witryna WWW:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Publiczny"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data zakończenia"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Prywatny"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data rozpoczęcia"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Tajny"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Zestawienie"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Wolny"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zajęty"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Położenie geograficzne musi być podane w formacie: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Tak"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nie"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Powtarzanie"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Przyporządkowano"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5306,15 +5911,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Wolny"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "Zajęty"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
@@ -5325,7 +5921,7 @@ msgstr "Aktualizowanie obiektów"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -5335,7 +5931,7 @@ msgstr "_Otwórz stronę WWW"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
@@ -5358,7 +5954,7 @@ msgstr "_Wytnij"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5389,10 +5985,25 @@ msgstr "_Oznacz jako zakończone"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Oznacz zadania jako zakończone"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Usuń"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Usuń zaznaczone zadania"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Zapisz jako..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5424,11 +6035,6 @@ msgstr "Priorytet"
 msgid "Start date"
 msgstr "Data rozpoczęcia"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Zestawienie"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Porządek zadań"
@@ -5505,95 +6111,13 @@ msgstr "_Przejdź do daty..."
 msgid "_Settings..."
 msgstr "_Ustawienia..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Data zakończenia"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "Data rozpoczęcia"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1173
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1117
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Powtarzanie"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Przyporządkowano"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Tak"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nie"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Położenie geograficzne musi być podane w formacie: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5610,43 +6134,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i-minutowe przedziały czasu"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i-minutowe przedziały czasu"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5786,7 +6303,7 @@ msgstr "Aktualizacja"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6003,55 +6520,39 @@ msgstr "Załącznik nie zawiera dających się wyświetlić elementów kalendarz
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-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:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 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:1831
+#: calendar/gui/e-itip-control.c:1813
 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:1843
+#: calendar/gui/e-itip-control.c:1825
 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:1862
-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:1865
-msgid "Object could not be found\n"
-msgstr "Nie można odnaleźć obiektu\n"
-
-#: calendar/gui/e-itip-control.c:1868
-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:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "Nie można uaktualnić stanu uczestnika!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Usunięcie zakończone"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
@@ -6080,6 +6581,10 @@ msgstr "Wczytywanie kalendarza"
 msgid "Loading calendar..."
 msgstr "Wczytywanie kalendarza..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Komunikat serwera:"
@@ -6150,7 +6655,7 @@ msgid "Needs Action"
 msgstr "Wymaga działania"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Próbne"
 
@@ -6163,100 +6668,81 @@ msgstr "Oddelegowane"
 msgid "In Process"
 msgstr "W toku"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "Dodaj uczestników z książki adresowej"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "Opcj_e"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Opcje"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Wyświetlanie _tylko godzin roboczych"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Wyświetlanie w pomniejs_zeniu"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Uaktualnij informację o zajętości"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Automatyczny wybór"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Wszyscy _ludzie i jeden zasób"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "Wy_magani ludzie"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Wymagani ludzie i j_eden zasób"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "Czas p_oczątku spotkania:"
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "Czas _końca spotkania:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %d/%m/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6275,9 +6761,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
@@ -6294,15 +6778,6 @@ msgstr "Usuwanie zaznaczonych obiektów..."
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zadania"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "Aktualizowanie zapytania"
@@ -6328,55 +6803,6 @@ msgstr "Otwieranie %s"
 msgid "Purging"
 msgstr "Czyszczenie"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendarz i zadania"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendarz i zadania Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola konfiguracji kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Edytor kalendarza/zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Komponent kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponent zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Kalendarze"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zadania"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Kwiecień"
@@ -6722,10 +7148,6 @@ msgstr "Wybrany miesiąc (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Wybrany rok (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zadanie"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6756,7 +7178,7 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
@@ -6807,35 +7229,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"Wybrana lista zadań jest tylko do odczytu, nie można tworzyć zdarzeń. "
-"Wybierz kalendarz z możliwością zapisu."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Nowa grupa zadań"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Grupa zadań"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Tworzy nową grupę zadań"
 
@@ -8600,41 +9015,6 @@ msgstr "Niepoprawne argumenty funkcji (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Błąd przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nieobsługiwana operacja: dołączenie listu: typ %s"
-
-#: camel/camel-folder.c:1262
-#, 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:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nieobsługiwana operacja: wyszukiwanie według uid: dla %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Przenoszenie listów"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopiowanie listów"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Nauka rozpoznawania śmieci"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Nauka rozpoznawania nie-śmieci"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrowanie nowych wiadomości"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8678,6 +9058,41 @@ msgstr "(match-threads) wymaga folderu"
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nieobsługiwana operacja: dołączenie listu: typ %s"
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nieobsługiwana operacja: wyszukiwanie według uid: dla %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Przenoszenie listów"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopiowanie listów"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Nauka rozpoznawania śmieci"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Nauka rozpoznawania nie-śmieci"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrowanie nowych wiadomości"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8797,6 +9212,27 @@ msgstr "Zaszyfrowana zawartość"
 msgid "Unable to parse message content"
 msgstr "Nie można przeanalizować zawartości listu"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nie można zablokować \"%s\""
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8819,27 +9255,6 @@ msgstr "Uzyskanie blokady za pomocą fcntl(2) nie powiodło się: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomocą flock(2) nie powiodło się: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr ""
-"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nie można zablokować \"%s\""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9097,7 +9512,7 @@ msgstr "Wskazane dane uwierzytelniania są przeterminowane."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowiedź serwera na uwierzytelnienie."
 
@@ -9185,59 +9600,59 @@ msgstr "POP przed SMTP przy użyciu źródła nie będącego typu pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Nie powiodła się kompilacja wyrażenia regularnego: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W adresie URL \"%s\" wymagana jest nazwa użytkownika"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W adresie URL \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W adresie URL \"%s\" wymagana jest ścieżka"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Wyszukiwanie: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: nie można utworzyć  wątku: %"
 "s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: %s: nazwa nie istnieje"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 "Nie można ustalić adresu odpowiadającego nazwie: %s: przyczyna nieznana"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Wyszukiwanie adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: nazwa nie istnieje"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Nie można ustalić adresu odpowiadającego nazwie: przyczyna nieznana"
 
@@ -9309,7 +9724,7 @@ msgstr "Nie można dodać certyfikatu szyfrującego"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Nie można dodać pola CMS SignerInfo"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Nie można utworzyć kontekstu szyfratora"
 
@@ -9393,7 +9808,8 @@ msgstr ""
 "Certyfikacja samej wiadomości, certyfikaty zaimportowane i zweryfikowane"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Nie można odnaleźć deklaracji podpisu"
 
 #: camel/camel-smime-context.c:651
@@ -9406,47 +9822,51 @@ msgid "Decoder failed"
 msgstr "Dekoder zakończył pracę z błędem"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "Nie można odnaleźć certyfikatu dla \"%s\""
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nie można odnaleźć wspólnego algorytmu szyfrowania całości"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Nie można przydzielić miejsca dla klucza szyfrowania całości"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "Nie można utworzyć wiadomości CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Nie można utworzyć pola CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Nie można dołączyć pola CMS EnvelopedData"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Nie można dołączyć obiektu danych CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Nie można utworzyć pola CMS RecipientInfo"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Nie można dodać pola CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Nie można utworzyć kontekstu szyfratora"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Nie można dodać danych do szyfratora"
@@ -9494,7 +9914,8 @@ msgstr "Nie można utworzyć folderu: %s: folder istnieje"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
@@ -9504,7 +9925,7 @@ msgid "Trash"
 msgstr "Śmietnik"
 
 #: camel/camel-store.c:779 mail/em-filter-i18n.h:35
-#: mail/mail-config.glade.h:96 ui/evolution-mail-message.xml.h:48
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Śmieć"
 
@@ -9740,7 +10161,7 @@ msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie można zmienić nazwy folderu %s: Folder nie istnieje"
@@ -9759,8 +10180,8 @@ msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Sprawdzanie nowych listów we wszystkich folderach"
 
@@ -9791,11 +10212,11 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Dla dostępu do serwerów Novell GroupWise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:109
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Hasło"
 
@@ -9812,343 +10233,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista sprawdzania"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Nie powiodło się wysłanie polecenia do serwera IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Nieoczekiwana odpowiedź od serwera IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Nieoczekiwane przywitanie od serwera IMAP %s."
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nie można wybrać folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nie można wybrać folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Serwer IMAP4 %s nieoczekiwanie przerwał połączenie: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "Otrzymano odpowiedź BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:424
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nie można zsynchronizować flag folderu \"%s\": Nieznane"
-
-#: camel/providers/imap4/camel-imap4-folder.c:430
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nie można zsynchronizować flag folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:567
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nie można opróżnić folderu \"%s\": Nieznane"
-
-#: camel/providers/imap4/camel-imap4-folder.c:572
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nie można opróżnić folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:762
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Nie można pobrać listu %s z folderu %s: Nie ma takiej wiadomości"
-
-#: camel/providers/imap4/camel-imap4-folder.c:767
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Nie można pobrać listu %s z folderu %s: Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:892
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nie można dołączyć listu do folderu \"%s\": Nieznany błąd"
-
-#: camel/providers/imap4/camel-imap4-folder.c:921
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nie można dołączyć listu do folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1000
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Nieznany"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Nieznany"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1012
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Błędne "
-"polecenie"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1016
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Błędne "
-"polecenie"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Foldery"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Przestrzeń nazw"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr ""
-"Przeglądanie i przechowywanie poczty na serwerach IMAPv4rev1. "
-"EKSPERYMENTALNE!!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Przy tej opcji połączenie z serwerem IMAPv4rev1 nastąpi przy użyciu hasła w "
-"postaci czystego tekstu."
-
-#: camel/providers/imap4/camel-imap4-store.c:173
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Serwer IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:175
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "usługa IMAP dla %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:216
-#: camel/providers/imap4/camel-imap4-store.c:233
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nie można nawiązać połączenia z %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nie jest dostępny"
-
-#: camel/providers/imap4/camel-imap4-store.c:230
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Anulowano połączenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:269
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: "
-"Serwer nie obsługuje STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:294
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nieznany błąd"
-
-#: camel/providers/imap4/camel-imap4-store.c:381
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nie można uwierzytelnić w serwerze IMAP %s przy użyciu mechanizmu "
-"uwierzytelniania %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:426
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPodaj hasło IMAP dla %s na serwerze %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:500
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nie można uwierzytelnić na serwerze IMAP %s przy użyciu %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:731
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nie można pobrać folderu \"%s\" na serwerze IMAP %s: Nieznany"
-
-#: camel/providers/imap4/camel-imap4-store.c:793
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:837
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nie można utworzyć folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:842
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nie można utworzyć folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:870
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nie można usunąć folderu \"%s\": Folder specjalny"
-
-#: camel/providers/imap4/camel-imap4-store.c:903
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nie można usunąć folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:908
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nie można usunąć folderu \"%s\": Niepoprawne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:928
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Folder specjalny"
-
-#: camel/providers/imap4/camel-imap4-store.c:960
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr ""
-"Nie można zmienić nazwy folderu \"%s\" na \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:965
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1171
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"Nie można pobrać informacji %s dla wzorca \"%s\" na serwerze IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1173
-msgid "Bad command"
-msgstr "Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1235
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nie można zasubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:1240
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nie można zasubskrybować folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-store.c:1285
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nie można odsubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
-
-#: camel/providers/imap4/camel-imap4-store.c:1290
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nie można odsubskrybować folderu \"%s\": Błędne polecenie"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Nieoczekiwan odpowiedź od serwera IMAP %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "Brak danych"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Serwer IMAP %s nieoczekiwanie przerwał połączenie: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwał połączenie: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10217,7 +10323,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10288,6 +10394,27 @@ msgstr "Użycie własnego polecenie do połączenia z serwerem"
 msgid "Command:"
 msgstr "Polecenie:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Foldery"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10309,43 +10436,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Przeglądanie i przechowywanie poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Serwer IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "usługa IMAP dla %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nie można nawiązać połączenia z %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nie jest dostępny"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Anulowano połączenie"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Rozszerzenie SSL/TLS nie jest obsługiwane."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Negocjacja SSL nie powiodła się"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nie można nawiązać połączenia poleceniem \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obsługuje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obsługi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj hasło IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasła."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10356,30 +10533,275 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrzędny nie może zawierać folderów podrzędnych"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nie można utworzyć folderu \"%s\": folder istnieje."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrzędny: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nie powiodło się wysłanie polecenia do serwera IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Nieoczekiwana odpowiedź od serwera IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Nieoczekiwane przywitanie od serwera IMAP %s."
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nie można wybrać folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nie można wybrać folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Serwer IMAP4 %s nieoczekiwanie przerwał połączenie: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Otrzymano odpowiedź BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nie można zsynchronizować flag folderu \"%s\": Nieznane"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nie można zsynchronizować flag folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nie można opróżnić folderu \"%s\": Nieznane"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nie można opróżnić folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Nie można pobrać listu %s z folderu %s: Nie ma takiej wiadomości"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Nie można pobrać listu %s z folderu %s: Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nie można dołączyć listu do folderu \"%s\": Nieznany błąd"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nie można dołączyć listu do folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Nieznany"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Nieznany"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie można przenieść listu z folderu \"%s\" do folderu \"%s\": Błędne "
+"polecenie"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie można skopiować listu z folderu \"%s\" do folderu \"%s\": Błędne "
+"polecenie"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+"Przeglądanie i przechowywanie poczty na serwerach IMAPv4rev1. "
+"EKSPERYMENTALNE!!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Przy tej opcji połączenie z serwerem IMAPv4rev1 nastąpi przy użyciu hasła w "
+"postaci czystego tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: "
+"Serwer nie obsługuje STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nie można uwierzytelnić w serwerze IMAP %s przy użyciu mechanizmu "
+"uwierzytelniania %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPodaj hasło IMAP dla %s na serwerze %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nie można uwierzytelnić na serwerze IMAP %s przy użyciu %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nie można pobrać folderu \"%s\" na serwerze IMAP %s: Nieznany"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nie można utworzyć folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nie można usunąć folderu \"%s\": Folder specjalny"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nie można usunąć folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nie można usunąć folderu \"%s\": Niepoprawne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Folder specjalny"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr ""
+"Nie można zmienić nazwy folderu \"%s\" na \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nie można zmienić nazwy folderu \"%s\" na \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Nie można pobrać informacji %s dla wzorca \"%s\" na serwerze IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nie można zasubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nie można zasubskrybować folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nie można odsubskrybować folderu \"%s\": Niepoprawna nazwa skrzynki"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nie można odsubskrybować folderu \"%s\": Błędne polecenie"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Nieoczekiwan odpowiedź od serwera IMAP %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Brak danych"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serwer IMAP %s nieoczekiwanie przerwał połączenie: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10554,18 +10976,26 @@ msgstr "Nie można zapisać zestawienia: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie można dodać listu do zestawienia: przyczyna nieznana"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Nadchodzące"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Anulowano dołączenie listu do katalogu Maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie można dołączyć listu do folderu w formacie maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10581,50 +11011,50 @@ msgstr ""
 "Nie można pobrać listu: %s z folderu %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Niepoprawna zawartość listu"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nie można pobrać folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Nie można pobrać folderu \"%s\": folder nie istnieje."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nie można utworzyć folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 "Nie można pobrać folderu \"%s\": nie jest katalogiem z listami w formacie "
 "maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie można usunąć folderu \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11189,7 +11619,7 @@ msgstr "Usuwanie po %s dniach"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bez obsługi jakichkolwiek rozszerzeń POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11221,21 +11651,26 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nie można nawiązać połączenia z serwerem POP %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s w trybie bezpiecznym: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nie można nawiązać połączenia z serwerem POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11244,29 +11679,29 @@ msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s: Brak obsługi wymaganego "
 "mechanizmu uwierzytelniania."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Nie powiodło się logowanie SASL \"%s\" na serwerze POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Nie można zalogować się na serwerze POP %s: błąd na poziomie protokołu SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPodaj hasło POP dla %s na serwerze %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11275,13 +11710,22 @@ msgstr ""
 "Nie można nawiązać połączenia z serwerem POP %s.\n"
 "Wystąpił błąd przy wysyłaniu hasła: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem POP %s.\n"
+"Wystąpił błąd przy wysyłaniu hasła: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11337,7 +11781,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:123
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11670,74 +12114,6 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wyświetlenia załącznika"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"podpisującego dla tego konta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"szyfrującego dla tego konta"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nie można pobrać listu z edytora"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "List bez tytułu"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otwarcie pliku"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Wygenerowany automatycznie"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> załączony plik"
-msgstr[1] "<b>%d</b> załączone pliki"
-msgstr[2] "<b>%d</b> załączonych plików"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3212
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3104
-#: composer/e-msg-composer.c:3105
-msgid "Compose a message"
-msgstr "Tworzenie listu"
-
-#: composer/e-msg-composer.c:4258
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
-"modyfikacjom.)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cel wysyłania"
@@ -11817,17 +12193,93 @@ msgstr "Kliknij aby wybrać foldery do których wysłać"
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"podpisującego dla tego konta"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"szyfrującego dla tego konta"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nie można pobrać listu z edytora"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "List bez tytułu"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otwarcie pliku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Wygenerowany automatycznie"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> załączony plik"
+msgstr[1] "<b>%d</b> załączone pliki"
+msgstr[2] "<b>%d</b> załączonych plików"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Tworzenie listu"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Przesłany list - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Załączenie oryginalnego listu"
+msgstr[1] "Załączenie oryginalnego listu"
+msgstr[2] "Załączenie oryginalnego listu"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
+"modyfikacjom.)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Nie można załączyć do tego listu pliku \"{0}\"."
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11849,18 +12301,32 @@ msgstr ""
 "pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i "
 "załączyć je."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nie można utworzyć wiadomości."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Ponieważ \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Znaleziono niedokończone listy"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Czy chcesz odtworzyć niedokończony list?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11868,38 +12334,38 @@ msgstr ""
 "Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowego "
 "listu. Odtworzenie listu pozwoli na kontynuację pracy w tym samym miejscu."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Nie odtwarzaj"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Odtwórz"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nie można zapisać do pliku autozapisu \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Błąd zapisu do pliku autozapisu z powodu \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Uwaga: Zmodyfikowany list"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Czy na pewno chcesz porzucić pisany właśnie list o tytule \"{0}\"?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11909,64 +12375,48 @@ msgstr ""
 "chyba, że zostanie wybrany zapis wiadomości w folderze szkiców. Pozwoli to "
 "na późniejsze kontynuowanie wiadomości."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Porzuć zmiany"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Zapisz wiadomość"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Nie można utworzyć wiadomości."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Ponieważ \"{0}\", możesz potrzebować wybrać inne opcje poczty."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nie można odczytać pliku z podpisem \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Ponieważ \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Wszystkie konta zostały usunięte."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Przed wysłaniem listu należy skonfigurować konto."
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
-#: composer/mail-composer-errors.xml.h:44
 #: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
 msgstr "Nie można utworzyć okna tworzenia listu."
 
 #. mail-composer:no-address-control secondary
-#: composer/mail-composer-errors.xml.h:46
+#: composer/mail-composer-errors.xml.h:50
 msgid "Unable to activate the address selector control."
 msgstr "Nie można uaktywnić formantu wyboru adresu."
 
 #. mail-composer:no-editor-control secondary
-#: composer/mail-composer-errors.xml.h:50
+#: composer/mail-composer-errors.xml.h:54
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -12132,16 +12582,12 @@ msgstr "Kategorie synchronizacji:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12193,31 +12639,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12317,7 +12755,6 @@ msgid "Missing file name."
 msgstr "Brakująca nazwa pliku."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Należy podać nazwę pliku."
@@ -12338,7 +12775,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Nie można skompilować wyrażenia regularnego \"{1}\"."
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Brakująca nazwa."
@@ -12362,6 +12798,72 @@ msgstr "Wybierz inną nazwę."
 msgid "Choose a file"
 msgstr "Wybór pliku"
 
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Ważne"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Do zrobienia"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "Później"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Nazwa reguły:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Jeżeli</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "przy spełnieniu wszystkich kryteriów"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "przy spełnieniu któregokolwiek z kryteriów"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Wykonywanie czynności"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr "Wszystkie powiązane"
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr "Odpowiedzi"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr "Odpowiedzi i nadrzędne"
+
+# FIXME - czy też załącza
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr "Wątki"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "przychodzące"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "wychodzące"
+
 #: filter/filter.glade.h:1
 msgid "<b>_Filter Rules</b>"
 msgstr "<b>R_eguły filtrów</b>"
@@ -12410,7 +12912,7 @@ msgstr "temu"
 msgid "months"
 msgstr "miesięcy"
 
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:185
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekund"
 
@@ -12426,83 +12928,83 @@ msgstr "podanym czasem"
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:94
-msgid "Important"
-msgstr "Ważne"
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Dodaj regułę"
 
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
-#: mail/mail-config.glade.h:149
-msgid "To Do"
-msgstr "Do zrobienia"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Zmodyfikuj regułę"
 
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
-#: mail/mail-config.glade.h:98
-msgid "Later"
-msgstr "Później"
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Nazwa reguły"
 
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
 
-#: filter/filter-rule.c:790
-msgid "Rule name:"
-msgstr "Nazwa reguły:"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferencje edytora listów"
 
-#: filter/filter-rule.c:817
-msgid "<b>If</b>"
-msgstr "<b>Jeżeli</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
+"wyświetlania"
 
-#: filter/filter-rule.c:854
-msgid "if all criteria are met"
-msgstr "przy spełnieniu wszystkich kryteriów"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
 
-#: filter/filter-rule.c:854
-msgid "if any criteria are met"
-msgstr "przy spełnieniu któregokolwiek z kryteriów"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguracja kont pocztowych"
 
-#: filter/filter-rule.c:856
-msgid "Execute actions"
-msgstr "Wykonywanie czynności"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Poczta Evolution"
 
-#: filter/filter-rule.c:877
-msgid "All related"
-msgstr "Wszystkie powiązane"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola konfiguracji kont pocztowych Evolution"
 
-#: filter/filter-rule.c:877
-msgid "Replies"
-msgstr "Odpowiedzi"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponent poczty programu Evolution"
 
-#: filter/filter-rule.c:877
-msgid "Replies and parents"
-msgstr "Odpowiedzi i nadrzędne"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Edytor listów programu Evolution"
 
-# FIXME - czy też załącza
-#: filter/filter-rule.c:879
-msgid "Include threads"
-msgstr "Wątki"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
 
-#: filter/filter-rule.c:974
-msgid "incoming"
-msgstr "przychodzące"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola preferencji poczty Evolution"
 
-#: filter/filter-rule.c:974
-msgid "outgoing"
-msgstr "wychodzące"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Poczta"
 
-#: filter/rule-editor.c:285
-msgid "Add Rule"
-msgstr "Dodaj regułę"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Konta pocztowe"
 
-#: filter/rule-editor.c:361
-msgid "Edit Rule"
-msgstr "Zmodyfikuj regułę"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Ustawienia poczty"
 
-#: filter/rule-editor.c:685
-msgid "Rule name"
-msgstr "Nazwa reguły"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Poczta"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12557,7 +13059,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "R_eguły filtrów"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:492
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Wybór folderu"
@@ -12691,7 +13193,7 @@ msgstr "nie jest oznaczony"
 msgid "Junk Test"
 msgstr "Test śmieci"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etykieta"
@@ -12797,8 +13299,8 @@ msgstr "rozpoczyna się od"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -12844,7 +13346,7 @@ msgstr "<kliknij, aby wybrać folder> "
 msgid "Create New Folder"
 msgstr "Tworzenie nowego folderu"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Określ miejsce utworzenia folderu:"
@@ -12857,440 +13359,279 @@ msgstr "Utwórz"
 msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFoldery"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NIEPASUJĄCE"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Wczytywanie..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Przenoszenie folderu %s"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiowanie folderu %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Przenoszenie listów do folderu %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiowanie listów do folderu %s"
 
 # FIXME - ma ktoś coś lepszego?
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można upuścić listu w głównym folderze"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "P_rzenieś do folderu"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Anuluj p_rzeciąganie"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Wybór folderu"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "Sk_opiuj"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Tworzenie folderu \"%s\""
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Tworzenie folderu"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Zmień nazwę folderu"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Widok"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "S_kopiuj..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "_Przenieś..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nowy folder..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "_Zmień nazwę..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:869
-msgid "VFolders"
-msgstr "VFoldery"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NIEPASUJĄCE"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Nadchodzące"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Wczytywanie..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "Poczta"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Prześlij"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Po_dążaj..."
 
 # FIXME - upewnić się, że tak a nie inaczej :)
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Oznacz jako zakończone"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "O_znacz jako przeczytane"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako nieważne"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Oznacz jako ś_mieci"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenieś do folderu..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Zastosuj fi_ltry"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltruj śmieci"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie listu"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcę"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorców"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listę dyskusyjną"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcę"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorców"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stę dyskusyjną"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:69
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Domyślne"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/em-folder-view.c:2080
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
 # FIXME - Nie mam pewności , że to o to idzie
-#: mail/em-folder-view.c:2345
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknij aby wysłać %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odpowiedź do"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Dla"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupy nowin"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "Załącznik: %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
-"szyfrowanych"
-
-#: mail/em-format.c:1279
-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.c:1298
-msgid "Unsupported signature format"
-msgstr "Nieobsługiwany format podpisu"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Błąd weryfikacji podpisu"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nieznany błąd weryfikacji podpisu"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Pobieranie \"%s\""
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Niepodpisana"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Podpis prawidłowy"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Nieprawidłowy podpis"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Poprawny podpis ale nie można zweryfikować nadawcy"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Niezaszyfrowana"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Zaszyfrowana, słabo"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Zaszyfrowana"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Zaszyfrowana, silnie"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Niepoprawna forma części external-body."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Wskaźnik do witryny FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Wskaźnik do lokalnego pliku (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Wskaźnik na zdalne dane (%s)"
-
-#: mail/em-format-html.c:895
-#, 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:1137
-msgid "Formatting message"
-msgstr "Formatowanie listu"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:939
-msgid "Mailer"
-msgstr "Program pocztowy"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Dopasowania: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Niepodpisana"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13298,7 +13639,11 @@ msgstr ""
 "Wiadomość nie jest podpisana. Nie ma gwarancji, że ta wiadomość jest "
 "autentyczna."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Podpis prawidłowy"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13306,7 +13651,11 @@ msgstr ""
 "Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że list jest "
 "autentyczny."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Nieprawidłowy podpis"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13314,11 +13663,11 @@ msgstr ""
 "Nie można zweryfikować podpisu wiadomości, list mógł być naruszony podczas "
 "transmisji."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13326,7 +13675,11 @@ msgstr ""
 "Wiadomość ta jest podpisana poprawnym podpisem, ale nadawca tego listu nie "
 "może być zweryfikowany."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Niezaszyfrowana"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13334,7 +13687,11 @@ msgstr ""
 "Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być podglądnięta "
 "podczas transmisji przez Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Zaszyfrowana, słabo"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13344,7 +13701,11 @@ msgstr ""
 "obcej będzie trudno, ale nie niemożliwie podejrzeć w konkretnym czasie "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Zaszyfrowana"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13352,7 +13713,11 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Zaszyfrowana, silnie"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13361,40 +13726,165 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana silnym algorytmem szyfrującym. Osobie obcej "
 "będzie bardzo trudno w konkretnym czasie podejrzeć zawartość tego listu."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Tego certyfikatu nie można wyświetlić"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ukończone %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Zaległe:"
 
 # FIXME - sprawdzić czy ma być na pawno "od"
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "od %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Wyświetlenie w treści listu"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Pobieranie \"%s\""
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Poprawny podpis ale nie można zweryfikować nadawcy"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Niepoprawna forma części external-body."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Wskaźnik do witryny FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Wskaźnik do lokalnego pliku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Wskaźnik na zdalne dane (%s)"
+
+#: mail/em-format-html.c:895
+#, 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:1137
+msgid "Formatting message"
+msgstr "Formatowanie listu"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odpowiedź do"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Dla"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Program pocztowy"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Grupy nowin"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "Załącznik: %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
+"szyfrowanych"
+
+#: mail/em-format.c:1279
+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.c:1298
+msgid "Unsupported signature format"
+msgstr "Nieobsługiwany format podpisu"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Błąd weryfikacji podpisu"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nieznany błąd weryfikacji podpisu"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (wbudowany)"
@@ -13507,7 +13997,7 @@ msgstr "Wyślij _list do..."
 msgid "_Add to Addressbook"
 msgstr "Dodaj d_o książki adresowej"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
@@ -13555,7 +14045,7 @@ msgstr "Dodanie adresu"
 
 # FIXME - upewnić się co to jest
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Listów z %s"
@@ -13564,11 +14054,11 @@ msgstr "Listów z %s"
 msgid "Virtual _Folders"
 msgstr "W_irtualne foldery"
 
-#: mail/em-vfolder-rule.c:492
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: mail/em-vfolder-rule.c:572
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "Źródło VFolderów"
 
@@ -14047,64 +14537,33 @@ msgstr "portu uruchamianego przez użytkownika spamd"
 msgid "spamd port"
 msgstr "port spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Preferencje edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
-"wyświetlania"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Konfiguracja kont pocztowych"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Poczta Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola konfiguracji kont pocztowych Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponent poczty programu Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importer Elm Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Edytor listów programu Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Druid importu poczty Netscape dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola preferencji poczty Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Druid importu poczty Pine dla Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Konta pocztowe"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importer mbox Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:100
-msgid "Mail Preferences"
-msgstr "Ustawienia poczty"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Poczta"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbox)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14162,34 +14621,6 @@ msgstr "Importowanie \"%s\""
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importer Elm Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Druid importu poczty Netscape dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Druid importu poczty Pine dla Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importer mbox Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbox)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14323,15 +14754,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Umowa licencyjna %s"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:168
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Nazwa ser_wera:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:152
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:174
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
@@ -14444,15 +14875,7 @@ msgstr "Tworzy nowy folder poczty"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nie powiodło się zaktualizowanie ustawień poczty lub folderów."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Sprawdzanie usługi"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Nawiązywanie połączenia z serwerem..."
-
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:93
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Tożsamość"
 
@@ -14467,7 +14890,7 @@ msgstr ""
 "znajdujące się w nich informacje były zawarte w wysyłanych listach."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
@@ -14484,7 +14907,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Wybierz spośród poniższych opcji"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:132
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Wysyłanie listów"
 
@@ -14497,7 +14920,7 @@ msgstr ""
 "pewności co do tych informacji, zapytaj administratora lub dostawcę "
 "Internetu (ISP)."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:38
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Zarządzanie kontami"
 
@@ -14515,7 +14938,15 @@ msgstr ""
 "tego konta. Nazwa będzie używana tylko przy wyświetlaniu celem odróżnienia "
 "go od innych kont."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sprawdzanie usługi"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Nawiązywanie połączenia z serwerem..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
 
@@ -14523,10 +14954,6 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr " _Sprawdź obsługiwane typy "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Podgląd</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>Ta kopia Evolution nie obsługuje protokołu SSL</b>"
@@ -14540,216 +14967,212 @@ msgid "<b>_Languages</b>"
 msgstr "<b>Języ_ki</b>"
 
 #: mail/mail-config.glade.h:8
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Źródła vFolderów</b>"
-
-#: mail/mail-config.glade.h:9
 msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 "<small>Spowoduje to pewniejsze, ale również wolniejsze działanie filtru</"
 "small>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informacje o koncie</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alarmy</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Rodzaj uwierzytelniania</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Uwierzytelnianie</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Sprawdzanie nowej poczty</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Tworzenie wiadomości</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguracja</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Domyślne zachowanie</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Usuwanie poczty</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Wyświetlane _nagłówki listów</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opcje filtrów</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Główne</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etykiety i kolory</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Wczytywanie obrazów</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Wyświetlanie wiadomości</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Czcinki wiadomości</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Powiadamianie o nowej poczcie</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informacje dodatkowe</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcje</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Czcionki drukowane</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informacje wymagane</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Bezpieczne MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Bezpieczeństwo</span>"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Listy wysłane i szkice</span>"
 
-#: mail/mail-config.glade.h:35
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Konfiguracja serwera</span>"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów s_zyfrowanie także do siebie"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Edytor kont"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_wy podpis..."
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "_Dodaj treść"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Przy wysyłaniu zaszyfrowanych listów _szyfrowanie zawsze do siebie"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Wy_syłanie kopii (cc) do:"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Wysyłanie niewidocznych kopii listów (_bcc) do:"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:44
 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:46
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Ufanie kluczom we własnej bazie kluczy podczas szyfrowania"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Załączenie oryginalnego listu"
 
-#: mail/mail-config.glade.h:48 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Załącznik"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Automatyczne wstaw_ianie obrazów z buźkami"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Automatyczne sprawdzanie _nowych listów co"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bałtycki (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bałtycki (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "_Brzęczyk po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Zestaw znaków:"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Sprawdź obsługiwane typy "
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:55
 msgid "Check _incoming mail for junk"
 msgstr "_Wyszukiwanie śmieci w nadchodzącej poczcie"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Sp_rawdzanie pisowni podczas pisania"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Wyszukuje śmieci w nadchodzącej poczcie"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Kolor _błędnie napisanych słów:"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Kolory"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "P_otwierdzanie oczyszczenia folderu"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14765,243 +15188,243 @@ msgstr ""
 "\n"
 "Kliknij \"Zastosuj\", aby zapisać ustawienia."
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "D_omyślne"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Domyślne kodowanie z_naków:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Domyślne"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Bez cytowania oryginalnego listu"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:73
 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:75
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotowe"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Folder ze _szkicami:"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Konta pocztowe"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Adres _e-mail:"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "_Opróżnianie folderów śmietnika przy zakończeniu"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "C_ertyfikat szyfrujący:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Druid kont Evolution"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Wykonanie polecenia..."
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "_Stała szerokość:"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Ustawienia czcionek"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Zapis listów w formacie _HTML"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Listy HTML"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Wyróżnianie cytatów za pomocą koloru"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:91
 msgid "I_nclude remote tests"
 msgstr "_Dołączenie zewnętrznych testów"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "W treści listu"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Położenie skrzynki"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Edytor listów"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:104
 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:106
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Organizacja:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _klucza PGP/GPG:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Odtwarzanie dźwięku po otrzymaniu nowej poczty"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:112
 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:114
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Katalog maildir Qmaila"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cytowanie oryginalnego listu"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Jako cytat"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Zapa_miętanie hasła"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "O_dpowiedź do:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opcje odbioru"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Zapamiętanie _hasła"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Zwykła czcionka:"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:125
 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:127
+#: mail/mail-config.glade.h:126
 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:128
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Wybór czcionki o zmiennej szerokości używanej w HTML-u"
 
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:128
 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:130
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Wybierz..."
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Wysyłanie listów"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Folder z _wysłanymi listami:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Serwer wymaga _uwierzytelnienia"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Typ serwera:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Certyfikat szyfr_ujący:"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "_Podpis:"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nazwa p_liku:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standardowy uniksowy plik mbox"
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "_Czcionka terminala:"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "R_odzaj: "
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15011,7 +15434,7 @@ msgstr ""
 "podpis. Wpisana nazwa będzie używana tylko przy\n"
 "wyświetlaniu."
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:147
 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 "
@@ -15021,7 +15444,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:150
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15029,11 +15452,11 @@ 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:153
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Zmienna szerokość:"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15043,101 +15466,202 @@ msgstr ""
 "\n"
 "Aby rozpocząć, kliknij \"Naprzód\"."
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Dodaj podpis"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "Pobieranie obrazów z sieci w _każdym przypadku"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Podpisyw_anie cyfrowe wszystkich wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Bez powiadamiania o nadejściu nowej poczty"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Uaktywnij"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Szyfrowanie wychodzących listów (domyślnie)"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Sposób p_rzesyłania:"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Pobieranie obrazów, jeśli nadawca jest w książce adresowej"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Ustawienie jako konto _domyślne"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "O_znaczanie listów jako \"przeczytane\" po upływie"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Bez pobierania jakichkolwiek obrazów z sieci"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:174
 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:176
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Potwierdzanie przy wysyłaniu listu bez _tematu"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Sposób odpo_wiadania:"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skrypt:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Wyświetlanie _animowanych obrazów"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "Wykorzystanie bezpiecznego połączenia (_SSL):"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Używanie tych samych czcionek co inne aplikacje"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "kolor"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Przeczytaj uważnie umowę licencyjną\n"
+"wyświetloną poniżej dla %s\n"
+"i zaznacz pole wyboru aby ją zaakceptować\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Źródła vFolderów</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Podpis cyfrowy</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Szyfrowanie</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Zaakceptowane"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Za_kończone"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Z rozróżnianiem małych i wielkich liter"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Wyszukiwanie w liście"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Znajdź:"
+
+# FIXME - Albo Zaznacz by kontynuować
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Znacznik kontynuacji"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Subskrypcje folderów"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Umowa licencyjna %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Niczego nie wybrano"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erwer:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informacje o zabezpieczeniach"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Wiadomości wybrane do kontynuacji są wyświetlone pod spodem.\n"
+"Wybierz kontynuuj z menu \"Znacznik\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lista zaakceptowanych licencji"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Wykonianie do:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Znacznik:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Zasubskrybuj"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "O_dsubskrybuj"
+
+#: mail/mail-dialogs.glade.h:30
 msgid "specific folders only"
 msgstr "tylko określone foldery"
 
-#: mail/mail-config.glade.h:187
+#: mail/mail-dialogs.glade.h:31
 msgid "with all active remote folders"
 msgstr "ze wszystkimi aktywnymi zdalnymi folderami"
 
-#: mail/mail-config.glade.h:188
+#: mail/mail-dialogs.glade.h:32
 msgid "with all local and active remote folders"
 msgstr "ze wszystkimi lokalnymi i aktywnymi zdalnymi folderami"
 
-#: mail/mail-config.glade.h:189
+#: mail/mail-dialogs.glade.h:33
 msgid "with all local folders"
 msgstr "ze wszystkimi lokalnymi folderami"
 
@@ -15162,6 +15686,7 @@ msgstr "Logowanie do serwera \"{0}\" jako \"{0}\" nie powiodło się."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15189,8 +15714,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "Wyś_lij"
+msgstr "Wyślij"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15207,7 +15733,6 @@ msgstr ""
 "zawartości listu."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Czy na pewno chcesz wysłać list tylko z ukrytymi adresatami (BCC)?"
@@ -15287,7 +15812,6 @@ msgstr ""
 "\"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "W przypadku kontynuacji, nie będzie możliwości odtworzenia tego listu."
@@ -15316,6 +15840,7 @@ msgstr "Zostały niewysłane listy, czy mimo to chcesz zakończyć program?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15361,21 +15886,6 @@ msgstr "Błąd przy wykonywaniu operacji."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15392,8 +15902,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie można zapisać do katalogu \"{0}\"."
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15430,7 +15938,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nie można usunąć folderu systemowego \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15464,13 +15971,11 @@ msgstr ""
 "zostanie trwale skasowana."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nie można zmienić nazwy \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Folder o nazwie \"{1}\" już istnieje. Użyj innej nazwy."
@@ -15481,25 +15986,21 @@ msgid "Because \"{2}\"."
 msgstr "Ponieważ \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nie można przenieść folderu \"{0}\" do \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Nie można otworzyć źródła \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Nie można otworzyć celu \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nie można skopiować folderu \"{0}\" do \"{1}\"."
@@ -15515,7 +16016,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Nie można otworzyć źródła \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Nie można zapisać zmian do konta."
@@ -15546,8 +16046,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "W przypadku kontynuacji, informacje o koncie będą trwale usunięte."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Nie usuwaj"
+msgstr "_Cofnij usunięcie"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15576,6 +16077,7 @@ msgstr "Porzucić zmiany?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Czy chcesz zapisać zmiany?"
 
@@ -15894,30 +16396,6 @@ msgstr "Odłączanie od %s"
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Z rozróżnianiem małych i wielkich liter"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Wyszukiwanie w liście"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Znajdź:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Podpis cyfrowy</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Szyfrowanie</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informacje o zabezpieczeniach"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Anulowanie..."
@@ -16027,15 +16505,15 @@ msgstr "Aktualizowanie vFolderów dla \"%s:%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Aktualizowanie vFolderów dla \"%s\""
 
-#: mail/mail-vfolder.c:939
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:978
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFolderu"
 
-#: mail/mail-vfolder.c:1062
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
@@ -16169,50 +16647,49 @@ msgstr "Wszystkim"
 msgid "Review"
 msgstr "Recenzja"
 
-# FIXME - Albo Zaznacz by kontynuować
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Znacznik kontynuacji"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Treść zawiera"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Za_kończone"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Treść nie zawiera"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Wiadomości wybrane do kontynuacji są wyświetlone pod spodem.\n"
-"Wybierz kontynuuj z menu \"Znacznik\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Treść lub temat zawiera"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Wykonianie do:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "List zawiera"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Znacznik:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Lista odbiorców zawiera"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Subskrypcje folderów"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Nadawca zawiera"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Niczego nie wybrano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Temat zawiera"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erwer:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Temat nie zawiera"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Zasubskrybuj"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Powłoka Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "O_dsubskrybuj"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Test Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Testowy składnik Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16282,30 +16759,19 @@ msgstr "Określa, czy opuścić ostrzegawcze okno o rozwojowej wersji"
 msgid "mail"
 msgstr "poczta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Nieznany błąd systemowy."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Niepoprawny argumenty"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Nie można dokonać rejestracji na serwerze OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Aktywne połączenia</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Nie odnaleziono bazy danych konfiguracji"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktywne połączenia"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Błąd ogólny"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Kliknij OK, aby zamknąć powyższe połączenia i przejść w tryb bez podłączenia "
+"do sieci"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16491,28 +16957,6 @@ msgstr "Nazwa folderu nie może zawierać znaku \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" są zarezerwowanymi nazwami folderów."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Program Evolution jest obecnie podłączony do sieci. Kliknij na tym przycisku "
-"aby pracować w trybie odłączenia od sieci."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Program Evolution jest w trakcie rozłączania z siecią."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Program Evolution jest obecnie rozłączony. Kliknij na tym przycisku aby "
-"pracować w trybie podłączenia do sieci."
-
-# FIXME - sprawdzić formę!!
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Przełącz do %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
@@ -16546,10 +16990,99 @@ msgstr "Praca _bez podłączenia"
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Program Evolution jest obecnie podłączony do sieci. Kliknij na tym przycisku "
+"aby pracować w trybie odłączenia od sieci."
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Program Evolution jest w trakcie rozłączania z siecią."
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Program Evolution jest obecnie rozłączony. Kliknij na tym przycisku aby "
+"pracować w trybie podłączenia do sieci."
+
+# FIXME - sprawdzić formę!!
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Przełącz do %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Nieznany błąd systemowy."
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Niepoprawny argumenty"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Nie można dokonać rejestracji na serwerze OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Nie odnaleziono bazy danych konfiguracji"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Błąd ogólny"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "Nowy"
 
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Druid ustawień Evolution"
+
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Importowanie plików"
+
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Strefa czasowa"
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Witaj"
+
+#: shell/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 ""
+"Witaj w Evolution. Na kolejnych kilku ekranach możesz podać\n"
+"informacje, które pozwolą na łączenie się z twoimi kontami\n"
+"e-mail oraz na importowanie plików z innych aplikacji.\n"
+"\n"
+"Aby kontynuować, kliknij \"Naprzód\"."
+
+#: shell/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 ""
+"Zostały wprowadzone wszystkie informacje, potrzebne do\n"
+"ustawienia Evolution.\n"
+"\n"
+"Aby zapisać ustawienia, kliknij przycisk \"Zastosuj\"."
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nowy test"
@@ -16562,18 +17095,6 @@ msgstr "_Test"
 msgid "Create a new test item"
 msgstr "Tworzy nowy element testowy"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Powłoka Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Test Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Testowy składnik Evolution"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16635,7 +17156,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Można zaimportować do Evolution dane z następujących plików:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16670,7 +17191,7 @@ msgstr ""
 "Mamy nadzieję, że spodobają ci się wyniki naszej ciężkiej pracy,\n"
 "my zaś będziemy oczekiwać z niecierpliwością na na twoje wsparcie!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16678,40 +17199,40 @@ msgstr ""
 "Dzięki\n"
 "Zespół Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nie informuj mnie ponownie"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Rozpoczyna Evolution aktywując podany komponent"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Rozpoczyna w trybie z podłączeniem"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Wymusza zamknięcie wszystkich komponentów Evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Wymusza ponowną migrację z Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16720,6 +17241,110 @@ msgstr ""
 "%s: Nie można jednocześnie użyć opcji --online i --offline.\n"
 "  Aby uzyskać więcej informacji, uruchom %s --help.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr "Zbyt mało miejsca na dysku do aktualizacji."
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+"Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, ale "
+"dostępne jest tylko {1}.\n"
+"\n"
+"Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą "
+"kontynuacją."
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+"Aktualizacja z poprzedniej wersji nie powiodła się:\n"
+"{0}"
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+"{1}\n"
+"\n"
+"Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być "
+"dostępna.\n"
+
+#: shell/shell-errors.xml.h:15
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr "Nie można uruchomić Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+msgstr "Nie można uruchomić Evolution."
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+"Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution.\n"
+"\n"
+"Kliknij pomoc aby dowiedzieć się szczegółów"
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+"Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution:\n"
+"\n"
+"{0}\n"
+"\n"
+"Kliknij pomoc aby dowiedzieć się szczegółów."
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16970,6 +17595,11 @@ msgstr "Dostępne certyfikaty"
 msgid "_Edit CA Trust"
 msgstr "_Modyfikuj zaufanie CA"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certyfikat już istnieje"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17179,11 +17809,6 @@ msgstr "Unikalne ID tematu"
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "Certyfikat już istnieje"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Hasło pliku PKCS12"
@@ -17323,8 +17948,8 @@ msgstr "Wyświetla bieżący kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Ak_cje"
@@ -17801,16 +18426,6 @@ msgstr "_Odwróć zaznaczenie"
 msgid "_Threaded Message List"
 msgstr "Grupowanie listów w wąt_ki"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Zamyka bieżące okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Zam_knij"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _nadawcę do książki adresowej"
@@ -18213,6 +18828,16 @@ msgstr "_Narzędzia"
 msgid "_Undelete"
 msgstr "_Cofnij usunięcie"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zamyka bieżące okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Zam_knij"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Załącz"
@@ -18295,10 +18920,6 @@ msgstr "Zapisuje bieżący plik pod inną nazwą"
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Wyślij"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19002,35 +19623,185 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
-#~ msgid "Groupwise"
-#~ msgstr "Groupwise"
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Dane uwierzytelniania serwera HTTP"
 
-#~ msgid "_Score Rules"
-#~ msgstr "Reg_uły punktacji"
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Kalendarze wybrane do publikacji"
+
+#~ msgid "Login name:"
+#~ msgstr "Nazwa użytkownika:"
+
+#~ msgid "URL:"
+#~ msgstr "Adres URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Publikacja ręczna"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nie można uruchomić wombata"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "Wybrany kalendarz jest tylko do odczytu, nie można tworzyć zdarzeń. "
+#~ "Wybierz kalendarz z możliwością zapisu."
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alendarz"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Ustawienia alarmu dźwiękowego"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Ustawienia alarmu z komunikatem"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Ustawienia alarmu z wysłaniem listu"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Ustawienia alarmu z uruchomieniem programu"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Ustawienia nieznanego alarmu"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Powtórzenia alarmu"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Wyświetlany komunikat:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Treść wysyłanego listu"
+
+#~ msgid "Play sound:"
+#~ msgstr "Odtworzenie dźwięku:"
+
+#~ msgid "Run program:"
+#~ msgstr "Uruchamiany program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Argumenty programu:"
+
+#~ msgid "Basics"
+#~ msgstr "Proste"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Czas:"
 
-#~ msgid "Body contains"
-#~ msgstr "Treść zawiera"
+#~ msgid "Reminders"
+#~ msgstr "Przypomnienia"
 
-#~ msgid "Body does not contain"
-#~ msgstr "Treść nie zawiera"
+#~ msgid "_Options..."
+#~ msgstr "_Opcje..."
 
-#~ msgid "Body or subject contains"
-#~ msgstr "Treść lub temat zawiera"
+#~ msgid "Addressbook..."
+#~ msgstr "Książka adresowa..."
 
-#~ msgid "Message contains"
-#~ msgstr "List zawiera"
+#~ msgid "Reminder"
+#~ msgstr "Przypomnienie"
 
-#~ msgid "Recipients contain"
-#~ msgstr "Lista odbiorców zawiera"
+#~ msgid "B_usy"
+#~ msgstr "Z_ajęty"
 
-#~ msgid "Sender contains"
-#~ msgstr "Nadawca zawiera"
+#~ msgid "Co_nfidential"
+#~ msgstr "Po_ufny"
 
-#~ msgid "Subject contains"
-#~ msgstr "Temat zawiera"
+#~ msgid "Date & Time"
+#~ msgstr "Data i czas"
 
-#~ msgid "Subject does not contain"
-#~ msgstr "Temat nie zawiera"
+#~ msgid "F_ree"
+#~ msgstr "_Wolny"
+
+#~ msgid "Pri_vate"
+#~ msgstr "P_rywatny"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_bliczny"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Dodaj uczes_tnika"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Dodaj uczestników z książki adresowej."
+
+#~ msgid "Preview"
+#~ msgstr "Podgląd"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Reguła powtarzalności"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "D_owolna powtarzalność"
+
+#~ msgid "_Modify"
+#~ msgstr "Z_mień"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Brak powtarzalności"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "P_rosta powtarzalność"
+
+# FIXME - sprawdzić formę!!!!
+#~ msgid "% _Complete"
+#~ msgstr "% _Ukończenia"
+
+#~ msgid "Progress"
+#~ msgstr "Postęp"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Taj_ny"
+
+#~ msgid "Folder:"
+#~ msgstr "Folder:"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Wystąpił błąd w podsystemie CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Nie można odnaleźć obiektu\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Brak uprawnień potrzebnych do aktualizacji kalendarza\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Nie można uaktualnić stanu uczestnika!\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Dodaj uczestników z książki adresowej"
+
+#~ msgid "_Options"
+#~ msgstr "Opcj_e"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Czas p_oczątku spotkania:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Czas _końca spotkania:"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "Wybrana lista zadań jest tylko do odczytu, nie można tworzyć zdarzeń. "
+#~ "Wybierz kalendarz z możliwością zapisu."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nie można odnaleźć certyfikatu dla \"%s\""
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Nie można utworzyć wiadomości CMS"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nie można utworzyć kontekstu szyfratora"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "_Score Rules"
+#~ msgstr "Reg_uły punktacji"
 
 #~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 #~ msgstr "W liście z %a, %d-%m-%Y, godz. %H:%M %%+05d, %%s napisał(a):"
@@ -19082,17 +19853,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "Checkbox"
 #~ msgstr "Pole wyboru"
 
-#~ msgid "<b>Active Connections</b>"
-#~ msgstr "<b>Aktywne połączenia</b>"
-
-#~ msgid "Active Connections"
-#~ msgstr "Aktywne połączenia"
-
-#~ msgid "Click OK to close these connections and go offline"
-#~ msgstr ""
-#~ "Kliknij OK, aby zamknąć powyższe połączenia i przejść w tryb bez "
-#~ "podłączenia do sieci"
-
 #~ msgid "C_alendar:"
 #~ msgstr "K_alendarz:"
 
@@ -19111,139 +19871,21 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "Open Other User's Folder"
 #~ msgstr "Otwarcie innego folderu użytkownika"
 
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
 #~ msgid "_Folder Name:"
 #~ msgstr "_Nazwa folderu:"
 
 #~ msgid "_User:"
 #~ msgstr "_Użytkownik:"
 
-#~ msgid "Evolution Setup Assistant"
-#~ msgstr "Druid ustawień Evolution"
-
-#~ msgid "Importing Files"
-#~ msgstr "Importowanie plików"
-
-#~ msgid "Timezone "
-#~ msgstr "Strefa czasowa"
-
-#~ msgid "Welcome"
-#~ msgstr "Witaj"
-
-#~ 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 ""
-#~ "Witaj w Evolution. Na kolejnych kilku ekranach możesz podać\n"
-#~ "informacje, które pozwolą na łączenie się z twoimi kontami\n"
-#~ "e-mail oraz na importowanie plików z innych aplikacji.\n"
-#~ "\n"
-#~ "Aby kontynuować, kliknij \"Naprzód\"."
-
-#~ 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 ""
-#~ "Zostały wprowadzone wszystkie informacje, potrzebne do\n"
-#~ "ustawienia Evolution.\n"
-#~ "\n"
-#~ "Aby zapisać ustawienia, kliknij przycisk \"Zastosuj\"."
-
-#~ msgid "Insufficient disk space for upgrade."
-#~ msgstr "Zbyt mało miejsca na dysku do aktualizacji."
-
-#~ msgid ""
-#~ "Upgrading your data and settings will require upto {0} of disk space, but "
-#~ "you only have {1} available.\n"
-#~ "\n"
-#~ "You will need to make more space available in your home directory before "
-#~ "you can continue."
-#~ msgstr ""
-#~ "Aktualizacja danych i ustawień będzie wymagała do {0} miejsca na dysku, "
-#~ "ale dostępne jest tylko {1}.\n"
-#~ "\n"
-#~ "Należy udostępnić więcej wolnego miejsca w katalogu domowym przed dalszą "
-#~ "kontynuacją."
-
-#~ msgid ""
-#~ "Upgrade from previous version failed:\n"
-#~ "{0}"
-#~ msgstr ""
-#~ "Aktualizacja z poprzedniej wersji nie powiodła się:\n"
-#~ "{0}"
-
-#~ msgid ""
-#~ "{1}\n"
-#~ "\n"
-#~ "If you choose to continue, you may not have access to some of your old "
-#~ "data.\n"
-#~ msgstr ""
-#~ "{1}\n"
-#~ "\n"
-#~ "Jeżeli wybrana zostanie kontynuacja, część starych danych może nie być "
-#~ "dostępna.\n"
-
-#~ msgid "Continue"
-#~ msgstr "Kontynuuj"
-
-#~ msgid "Cannot start Evolution"
-#~ msgstr "Nie można uruchomić Evolution"
-
-#~ msgid "Evolution can not start."
-#~ msgstr "Nie można uruchomić Evolution."
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration.\n"
-#~ "\n"
-#~ "Click help for details"
-#~ msgstr ""
-#~ "Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution.\n"
-#~ "\n"
-#~ "Kliknij pomoc aby dowiedzieć się szczegółów"
-
-#~ msgid ""
-#~ "Your system configuration does not match your Evolution configuration:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Click help for details."
-#~ msgstr ""
-#~ "Konfiguracja systemu nie pokrywa się z konfiguracją programu Evolution:\n"
-#~ "\n"
-#~ "{0}\n"
-#~ "\n"
-#~ "Kliknij pomoc aby dowiedzieć się szczegółów."
-
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nie można nawiązać połączenia z serwerem LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nie można wykonać zapytania na głównym DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr ""
-#~ "Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw "
-#~ "wyszukiwania"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Błąd przy pobieraniu informacji o schemacie"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
-
 #~ msgid ""
 #~ "Some fields are no longer representable in the contact editor. Please "
 #~ "wait while Evolution copies those fields to the 'Notes' field..."
@@ -19325,12 +19967,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "item8"
 #~ msgstr "element8"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Edytor kategorii nie jest dostępny."
-
-#~ msgid "Unable to open addressbook"
-#~ msgstr "Nie można otworzyć książki adresowej"
-
 #~ msgid "Do you want to save changes?"
 #~ msgstr "Czy chcesz zapisać zmiany?"
 
@@ -19370,9 +20006,6 @@ msgstr "%s (zakończono %d%%)"
 #~ "Usuwane zdarzenie jest spotkaniem. Czy chcesz wysłać powiadomienie o "
 #~ "anulowaniu?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19390,45 +20023,15 @@ msgstr "%s (zakończono %d%%)"
 #~ "Usuwany wpis dziennika jest opublikowany. Czy chcesz wysłać powiadomienie "
 #~ "o anulowaniu?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Czy na pewno chcesz usunąć ten pozbawiony nazwy termin?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Czy na pewno chcesz usunąć to pozbawione nazwy zadanie?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Czy na pewno chcesz usunąć ten niezatytułowany wpis dziennika?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d termin?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d terminy?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d terminów?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d zadanie?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d zadania?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d zadań?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Czy na pewno chcesz usunąć %d wpis dziennika?"
-#~ msgstr[1] "Czy na pewno chcesz usunąć %d wpisy dziennika?"
-#~ msgstr[2] "Czy na pewno chcesz usunąć %d wpisów dziennika?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Zaproś innych..."
 
@@ -19466,9 +20069,6 @@ msgstr "%s (zakończono %d%%)"
 #~ msgid "The calendar backend for '%s' has crashed."
 #~ msgstr "Obsługa kalendarza dla \"%s\" spowodowała błąd."
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nie można pobrać artykułu %s z serwera NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Pozycjonowanie nie jest dozwolone przez serwer wiadomości"
 
diff --git a/po/pt.po b/po/pt.po
index 6cefbe49ea..6d29a1e86e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-05-16 21:55+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -23,14 +23,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "livro de endereços evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "cabeçalho do contacto: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "mini-cartão evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "pasta do livro de endereços actual "
@@ -51,34 +43,256 @@ msgstr " cartões"
 msgid " card"
 msgstr " cartão"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "cabeçalho do contacto: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "mini-cartão evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "O item não pode ser enviado!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Falha ao autenticar-se no servidor LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Certifique-se de que a sua senha está correctamente escrita.  Lembre-se de "
+"que muitas senhas são sensíveis à capitalização; o seu caps lock poderá "
+"estar activo."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "O servidor respondeu com nenhuma base de procura suportada"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Este servidor não suporta esquema de informação LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Incapaz de obter o artigo %s do servidor NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Servidor não respondeu com informação de esquema válida"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Incapaz de ler o livro de endereços"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Editor de categorias indisponível."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Gravar no livro de endereços"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Erro ao ler o livro de endereços por omissão."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Incapaz de processar a pasta de spool"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Deseja gravar as alterações?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Descartar"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "e um outro contacto."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Incapaz de parsear o conteúdo da mensagem"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Erro ao adicionar o contacto"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visualizador de endereços do Livro de Endereços Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Se sair, estas mensagens não serão enviadas até que o Evolution seja "
+"novamente iniciado."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Endereço de Sincronização Por Omissão:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Incapaz de ler o livro de endereços"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Incapaz de ler o bloco da aplicação de Endereços da pilot"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "A aceder anonimamente ao Servidor LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Falha ao autenticar-se.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Completar Automaticamente"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIntroduza a senha para %s (utilizador %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificados"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configurar aqui o completar automaticamente"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+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:10
+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:11
+msgid "Evolution Addressbook component"
+msgstr "Componente de Livro de Endereços Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Controlo de Gestão de Certificados S/Mime do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Controlo de definições de configuração de pasta do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -109,7 +323,8 @@ msgid "New Contacts Group"
 msgstr "Novo Grupo de Contactos"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Grupo de _Contactos"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -132,15 +347,15 @@ msgid "Migrating `%s':"
 msgstr "A migrar `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Neste Computador"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -149,19 +364,19 @@ msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Definições de Completar Automaticamente"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -173,7 +388,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -183,7 +398,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -193,7 +408,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -204,38 +419,47 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "O livro de endereços '%s' será removido. Tem a certeza de que deseja "
 "continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Novo Livro de Endereços"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contactos"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "A aceder anonimamente ao Servidor LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Falha ao autenticar-se.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIntroduza a senha para %s (utilizador %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -257,59 +481,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI da última pasta utilizada no diálogo de selecção de nomes"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Completar Automaticamente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificados"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configurar aqui o completar automaticamente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-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:10
-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:11
-msgid "Evolution Addressbook component"
-msgstr "Componente de Livro de Endereços Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Controlo de Gestão de Certificados S/Mime do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Controlo de definições de configuração de pasta do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -317,7 +488,7 @@ msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -326,8 +497,7 @@ msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -353,6 +523,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
@@ -394,13 +565,11 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
@@ -655,33 +824,26 @@ msgid "cards"
 msgstr "cartões"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Seleccionar os Contactos do Livro de Endereços"
+#: 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:208
+msgid "Remove All"
+msgstr "Remover Todos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remover"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remover Todos"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ver a Lista de Contactos"
@@ -696,7 +858,7 @@ msgid "Send HTML Mail?"
 msgstr "Enviar Mail em HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Adicionar aos Contactos"
 
@@ -704,15 +866,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Origem"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Seleccionar os Contactos do Livro de Endereços"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -734,6 +903,11 @@ msgstr "C_ategoria:"
 msgid "_Find"
 msgstr "_Procurar"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Procurar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -771,9 +945,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Emprego</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -794,7 +967,6 @@ msgid "Birthday:"
 msgstr "Data de Nascimento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendário:"
 
@@ -807,15 +979,15 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -911,8 +1083,8 @@ msgstr "Página Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -931,43 +1103,27 @@ msgid "_File under:"
 msgstr "_Arquivar sob:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Tem a certeza de que deseja\n"
-"apagar estes contactos?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Tem a certeza de que deseja\n"
-"apagar este contacto?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editável"
 
@@ -1939,132 +2095,124 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbabué"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Serviço"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Localização"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Utilizador"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Livro de Origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorias:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Seleccione de entre as seguintes opções"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Data de recorrência é inválida"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Serviço"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Localização"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Utilizador"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Adição Rápida de Contacto"
@@ -2082,6 +2230,22 @@ msgstr "Nome Comp_leto:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Tem a certeza de que deseja\n"
+"apagar estes contactos?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Tem a certeza de que deseja\n"
+"apagar este contacto?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Endereço _2:"
@@ -2204,49 +2368,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Seleccionar os Contactos do Livro de Endereços"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Remover os items seleccionados da lista de anexos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Seleccionado"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Esconder endereços ao enviar uma mensagem para esta lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Nome da _lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "In_troduza um endereço de email ou arraste um contacto para a lista abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "editor-lista-contactos"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "diálogo1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Livro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "É uma Nova Lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Participantes Requeridos"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor de Lista de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Gravar a Lista como um VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contacto Alterado:"
@@ -2285,419 +2470,11 @@ msgstr ""
 "pasta.  Ainda assim deseja adicioná-lo?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Procura Avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Membros da Lista"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organização"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Cargo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Vídeo-Conferência"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "emprego"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefone Celular"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "pessoal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Título do Cargo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Página pessoal"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Sucesso"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Módulo de suporte ocupado"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repositório desligado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Livro de Endereços não existe"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "Nenhum Contacto Próprio definido"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Autorização negada"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contacto não foi encontrado"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "ID de contacto já existe"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocolo não é suportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Incapaz de cancelar"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Autenticação Falhou"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Autenticação Requerida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS Indisponível"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "Origem inexistente"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Outro erro"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Incapaz de abrir este livro de endereços.  Certifique-se de que o caminho "
-"existe e de que possui permissões para lhe aceder."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
-"um URI incorrecto ou o servir LDAP está inacessível."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Esta versão do Evolution não possui suporte LDAP compilado no binário.  Se "
-"deseja utilizar LDAP no Evolution terá de compilar a aplicação a partir do "
-"código fonte em CVS após obter o OpenLDAP a partir do link abaixo."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Incapaz de abrir este livro de endereços.  Isto ou significa que introduziu "
-"um URI incorrecto, ou que o servidor está inacessível."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"A procura encontrou mais cartões do que os servidor está configurado \n"
-"para devolver ou o Evolution para apresentar. Efectue a sua procura de\n"
-"forma mais específica ou aumente o limite de resultados nas preferências\n"
-"do servidor de directório para este livro de endereços."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"O tempo necessário para efectuar esta procura excedeu o limite do servidor\n"
-"ou a configuração para este livro de endereços.  Efectue a sua procura de\n"
-"forma mais específica ou aumente o limite de tempo nas preferências do\n"
-"servidor de directório para este livro de endereços."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"O suporte para este livro de endereços foi incapaz de parsear a consulta."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"O suporte para este livro de endereços recusou-se a efectuar esta consulta."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Esta consulta não terminou com sucesso."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Erro ao adicionar a lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Erro ao adicionar o contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Erro ao alterar a lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Erro ao alterar o contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Erro ao remover a lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Erro ao remover o contacto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Abrir %d contactos irá abrir %d novas janelas.\n"
-"Deseja mesmo visualizar todos estes contactos?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s já existe\n"
-"Deseja sobrepo-lo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Sobrepor"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "cartao.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Mover contacto para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copiar contacto para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Mover contactos para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copiar contactos para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Seleccionar o livro de endereços de destino."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Múltiplos VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard de %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(nenhum)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email Principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Seleccionar uma Acção"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contacto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adicionar endereço ao contacto já existente \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "A Consultar o Livro de Endereços..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar Informação de Contacto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Juntar Endereço de Email"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "e um outro contacto."
-msgstr[1] "e %d outros contactos."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Apresentar VCard Completo"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Apresentar VCard Compacto"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gravar no livro de endereços"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nenhum contacto"
@@ -2711,9 +2488,9 @@ msgstr[1] "%d contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Consulta"
 
@@ -2729,130 +2506,130 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao alterar o cartão"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Nome começa por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Email começa por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gravar como um VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Novo Contacto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Ir para a Pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Procurar Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Fontes de Livros de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Configuração Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Enviar Mensagem para o Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimir um Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copiar para o Livro de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Mover para o Livro de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Vista Actual"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualquer Categoria"
@@ -2886,6 +2663,8 @@ msgid "Car Phone"
 msgstr "Telefone do Carro"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorias"
 
@@ -2893,6 +2672,21 @@ msgstr "Categorias"
 msgid "Company Phone"
 msgstr "Telefone da Empresa"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Sobrenome"
@@ -2929,14 +2723,29 @@ msgstr "Diário"
 msgid "Manager"
 msgstr "Gestor"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefone Celular"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcunha"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Escritório"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organização"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
@@ -2988,29 +2797,21 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Página Web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Largura"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Altura"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Tem Foco"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seleccionado"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Tem Cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
@@ -3027,7 +2828,11 @@ msgstr "Modelo de Texto"
 msgid "Max field name length"
 msgstr "Comprimento máx. do nome do campo"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Largura da Coluna"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3041,7 +2846,7 @@ msgstr ""
 "\n"
 "Faça clique-duplo aqui para criar um novo Contacto."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3051,13 +2856,389 @@ msgstr ""
 "\n"
 "Não existem itens a apresentar nesta vista."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Largura da Coluna"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seleccionado"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Tem Cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Membros da Lista"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Cargo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Vídeo-Conferência"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "emprego"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "pessoal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Título do Cargo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Página pessoal"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Sucesso"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Módulo de suporte ocupado"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repositório desligado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Livro de Endereços não existe"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "Nenhum Contacto Próprio definido"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Autorização negada"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contacto não foi encontrado"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "ID de contacto já existe"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocolo não é suportado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Incapaz de cancelar"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Autenticação Falhou"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Autenticação Requerida"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS Indisponível"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Origem inexistente"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Outro erro"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Incapaz de abrir este livro de endereços.  Certifique-se de que o caminho "
+"existe e de que possui permissões para lhe aceder."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
+"um URI incorrecto ou o servir LDAP está inacessível."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Esta versão do Evolution não possui suporte LDAP compilado no binário.  Se "
+"deseja utilizar LDAP no Evolution terá de compilar a aplicação a partir do "
+"código fonte em CVS após obter o OpenLDAP a partir do link abaixo."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Incapaz de abrir este livro de endereços.  Isto ou significa que introduziu "
+"um URI incorrecto, ou que o servidor está inacessível."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"A procura encontrou mais cartões do que os servidor está configurado \n"
+"para devolver ou o Evolution para apresentar. Efectue a sua procura de\n"
+"forma mais específica ou aumente o limite de resultados nas preferências\n"
+"do servidor de directório para este livro de endereços."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"O tempo necessário para efectuar esta procura excedeu o limite do servidor\n"
+"ou a configuração para este livro de endereços.  Efectue a sua procura de\n"
+"forma mais específica ou aumente o limite de tempo nas preferências do\n"
+"servidor de directório para este livro de endereços."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"O suporte para este livro de endereços foi incapaz de parsear a consulta."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"O suporte para este livro de endereços recusou-se a efectuar esta consulta."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Esta consulta não terminou com sucesso."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Erro ao adicionar a lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Erro ao adicionar o contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Erro ao alterar a lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Erro ao alterar o contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Erro ao remover a lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Erro ao remover o contacto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Abrir %d contactos irá abrir %d novas janelas.\n"
+"Deseja mesmo visualizar todos estes contactos?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s já existe\n"
+"Deseja sobrepo-lo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Sobrepor"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "cartao.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Mover contacto para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copiar contacto para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Mover contactos para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copiar contactos para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Seleccionar o livro de endereços de destino."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Múltiplos VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard de %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(nenhum)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Email Principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Seleccionar uma Acção"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar um novo contacto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adicionar endereço ao contacto já existente \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "A Consultar o Livro de Endereços..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Editar Informação de Contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Juntar Endereço de Email"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "e um outro contacto."
+msgstr[1] "e %d outros contactos."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Apresentar VCard Completo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Apresentar VCard Compacto"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gravar no livro de endereços"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3101,6 +3282,11 @@ msgstr "Importador de VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir envelope"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contactos"
@@ -3110,11 +3296,6 @@ msgstr "Imprimir contactos"
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir envelope"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma 10 pt."
@@ -3300,6 +3481,22 @@ msgstr "Teste de Impressão de Contacto"
 msgid "This should test the contact print code"
 msgstr "Isto deverá testar o código de impressão de um contacto"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Incapaz de abrir o ficheiro"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Incapaz de ler o livro de endereços"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Incapaz de abrir o livro de endereços"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Especificar o ficheiro de saída em vez da consola"
@@ -3357,22 +3554,6 @@ msgstr "Em modo normal, não é necessária a opção de tamanho."
 msgid "Impossible internal error."
 msgstr "Erro interno impossível."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Incapaz de abrir o ficheiro"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Incapaz de ler o livro de endereços"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Incapaz de abrir o livro de endereços"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erro ao ler o livro de endereços por omissão."
@@ -3389,39 +3570,368 @@ msgstr "Nenhum nome de ficheiro indicado."
 msgid "Unnamed List"
 msgstr "Lista Sem Nome"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Não apagar"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Enviar Para:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Tem a certeza de que deseja cancelar e apagar esta reunião?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Tem a certeza de que deseja apagar %d tarefa?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Tem a certeza de que deseja cancelar e apagar esta entrada de diário?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Tem a certeza de que deseja apagar %d entrada de diário?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Tem a certeza de que deseja apagar o compromisso `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Tem a certeza de que deseja apagar %d compromisso?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Tem a certeza de que deseja apagar a tarefa `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Tem a certeza de que deseja apagar a entrada de diário `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Tem a certeza de que deseja apagar o compromisso `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Tem a certeza de que deseja apagar a tarefa `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Tem a certeza de que deseja apagar a entrada de diário `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Compromisso"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Deseja gravar as alterações?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Efectuou alterações. Esquecer essas alterações e actualizar o editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Descartar as Alterações"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Gravar a Mensagem"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Se sair, estas mensagens não serão enviadas até que o Evolution seja "
+"novamente iniciado."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Importador de vCalendar Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Se sair, estas mensagens não serão enviadas até que o Evolution seja "
+"novamente iniciado."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduza a senha"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Dividir Eventos Multi-Dias:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Incapaz de iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Incapaz de inicializar o wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Incapaz de ler o bloco da aplicação de Calendário da pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Prioridade por Omissão:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Incapaz de ler o bloco da aplicação A Fazer da pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendário e Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Calendários"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendário e Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Controlo de configuração de Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visualizador de mensagem de agendamento do Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Calendário/Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Componente de Calendário Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Componente de Tarefas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendários"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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 do Calendário Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Iniciar:"
@@ -3519,10 +4029,6 @@ 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 do Calendário Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar o Bonobo"
@@ -3663,9 +4169,29 @@ msgstr "Se apresentar as horas no formato 24h em vez de utilizar am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Se apresentar os números das semanas no navegador de datas"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Resumo contém"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Descrição contém"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comentário contém"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Localização contém"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Sem equivalência"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3686,8 +4212,8 @@ msgid "Purge events older than"
 msgstr "Expurgar eventos mais antigos do que"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dias"
 
@@ -3698,7 +4224,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3747,64 +4273,52 @@ msgstr "Incapaz de abrir o calendário '%s' para criar eventos e reuniões"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não existe nenhum calendário disponível para criar eventos e reuniões"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"O calendário seleccionado é apenas de leitura, não podendo ser criados "
-"eventos. Seleccione um calendário para o qual possua permissões de escrita."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Calendários"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "R_eunião"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Criar uma nova convocatória de reunião"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia completo"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Compromisso de _Dia Completo"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia completo"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Novo calendário"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "C_alendário"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calendário"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Criar um novo calendário"
 
@@ -3834,26 +4348,6 @@ msgstr "Vista de Semana"
 msgid "Month View"
 msgstr "Vista de Mês"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Resumo contém"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Descrição contém"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comentário contém"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Localização contém"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Sem equivalência"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendário"
@@ -3871,217 +4365,133 @@ msgstr "Autorização negada ao abrir o calendário"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opções Audio de Alarme"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opções de Mensagem de Alarme"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opções de Email de Alarme"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opções de Aplicação de Alarme"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opções Desconhecidas de Alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Repetição do Alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Mensagem a Apresentar:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Mensagem a Enviar"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Reproduzir o som:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repetir o alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Executar aplicação:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Enviar Para:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Com estes argumentos:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "diálogo1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alertas</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "tempos extra a cada"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opções da Lista de Tarefas</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "horas"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Geral</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Acção/Despoletar"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Adicionar Calendário"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "A_dicionar"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Escrever uma mensagem"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Simples"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Hora:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Mensagens"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Reproduzir um som"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Lembretes"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executar uma aplicação"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Enviar Para:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar uma mensagem"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resumo:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Cont_a:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Executar Aplicação"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opções..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repetir o alarme"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "En_viar"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "após"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dia(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "fim do compromisso"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "tempos extra a cada"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Tem de especificar uma localização de onde obter o calendário."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "A localização de origem '%s' não está correctamente formada."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "A localização de origem '%s' não é uma origem webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Origem com o nome '%s' já existe no grupo seleccionado"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"O grupo '%s' é remoto. Tem de especificar uma localização de onde obter o "
-"calendário"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Adicionar Calendário"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Adicionar Grupo de Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_ores:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Seleccione uma cor"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Adicionar um Calendário"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Adicionar um Grupo"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "Actual_izar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tipo:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Acção/Despoletar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "A_dicionar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "Alarme a %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4190,7 +4600,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publicação de Estado Livre/Ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Sexta-Feira"
@@ -4204,7 +4614,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Segunda-Feira"
@@ -4214,7 +4624,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
@@ -4228,7 +4638,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Apresentar os _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
@@ -4242,7 +4652,7 @@ msgid "T_hu"
 msgstr "Q_ui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Quinta-Feira"
@@ -4256,7 +4666,7 @@ msgid "Time format:"
 msgstr "Formato de hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Terça-Feira"
@@ -4266,7 +4676,7 @@ msgid "W_eek starts:"
 msgstr "S_emana começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Quarta-Feira"
@@ -4299,7 +4709,8 @@ msgstr "_Comprimir os fins-de-semana na vista de mês"
 msgid "_Day begins:"
 msgstr "_Dia começa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4350,6 +4761,74 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Tem de especificar uma localização de onde obter o calendário."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "A localização de origem '%s' não está correctamente formada."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "A localização de origem '%s' não é uma origem webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Origem com o nome '%s' já existe no grupo seleccionado"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"O grupo '%s' é remoto. Tem de especificar uma localização de onde obter o "
+"calendário"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Adicionar Calendário"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Adicionar Grupo de Tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_ores:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Seleccione uma cor"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Adicionar um Calendário"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Adicionar um Grupo"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "Actual_izar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "semanas"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi apagado."
@@ -4395,81 +4874,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Erro de validação: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " para "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Terminada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Terminada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Prazo "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Prazo "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Incapaz de actualizar o objecto"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editar Compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Gravar como..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Alterações efectuadas a este item poderão ser descartadas se chegarem "
 "actualizações"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Incapaz de utilizar a versão actual!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Erro de validação: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " para "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Terminada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Terminada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Prazo "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Prazo "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Incapaz de abrir a origem"
@@ -4531,8 +5004,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "O item não pode ser apagado devido a um erro"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Livro de Endereços..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contactos"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4542,160 +5016,221 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Calendarização"
 
-#: 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientação"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Evento sem data de finalização"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Data de início incorrecta"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Hora de início incorrecta"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Hora de finalização incorrecta"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Incapaz de abrir o calendário '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "antes de todos os compromissos"
+msgstr[1] "antes de todos os compromissos"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "fim do compromisso"
+msgstr[1] "fim do compromisso"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "antes de todos os compromissos"
+msgstr[1] "antes de todos os compromissos"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Evento de dia completo"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "antes de todos os compromissos"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Oc_upado"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "antes de todos os compromissos"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorias..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "antes de todos os compromissos"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Lista de Tarefas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classificação"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Hora</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidencial"
+msgid "A_ll day event"
+msgstr "_Evento de dia completo"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data & Hora"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Gravar a Vista Personalizada..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Liv_re"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorias..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "L_ocalização:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calendário:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vado"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classificação"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pú_blico"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Apresentar Horas Como"
+msgid "L_ocation:"
+msgstr "L_ocalização:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privado"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Público"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Apresentar Horas Como"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Resu_mo:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "_Limpar"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descrição:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Hora de finalização:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nenhum(a)"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador seleccionado já não possui uma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegar A..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "Apa_gar"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Remover"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4734,35 +5269,45 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Adicionar um Par_ticipante"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alertas</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Adicionar o Remetente ao Li_vro de Endereços"
+msgid "<b>Organizer</b>"
+msgstr "<b>Outra</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Alterar o Organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contactos"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Alterar o Organizador"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizador:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4829,146 +5374,140 @@ msgstr "Esta Instância e Futuras"
 msgid "All Instances"
 msgstr "Todas as Instâncias"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso contém recorrências que o Evolution não pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Data de recorrência é inválida"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "a"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "primeiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "terceiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "quarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Outra Data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/Hora"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "A Cada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Excepções"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Antever"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Regra de Recorrência"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Recorrência _personalizada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Alterar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Antever</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Sem recorrê_ncia"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Recorrência"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Remover"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "A Cada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Recorrência _simples"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Editar compromisso"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "para"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "para sempre"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "até"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Seleccionar o destino %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista de Tarefas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Data de finalização incorrecta"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Fontes da Mensagem</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Terminada"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Terminada"
 
@@ -4980,8 +5519,8 @@ msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Em Curso"
@@ -4993,22 +5532,22 @@ msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Por Iniciar"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Em Curso"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percentagem Terminada: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5031,36 +5570,42 @@ msgstr "E_stado:"
 msgid "_Web Page:"
 msgstr "Página _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Data de finalização incorrecta"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Incapaz de abrir as tarefas em '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Con_fidencial"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opções</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Apagar Mensagens</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrição:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Pasta:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "_Data de início:"
@@ -5069,52 +5614,58 @@ msgstr "_Data de início:"
 msgid "_Due date:"
 msgstr "Data de _finalização:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Credenciais de Autenticação para o Servidor HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupo:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Calendários seleccionados para publicação"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opções de calendário</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Diariamente"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Frequência de Publicação"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Editor de Informação de Livre/Ocupado"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Localização de Publicação de Livre/Ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Localização de Publicação de Livre/Ocupado"
+msgid "Free/Busy Editor"
+msgstr "Editor de Informação de Livre/Ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nome de início de sessão:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Diariamente"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Senha:"
+#, fuzzy
+msgid "_Manual"
+msgstr "E_mail:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Frequência de Publicação"
+#, fuzzy
+msgid "_Password:"
+msgstr "Senha:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Recordar a senha"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Nome de utilizador:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Publicações do Utilizador"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Semanalmente"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5196,7 +5747,7 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo despoletado desconhecido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Clicar para abrir %s"
@@ -5205,6 +5756,11 @@ msgstr "Clicar para abrir %s"
 msgid "Untitled"
 msgstr "Sem título"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resumo:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5216,7 +5772,7 @@ msgstr "Data de _Término:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5228,20 +5784,93 @@ msgstr "Prioridade:"
 msgid "Web Page:"
 msgstr "Página Web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Público"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data de Finalização"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privado"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data de Início"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Resumo"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Livre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A posição geográfica tem de ser inserida no formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Sim"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Não"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Desconhecida"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recorrente"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Atribuída"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5287,95 +5916,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Livre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "A apagar os objectos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "A actualizar os objectos"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Abrir Página _Web"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gravar _Como..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Atribuir a Tarefa"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Reenviar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Marcar como Terminada"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar as Tarefas Seleccionadas como Terminadas"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "Apa_gar"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Apagar as Tarefas Seleccionadas"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Gravar como..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clicar para adicionar uma tarefa"
 
@@ -5384,174 +6019,105 @@ msgstr "Clicar para adicionar uma tarefa"
 msgid "% Complete"
 msgstr "% Terminada"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Terminada"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Data de finalização"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Data limite"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Data de início"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumo"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordenação de tarefas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "A mover mensagens"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "A copiar mensagens"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar a Informação de Livre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Ir para _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Ir para uma Data..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Configuraçõe_s..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data de Finalização"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Data de Início"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Desconhecida"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Recorrente"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Atribuída"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Sim"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Não"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posição geográfica tem de ser inserida no formato: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5575,36 +6141,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisõ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.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisões de minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5671,37 +6237,35 @@ msgid ", ending on "
 msgstr ", a terminar em "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Início:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Fim:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Estado"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Terminada:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Expira:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Prazo "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5709,309 +6273,289 @@ msgstr ""
 "<br> Reveja a informação seguinte e depois seleccione uma acção do menu "
 "abaixo."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Nenhum</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Localização:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceite"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Recusada"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Seleccione uma acção:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Actualizar o estado das respostas"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Enviar a Mais Recente Informação"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Actualização de Reunião"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Pedido de Actualização de Reunião"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Resposta de Reunião"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de Reunião"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informação de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requer que uma tarefa seja executada por si."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Actualização de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Pedido de Actualização de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Resposta a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Cancelamento de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Informação de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 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:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Actualização terminada\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Estado de participante não pode ser actualizado pois o item já não existe"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objecto é inválido e não pode ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante actual.  Adicionar como participante?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Ocorreu um erro no sistema CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objecto não foi encontrado\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Estado de participante não pode ser actualizado!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Estado de participante não pode ser actualizado pois o item já não existe"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Acção de Remoção Terminada"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "O item não pode ser enviado!\n"
 
@@ -6040,6 +6584,10 @@ msgstr "A Ler o Calendário"
 msgid "Loading calendar..."
 msgstr "A ler o calendário..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensagem do Servidor:"
@@ -6056,11 +6604,6 @@ msgstr "data-início"
 msgid "Chair Persons"
 msgstr "Coordenadores"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Participantes Requeridos"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
@@ -6128,6 +6671,28 @@ msgstr "Delegada"
 msgid "In Process"
 msgstr "Em Curso"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do Escritório"
@@ -6136,98 +6701,64 @@ msgstr "Fora do Escritório"
 msgid "No Information"
 msgstr "Nenhuma Informação"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Adicionar o Remetente ao Li_vro de Endereços"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opções"
+msgid "O_ptions"
+msgstr "Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Apenas Aprese_ntar as Horas Úteis"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Apresentar com _Zoom Reduzid"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Act_ualizar Livre/Ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoselecção"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Tod_as as Pessoas e Recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Todas as _Pessoas e Um Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Pessoas _Requeridas"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Pessoas Requeridas e _Um Recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Hora de _início da reunião:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Hora de _finalização da reunião:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Introduza a senha para %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6236,116 +6767,51 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "A ler as tarefas"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Erro ao abrir %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "A ler as tarefas"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "A terminar as tarefas..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "A apagar os objectos seleccionados..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "A expurgar"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "A actualizar os objectos"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "A ler os compromisso em %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "A ler as tarefas em %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "A expurgar"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Calendário e Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendário e Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Controlo de configuração de Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visualizador de mensagem de agendamento do Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Calendário/Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Componente de Calendário Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Componente de Tarefas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Calendários"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tarefas"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6691,10 +7157,6 @@ msgstr "Mês seleccionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano seleccionado (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tarefa"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6725,7 +7187,7 @@ msgid "Contacts: "
 msgstr "Contactos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Antever a Impressão"
 
@@ -6754,7 +7216,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6774,35 +7236,28 @@ msgstr "Incapaz de abrir a lista de tarefas '%s' para criar eventos e reuniões"
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe nenhum calendário disponível para criar tarefas"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"A lista de tarefas seleccionada é apenas de leitura, não podem ser criados "
-"eventos. Seleccione um calendário para o qual possua permissões de escrita."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Novo grupo de tarefas"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "Grupo de _Tarefas"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Criar um novo grupo de tarefas"
 
@@ -8479,69 +8934,69 @@ msgstr "A preparar a pasta '%s' para trabalhar em modo desligado"
 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:513
+#: camel/camel-filter-driver.c:669 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 um canal para '%s': %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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 o processo filho '%s': %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "A sincronizar as pastas"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao parsear o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Incapaz de abrir a pasta de spool"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Incapaz de processar a pasta de spool"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "A receber a mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Incapaz de abrir a mensagem"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falha na mensagem %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "A sincronizar a pasta"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "A receber a mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falha na mensagem %d de %d"
@@ -8563,42 +9018,6 @@ msgstr "Argumentos inválidos para (etiqueta-utilizador)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar uma procura com filtro: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operação não suportada: concatenar mensagem: para %s"
-
-#: camel/camel-folder.c:1262
-#, 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:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "A mover mensagens"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "A copiar mensagens"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Aviso"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "A filtrar nova(s) mensagem(ns)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8643,7 +9062,43 @@ msgstr "(coincidir-árvores) requer um conjunto de pastas"
 msgid "Performing query on unknown header: %s"
 msgstr "A efectuar a procura num cabeçalho desconhecido: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Operação não suportada: concatenar mensagem: para %s"
+
+#: camel/camel-folder.c:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "A mover mensagens"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "A copiar mensagens"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Aviso"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "A filtrar nova(s) mensagem(ns)"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8654,15 +9109,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Falha ao parsear a dica de id de utilizador gpg."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falha ao parsear o pedido de frase-senha gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8671,29 +9126,29 @@ msgstr ""
 "Necessita de uma frase-senha para destrancar a chave\n"
 "para o utilizador: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falha ao destrancar a chave secreta: indicadas 3 frases-senha incorrectas."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falha ao encriptar: Nenhum destinatário válido especificado."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8704,86 +9159,64 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Falha ao executar o GPG sobre %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Incapaz de gerar os dados de assinatura: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falha ao executar o gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Falha ao executar o gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Incapaz de verificar a assinatura da mensagem: Formato de mensagem incorrecto"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Incapaz de verificar a assinatura da mensagem: incapaz de criar um ficheiro "
 "temporário: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Incapaz de gerar os dados de encriptação: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem digitalmente encriptada"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Conteúdo encriptado"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Incapaz de parsear o conteúdo da mensagem"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Incapaz de criar ficheiro de exclusividade para %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Tempo expirou ao tentar obter ficheiro de exclusividade sobre %s. Tente mais "
-"tarde."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Falha ao obter exclusividade utilizando fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Falha ao obter exclusividade utilizando flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8806,6 +9239,28 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Incapaz de obter exclusividade sobre '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Incapaz de criar ficheiro de exclusividade para %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Tempo expirou ao tentar obter ficheiro de exclusividade sobre %s. Tente mais "
+"tarde."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Falha ao obter exclusividade utilizando fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Falha ao obter exclusividade utilizando flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9063,7 +9518,7 @@ msgstr "As credenciais de referência expiraram."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9150,55 +9605,55 @@ msgstr "Autenticação POP Antes de SMTP a utilizar uma origem não-POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar a expressão regular: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita de um componente utilizador"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita de um componente máquina"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita de um componente caminho"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "A resolver: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha ao procurar nome: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Falha ao procurar servidor: incapaz de criar uma thread: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falha ao procurar servidor: %s: servidor não encontrado"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Falha ao procurar servidor: %s: razão desconhecida"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "A resolver endereço"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Falha ao procurar servidor: servidor não encontrado"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Falha ao procurar servidor: razão desconhecida"
 
@@ -9270,7 +9725,7 @@ msgstr "Incapaz de adicionar o certificado de encriptação"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Incapaz de adicionar a SignerInfo CMS"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Incapaz de criar o contexto de encodificação"
 
@@ -9353,7 +9808,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensagem apenas de certificado, certificados importados e verificados"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Incapaz de encontrar o resumo de assinatura"
 
 #: camel/camel-smime-context.c:651
@@ -9366,47 +9822,51 @@ msgid "Decoder failed"
 msgstr "Falha no descodificador"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Incapaz de encontrar o certificado para `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Incapaz de encontrar o certificado para '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Incapaz de encontrar o algorítmo de encriptação em grupo"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Incapaz de alocar espaço para a chave de encriptação em grupo"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
-msgstr "Incapaz de criar Mensagem CMS"
+#, fuzzy
+msgid "Cannot create CMS Message"
+msgstr "Incapaz de criar uma mensagem CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Incapaz de criar EnvelopedData CMS"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Incapaz de anexar EnvelopedData CMS"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Incapaz de anexar objecto de dados CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Incapaz de criar RecipientInfo CMS"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Incapaz de adicionar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Incapaz de criar contexto de codificador"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falha ao adicionar dados ao codificador"
@@ -9451,7 +9911,8 @@ msgstr "Incapaz de criar a pasta `%s': pasta já existe"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Incapaz de apagar a pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Incapaz de renomear a pasta: %s: Operação inválida"
@@ -9460,8 +9921,8 @@ msgstr "Incapaz de renomear a pasta: %s: Operação inválida"
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Não Solicitado"
 
@@ -9582,7 +10043,7 @@ msgstr "Utilização de chave não suporta assinatura de certificados"
 msgid "Error in application verification"
 msgstr "Erro na verificação de aplicação"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9595,11 +10056,11 @@ msgstr ""
 "Impressão-Digital: %s\n"
 "Assinatura:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "VÁLIDO"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "INVÁLIDO"
 
@@ -9623,7 +10084,7 @@ msgstr ""
 "Ainda assim deseja aceitar?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9638,7 +10099,7 @@ msgstr ""
 "\n"
 "Deseja aceitá-lo?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9647,7 +10108,7 @@ msgstr ""
 "Problema de certificado: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9656,7 +10117,7 @@ msgstr ""
 "Domínio de certificação inválido: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9665,7 +10126,7 @@ msgstr ""
 "Certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9674,7 +10135,7 @@ msgstr ""
 "Lista de Revogação de Certificados expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Incapaz de parsear o URL `%s'"
@@ -9698,7 +10159,7 @@ msgstr "Incapaz de copiar ou mover as mensagens para uma Pasta Virtual"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Incapaz de apagar a pasta: %s: Pasta não existe"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Incapaz de renomear a pasta: %s: Pasta não existe"
@@ -9717,8 +10178,8 @@ msgid "Checking for new mail"
 msgstr "A verificar se existem novas mensagens"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "A verificar se existem novas mensagens em todas as pastas"
 
@@ -9748,8 +10209,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para aceder a servidores Novell GroupWise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9769,315 +10230,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista de verificação"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Resposta inesperada de servidor IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Incapaz de seleccionar a pasta `%s': Nome de caixa de correio inválida"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Incapaz de seleccionar a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Servidor IMAP4 %s desligou-se inesperadamente: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Obtida a resposta BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Incapaz de sincronizar os parâmetros para a pasta `%s': Desconhecida"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr ""
-"Incapaz de sincronizar os parâmetros para a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Incapaz de expurgar a pasta `%s': Desconhecida"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Incapaz de expurgar a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Incapaz de obter a mensagem %s da pasta `%s': Mensagem inexistente"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Incapaz de obter a mensagem %s da pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Incapaz de adicionar a mensagem à pasta `%s': Erro desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Incapaz de adicionar a mensagem à pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "Incapaz de mover a mensagem `%s' para a pasta `%s': Desconhecida"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Desconhecida"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Incapaz de mover mensagens da pasta `%s' para a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Pastas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Apresentar apenas as pastas subscritas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Substituir o nome-espaço de pasta indicado pelo servidor"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nome-espaço"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Para ler e armazenar email em servidores IMAPv4rev1. EXPERIMENTAL !!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opção irá estabelecer uma ligação a um servidor IMAPv4rev1 utilizando "
-"uma senha em texto simples."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Servidor IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Serviço IMAP para %s em %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Incapaz de se ligar a %s (porto %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL indisponível"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Ligação cancelada"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Incapaz de se ligar ao servidor IMAP %s em modo seguro: O servidor não "
-"suporta STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Incapaz de se ligar ao servidor IMAP %s em modo seguro: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Incapaz de se autenticar no servidor IMAP %s utilizando o mecanismo de "
-"autenticação %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIntroduza a senha IMAP para %s no servidor %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Falha ao autenticar-se no servidor IMAP %s utilizando %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Incapaz de obter a pasta `%s' no servidor IMAP %s: Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome de pasta \"%s\" é inválido pois contém o caracter \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Incapaz de criar a pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Incapaz de criar a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Incapaz de apagar a pasta `%s': Pasta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Incapaz de apagar a pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Incapaz de apagar a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"Incapaz de obter a informação %s para o padrão `%s' no servidor IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
-msgstr "Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Incapaz de subscrever a pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Incapaz de subscrever a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-"Incapaz de remover a subscrição da pasta `%s': Nome de caixa de correio "
-"inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Incapaz de remover a subscrição da pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Bloco inesperado na resposta do servidor IMAP %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Sem dados"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Servidor IMAP %s desligou-se inesperadamente: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servidor desligou-se inesperadamente: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10146,7 +10320,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10217,6 +10391,27 @@ msgstr "Utilizar comando personalizado para se ligar ao servidor"
 msgid "Command:"
 msgstr "Comando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Apresentar apenas as pastas subscritas"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Substituir o nome-espaço de pasta indicado pelo servidor"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Nome-espaço"
+
 #: 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 de ENTRADA neste servidor"
@@ -10239,43 +10434,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar email em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Servidor IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Serviço IMAP para %s em %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Incapaz de se ligar a %s (porto %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL indisponível"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Ligação cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Incapaz de se ligar ao servidor IMAP %s em modo seguro: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Extensão SSL/TLS não suportada."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Falha na negociação SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Incapaz de se ligar utilizando o comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Servidor IMAP %s não suporta o tipo de autenticação %s pedido"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Não introduziu a senha."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10286,30 +10530,274 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Pasta %s inexistente"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "O nome de pasta \"%s\" é inválido pois contém o caracter \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não tem permissões para conter subpastas"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Incapaz de criar a pasta `%s': a pasta já existe."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Falha ao autenticar-se no servidor POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada de servidor IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Resposta inesperada de servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Incapaz de seleccionar a pasta `%s': Nome de caixa de correio inválida"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Incapaz de seleccionar a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Servidor IMAP4 %s desligou-se inesperadamente: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Obtida a resposta BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Incapaz de sincronizar os parâmetros para a pasta `%s': Desconhecida"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"Incapaz de sincronizar os parâmetros para a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Incapaz de expurgar a pasta `%s': Desconhecida"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Incapaz de expurgar a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Incapaz de obter a mensagem %s da pasta `%s': Mensagem inexistente"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Incapaz de obter a mensagem %s da pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Incapaz de adicionar a mensagem à pasta `%s': Erro desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Incapaz de adicionar a mensagem à pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Incapaz de mover a mensagem `%s' para a pasta `%s': Desconhecida"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Desconhecida"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Incapaz de mover mensagens da pasta `%s' para a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Para ler e armazenar email em servidores IMAPv4rev1. EXPERIMENTAL !!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Esta opção irá estabelecer uma ligação a um servidor IMAPv4rev1 utilizando "
+"uma senha em texto simples."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Incapaz de se ligar ao servidor IMAP %s em modo seguro: O servidor não "
+"suporta STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Incapaz de se autenticar no servidor IMAP %s utilizando o mecanismo de "
+"autenticação %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduza a senha IMAP para %s no servidor %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Falha ao autenticar-se no servidor IMAP %s utilizando %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Incapaz de obter a pasta `%s' no servidor IMAP %s: Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Incapaz de criar a pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Incapaz de criar a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Incapaz de apagar a pasta `%s': Pasta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Incapaz de apagar a pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Incapaz de apagar a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Incapaz de apagar a pasta `%s': Pasta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Incapaz de criar a pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Incapaz de criar a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Incapaz de obter a informação %s para o padrão `%s' no servidor IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Incapaz de subscrever a pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Incapaz de subscrever a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+"Incapaz de remover a subscrição da pasta `%s': Nome de caixa de correio "
+"inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Incapaz de remover a subscrição da pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Bloco inesperado na resposta do servidor IMAP %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Sem dados"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Servidor IMAP %s desligou-se inesperadamente: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10479,18 +10967,26 @@ msgstr "Incapaz de gravar o resumo: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Incapaz de adicionar a mensagem ao resumo: razão desconhecida"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Caixa de Entrada"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Adição de mensagem ao maildir cancelada"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Incapaz de adicionar a mensagem à pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10506,48 +11002,48 @@ msgstr ""
 "Incapaz de obter a mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Conteúdo da mensagem inválido"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Incapaz de obter a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Incapaz de obter a pasta `%s': a pasta não existe."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Incapaz de criar a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Incapaz de obter a pasta `%s': não é um directório maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Incapaz de apagar a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "não é um directório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11141,20 +11637,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Incapaz de estabelecer uma ligação ao servidor POP %s (porto %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Falha ao autenticar-se no servidor POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Falha ao estabelecer uma ligação ao servidor POP %s em modo seguro: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Incapaz de estabelecer uma ligação ao servidor POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11163,28 +11664,28 @@ msgstr ""
 "Incapaz de estabelecer uma ligação ao servidor POP %s: Suporte inexistente "
 "para mecanismo de autenticação requerido."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Falha ao iníciar sessão SASL `%s' no servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Incapaz de se ligar ao servidor POP %s: Erro de protocolo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Falha ao autenticar-se no servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sIntroduza a senha POP para %s no servidor %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11193,7 +11694,16 @@ msgstr ""
 "Incapaz de se ligar ao servidor POP %s.\n"
 "Erro ao enviar a senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Incapaz de se ligar ao servidor POP %s.\n"
+"Erro ao enviar a senha: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Pasta `%s' inexistente."
@@ -11408,93 +11918,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de mensagens SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Incapaz de enviar a mensagem: serviço desligado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Incapaz de enviar a mensagem: endereço de remetente inválido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "A enviar a mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Incapaz de enviar a mensagem: nenhum destinatário definido."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Incapaz de enviar a mensagem: um ou mais destinatários inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Boas vindas SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Falha no comando HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Falha no comando HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Autenticação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar o objecto de autenticação SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Falha no comando AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Falha no comando AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autenticação do servidor inválida.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Falha no comando MAIL FROM: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Falha no comando MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Falha no comando RCPT TO: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falha no RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Falha no comando DATA: %s: a mensagem não foi enviada"
@@ -11502,26 +12012,26 @@ msgstr "Falha no comando DATA: %s: a mensagem não foi enviada"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Falha no comando DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Falha no comando RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Falha no comando RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Falha no comando QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Falha no comando QUIT"
 
@@ -11584,101 +12094,6 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir a apresentação automática do anexo"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Incapaz de assinar a mensagem a enviar: Nenhum certificado de assinatura "
-"para esta conta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptação "
-"para esta conta"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Incapaz de abrir o ficheiro"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Incapaz de recuperar a mensagem do editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Mensagem sem Título"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Gerada automaticamente"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Assinatura:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Ficheiro Anexo"
-msgstr[1] "<b>%d</b> Ficheiros Anexos"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Esconder a Barra de _Anexos (largar os anexos aqui)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Apresentar a Barra de _Anexos (largar os anexos aqui)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Escrever uma mensagem"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Incapaz de criar a janela de composição:\n"
-"Incapaz de activao r controlo de selecção de endereços."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Incapaz de criar a janela de composição:\n"
-"Incapaz de activar o componente de editor HTML.\n"
-"Certifique-se de que possui instaladas as versões\n"
-"correctas do gtkhtml e libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Incapaz de criar a janela de composição:\n"
-"Incapaz de activar o componente de editor HTML."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(O compositor contém um corpo de mensagem que não é texto, pelo que não "
-"pode ser editado.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destino da afixagem"
@@ -11759,17 +12174,92 @@ msgstr "Clique aqui para seleccionar as pastas onde afixar"
 msgid "Attach file(s)"
 msgstr "Anexar ficheiro(s)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Incapaz de assinar a mensagem a enviar: Nenhum certificado de assinatura "
+"para esta conta"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Incapaz de encriptar a mensagem a enviar: Nenhum certificado de encriptação "
+"para esta conta"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Incapaz de abrir o ficheiro"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Incapaz de recuperar a mensagem do editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mensagem sem Título"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Gerada automaticamente"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Assinatura:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Ficheiro Anexo"
+msgstr[1] "<b>%d</b> Ficheiros Anexos"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Esconder a Barra de _Anexos (largar os anexos aqui)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Apresentar a Barra de _Anexos (largar os anexos aqui)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Escrever uma mensagem"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mensagem reencaminhada - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Anexar a mensagem original"
+msgstr[1] "Anexar a mensagem original"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(O compositor contém um corpo de mensagem que não é texto, pelo que não "
+"pode ser editado.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Não é possível anexar o ficheiro `${0}' a esta mensagem."
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 #, fuzzy
@@ -11792,18 +12282,32 @@ msgstr ""
 "Para anexar o conteúdo deste directório, anexe individualmente os ficheiros "
 "contidos ou crie um arquivo com todos os ficheiros e anexe-o."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Incapaz de criar a mensagem."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Devido a \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Foram encontradas mensagens por terminar"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Deseja recuperar as mensagens por terminar?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11811,31 +12315,31 @@ msgstr ""
 "O Evolution terminou inesperadamente enquanto compunha uma nova mensagem. "
 "Recuperar a mensagem irá permitir-lhe continuar onde estava."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Não Recuperar"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recuperar"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Incapaz de gravar no ficheiro de gravação automática \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Erro ao gravar para a gravação automática devido a \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Aviso: Mensagem Alterada"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11844,7 +12348,7 @@ msgstr ""
 "a compor?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11854,48 +12358,66 @@ msgstr ""
 "excepto se a gravar na pasta de Rascunhos. Isto permitir-lhe-á continuar a "
 "mensagem mais tarde."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Descartar as Alterações"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Gravar a Mensagem"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Incapaz de criar a mensagem."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 #, fuzzy
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 "Devido a \"${0}\", poderá ter de seleccionar diferentes opções de mensagem."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Incapaz de ler o ficheiro de assinatura \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Devido a \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Todas as contas foram removidas."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Tem de configurar uma conta antes de poder compor uma mensagem."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Incapaz de criar a mensagem."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Incapaz de criar a janela de composição:\n"
+"Incapaz de activao r controlo de selecção de endereços."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Incapaz de criar a janela de composição:\n"
+"Incapaz de activar o componente de editor HTML.\n"
+"Certifique-se de que possui instaladas as versões\n"
+"correctas do gtkhtml e libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "O Pacote de Colaboração Ximian Evolution"
@@ -12199,10 +12721,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione uma data com a qual comparar"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "Regras de _Filtro"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12228,171 +12746,42 @@ msgstr "Tem de especificar um nome de ficheiro."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "O ficheiro \"{0}\" não existe ou não é um ficheiro normal."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Pasta inexistente."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Tem de especificar uma pasta."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Expressão regular \"{0}\" inválida."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Incapaz de compilar a expressão regular \"{1}\"."
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Nome inexistente."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Tem de dar um nome a este filtro."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Tem de indicar um nome para esta vPasta."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "Nome \"{0}\" já está a ser utilizado."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Seleccione outro nome."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Nenhuma origem seleccionada."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"Tem de especificar pelo menos uma pasta como origem.\n"
-"Pode seleccionar as pastas individualmente e/ou seleccionar todas\n"
-"as pastas locais, todas as remotas ou ambas."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Seleccione um ficheiro"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Então</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Seleccionar Pasta"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Regras de _Filtro</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Origem das vPastas</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Comparar com"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Recebidas"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"A data da mensagem será comparada com as\n"
-"12:00am da data especificada."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"A data da mensagem será comparada com uma\n"
-"data relativa à da filtragem."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"A data da mensagem será comparada com a data\n"
-"do momento em que a filtragem ocorrer."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "uma data relativa à data actual"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "atrás"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meses"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "apenas pastas específicas"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "a data actual"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "a data especificada"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "com todas as pastas remotas activas"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "com todas as pastas locais e as remotas activas"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "com todas as pastas locais"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "anos"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
@@ -12456,6 +12845,70 @@ msgstr "recebidas"
 msgid "outgoing"
 msgstr "enviadas"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Regras de _Filtro</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparar com"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Recebidas"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensagem será comparada com as\n"
+"12:00am da data especificada."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensagem será comparada com uma\n"
+"data relativa à da filtragem."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensagem será comparada com a data\n"
+"do momento em que a filtragem ocorrer."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "uma data relativa à data actual"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "atrás"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundos"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "a data actual"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "a data especificada"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "anos"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adicionar a Regra"
@@ -12468,59 +12921,74 @@ msgstr "Editar a Regra"
 msgid "Rule name"
 msgstr "Nome da regra"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Regras de _Pontuação"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontuação"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferências do Compositor"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Corpo contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure aqui as suas preferências de email, incluindo a segurança e "
+"apresentação de mensagens"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Corpo não contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Configure aqui a correcção ortográfica, assinaturas e o compositor de "
+"mensagens"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Corpo ou assunto contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure aqui as suas contas de correio"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Mensagem contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Email Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Destinatários contêm"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Controlo de configuração de contas de Email Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Remetente contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Componente de Email Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Assunto contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Compositor de Mensagem Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Assunto não contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Controlo de configuração de compositor de Mensagem Evolution"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "_Pastas Virtuais"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Controlo de preferências de Email Evolution"
 
-#: filter/vfolder-rule.c:493
-#, fuzzy
-msgid "_Add"
-msgstr "A_dicionar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Email"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Origem da vPasta"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Contas de Email"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Preferências do Email"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "E_mail:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12552,45 +13020,305 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "No(a) %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "Regras de _Filtro"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Seleccionar Pasta"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajustar a Pontuação"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Atribuir uma Cor"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Atribuir uma Pontuação"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Beep"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contém"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copiar para a Pasta"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Data de recepção"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Data de envio"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Apagada"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "não contém"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "não termina em"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "não existe"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "não devolve"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "não se assemelha a"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "não começa por"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Não Existe"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Rascunho"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "termina em"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existe"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expressão"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Seguimento"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "é"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "é posterior a"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "é anterior a"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "está Marcada"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "é maior do que"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "é menor do que"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "não é"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "não está Marcada"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Teste de Não Solicitado"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiqueta"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Lista de distribuição"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Corpo da Mensagem"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Cabeçalho da Mensagem"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Mensagem é Não Solicitada"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Mensagem não é Não Solicitada"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Mover para a Pasta"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Canal para a Aplicação"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Reproduzir o Som"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Ler"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinatários"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Coincidir Expr. Reg."
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Repondido a"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "devolve"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "devolve maior do que"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "devolve menor do que"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Executar Aplicação"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontuação"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Remetente"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Definir o Estado"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamanho (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "assemelha-se a"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Conta de Origem"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Cabeçalho específico"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "começa por"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Parar o Processamento"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Assunto"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Retirar o Estado"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Então</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar uma Pasta _Virtual a Partir da Procura..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Propriedades da pasta"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propriedades"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nome da Pasta"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Nº Total de Mensagens"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Nº Total de Mensagens"
+msgstr[1] "Nº Total de Mensagens"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Mensagens por ler"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mensagens por ler"
+msgstr[1] "Mensagens por ler"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12600,456 +13328,297 @@ msgstr "<clique aqui para seleccionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar uma Nova Pasta"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Criar uma pasta"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VPastas"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "SEMEQUIVALÊNCIA"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "A Ler..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Incapaz de largar a(s) mensagem(ns) para o nível de topo do armazenamento"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar para a Pasta"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover para a Pasta"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cancelar a Tarefa"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Renomear a Pasta"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Abrir numa _Nova Janela"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Mover"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VPastas"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "SEMEQUIVALÊNCIA"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Caixa de Entrada"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "A Ler..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Email"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder _a Todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Dar Se_guimento..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Marcar como _Terminada"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "L_impar a Marca"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Marcar como Lida"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marcar _por Ler"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Marcar como Irrelevante"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marcar como _Não Solicitada"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _Solicitada"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para a Pasta..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiqueta"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Adicionar o Remetente ao Li_vro de Endereços"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Aplicar _Filtros"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltrar Não Solicitado"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir da Mensagem"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VPasta baseada no A_ssunto"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VPasta baseada no Remete_nte"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VPasta baseada nos Destinatá_rios"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VPasta baseada na _Lista de Distribuição"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtrar baseado no Ass_unto"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtrar baseado no _Remetente"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtrar baseado no _Destinatário"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtrar baseado na _Lista de Distribuição"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Por Omissão"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimir a Mensagem"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Copiar a Localização do Link"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para enviar mensagem a %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Responder-A"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Assunto"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupo de notícias"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "anexo %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Incapaz de parsear a mensagem S/MIME: Erro desconhecido"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de encriptação não suportada para multipartes/encriptada"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Incapaz de parsear a mensagem MIME. A apresentar como código."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Formato de assinatura não suportado"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Erro ao verificar a assinatura"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Erro desconhecido ao verificar a assinatura"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "A obter `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Não assinada"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Assinatura válida"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Assinatura inválida"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Assinatura válida mas incapaz de verificar o remetente"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Sem encriptação"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Encriptada com cifra fraca"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Encriptada"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Encriptada com cifra forte"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Parte do corpo-externo mal formada."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Ponteiro para o servidor FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Ponteiro para o ficheiro local (%s) válido no servidor \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Ponteiro para o ficheiro local (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Ponteiro para dados remotos (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "A formatar a mensagem"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Aplicação de Email"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Equivalências: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Não assinada"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13057,7 +13626,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não existe nenhuma garantia de que seja "
 "autêntica."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Assinatura válida"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13065,7 +13638,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida o que significa que muito "
 "provavelmente é autêntica."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Assinatura inválida"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13073,11 +13650,11 @@ msgstr ""
 "A assinatura nesta mensagem não pode ser verificada, o que significa que "
 "pode ter sido alterada durante o percurso."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, incapaz de verificar o remetente"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13085,7 +13662,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida mas não é possível "
 "verificar o remetente da mesma."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Sem encriptação"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13093,7 +13674,11 @@ msgstr ""
 "Esta mensagem não está encriptada.  O seu conteúdo pode ser visualizado "
 "durante o seu percurso pela Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Encriptada com cifra fraca"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13103,7 +13688,11 @@ msgstr ""
 "Seria difícil, mas não impossível, que um terceiro conseguisse visualizar o "
 "conteúdo da mensagem dentro de um período de tempo útil."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Encriptada"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13111,7 +13700,11 @@ msgstr ""
 "Esta mensagem está encriptada.  Seria difícil que um terceiro conseguisse "
 "visualizar o seu conteúdo."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Encriptada com cifra forte"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13121,39 +13714,161 @@ msgstr ""
 "muito difícil que um terceiro conseguisse visualizar o seu conteúdo dentro "
 "de um período de tempo útil."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Visualizar o Certificado"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é visualizável"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminada a %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Ver Imbutido"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "A obter `%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Assinatura válida mas incapaz de verificar o remetente"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Parte do corpo-externo mal formada."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Ponteiro para o servidor FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Ponteiro para o ficheiro local (%s) válido no servidor \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Ponteiro para o ficheiro local (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Ponteiro para dados remotos (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "A formatar a mensagem"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Responder-A"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Aplicação de Email"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Grupo de notícias"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "anexo %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Incapaz de parsear a mensagem S/MIME: Erro desconhecido"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de encriptação não suportada para multipartes/encriptada"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Incapaz de parsear a mensagem MIME. A apresentar como código."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Formato de assinatura não suportado"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Erro ao verificar a assinatura"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Erro desconhecido ao verificar a assinatura"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (incorporado)"
@@ -13264,7 +13979,7 @@ msgstr "Enviar a _mensagem para..."
 msgid "_Add to Addressbook"
 msgstr "_Adicionar ao Livro de Endereços"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -13277,7 +13992,7 @@ msgstr "Este armazenamento não suporta subscrições ou estas não estão activ
 msgid "Subscribed"
 msgstr "Subscrito"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Pasta"
 
@@ -13311,11 +14026,24 @@ msgid "Add address"
 msgstr "Adicionar o endereço"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "_Pastas Virtuais"
+
+#: mail/em-vfolder-rule.c:494
+#, fuzzy
+msgid "_Add"
+msgstr "A_dicionar"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Origem da vPasta"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Reconhecimento automatico de links"
@@ -13802,67 +14530,33 @@ msgstr "porto onde iniciar o spamd executado pelo utilizador"
 msgid "spamd port"
 msgstr "porto spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Preferências do Compositor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure aqui as suas preferências de email, incluindo a segurança e "
-"apresentação de mensagens"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Configure aqui a correcção ortográfica, assinaturas e o compositor de "
-"mensagens"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure aqui as suas contas de correio"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Email Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Controlo de configuração de contas de Email Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Componente de Email Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador de Elm do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Compositor de Mensagem Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador de Netscape Mail do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Controlo de configuração de compositor de Mensagem Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador de Outlook Express 4 do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Controlo de preferências de Email Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Importador de Pine do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Contas de Email"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Preferências do Email"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "E_mail:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13920,34 +14614,6 @@ msgstr "A Importar `%s'"
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador de Elm do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador de Netscape Mail do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador de Outlook Express 4 do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Importador de Pine do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14117,77 +14783,83 @@ msgstr "lista de distribuição %s"
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d seleccionada"
+msgid_plural "%d deleted"
+msgstr[0] "%d seleccionada"
+msgstr[1] "%d seleccionada"
 
-#: mail/mail-component.c:463
-#, c-format
+#: mail/mail-component.c:461
+#, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d não solicitado"
+msgid_plural "%d junk"
+msgstr[0] "%d não solicitado"
+msgstr[1] "%d não solicitado"
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d rascunho"
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d rascunho"
+msgstr[1] "%d rascunho"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d enviada"
+msgid_plural "%d sent"
+msgstr[0] "%d enviada"
+msgstr[1] "%d enviada"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d por enviar"
+msgid_plural "%d unsent"
+msgstr[0] "%d por enviar"
+msgstr[1] "%d por enviar"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
 
-#: mail/mail-component.c:496
-#, c-format
+#: mail/mail-component.c:494
+#, fuzzy, c-format
 msgid ", %d unread"
-msgstr ", %d por enviar"
+msgid_plural ", %d unread"
+msgstr[0] ", %d por enviar"
+msgstr[1] ", %d por enviar"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mensagem de Email"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Pasta de Mensagens"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "A Verificar o Serviço"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "A estabelecer uma ligação ao servidor..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
@@ -14251,14 +14923,22 @@ msgstr ""
 "Introduza no espaço abaixo um nome para esta conta. Este nome apenas será "
 "utilizado para fins de visualização."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "A Verificar o Serviço"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "A estabelecer uma ligação ao servidor..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Verifi_car os Tipos Suportados "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Antever</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL não é suportado nesta compilação do evolution</b>"
@@ -14513,7 +15193,7 @@ msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Não assinar os pedidos de reunião (para co_mpatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
@@ -14851,6 +15531,122 @@ msgstr "cor"
 msgid "description"
 msgstr "descrição"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Leia com atenção o acordo de licença\n"
+"para %s apresentado abaixo\n"
+"e marque a caixa de selecção para a aceitar\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Origem das vPastas</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Assinatura Digital</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Encriptação</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Aceite"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Terminad_a"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Sensível à Capitalização"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Procurar na Mensagem"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Procurar:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Marcar para Dar Seguimento"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Subscrições de Pasta"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Acordo de Licença de %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Nenhuma Seleccionada"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_ervidor:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informação de Segurança"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"As mensagens que seleccionou para dar seguimento estão listadas abaixo.\n"
+"Seleccione uma acção de dar seguimento no menu \"Marcar\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lista de licenças aceites"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Expira A:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Marca:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Subscrever"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Remover a Subscrição"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "apenas pastas específicas"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "com todas as pastas remotas activas"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "com todas as pastas locais e as remotas activas"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "com todas as pastas locais"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14872,6 +15668,7 @@ msgstr "O seu início de sessão no servidor \"{0}\" como \"{0}\" falhou."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14900,8 +15697,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "En_viar"
+msgstr "Enviar"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15025,6 +15823,7 @@ msgstr "Tem mensagens por enviar, ainda assim deseja sair?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15071,14 +15870,6 @@ msgstr "Erro durante execução da operação."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15239,8 +16030,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Se prosseguir, a informação de conta será definitivamente apagada."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Não apagar"
+msgstr "Rec_uperar"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15269,6 +16061,7 @@ msgstr "Descartar as alterações?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Deseja gravar as alterações?"
 
@@ -15340,13 +16133,44 @@ msgstr ""
 "    \"{1}\"\n"
 "E foram actualizadas."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Pasta inexistente."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Tem de especificar uma pasta."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Tem de indicar um nome para esta vPasta."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Nenhuma origem seleccionada."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"Tem de especificar pelo menos uma pasta como origem.\n"
+"Pode seleccionar as pastas individualmente e/ou seleccionar todas\n"
+"as pastas locais, todas as remotas ou ambas."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problemas ao migrar a pasta de mensagens antiga \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15357,15 +16181,15 @@ msgstr ""
 "\n"
 "Pode ignorar esta pasta, sobrepo-la ou acrescentar o seu conteúdo, ou sair.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Sobrepor"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Acrescentar"
 
@@ -15526,7 +16350,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15535,45 +16359,21 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A estabelecer nova ligação a %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Sensível à Capitalização"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Procurar na Mensagem"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Procurar:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Assinatura Digital</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Encriptação</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informação de Segurança"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "A Cancelar..."
@@ -15609,24 +16409,24 @@ msgstr "A Actualizar..."
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operação."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza a Senha para %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Introduza a Senha"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Recordar esta senha"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta senha durante o resto desta sessão"
 
@@ -15681,15 +16481,15 @@ msgstr "A actualizar as vpastas para o uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "A actualizar as vpastas para o uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vPastas"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Editar a VPasta"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nova VPasta"
 
@@ -15753,7 +16553,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
@@ -15809,10 +16609,6 @@ msgstr "Reencaminhar"
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta Necessária"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Ler"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -15825,49 +16621,49 @@ msgstr "Responder a Todos"
 msgid "Review"
 msgstr "Rever"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Marcar para Dar Seguimento"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Corpo contém"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Terminad_a"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Corpo não contém"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"As mensagens que seleccionou para dar seguimento estão listadas abaixo.\n"
-"Seleccione uma acção de dar seguimento no menu \"Marcar\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Corpo ou assunto contém"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Expira A:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Mensagem contém"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Marca:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Destinatários contêm"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Subscrições de Pasta"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Remetente contém"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Nenhuma Seleccionada"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Assunto contém"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_ervidor:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Assunto não contém"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Subscrever"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Consola do Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Remover a Subscrição"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Teste do Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Componente de Teste do Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15935,30 +16731,17 @@ msgstr "Se saltar ou não o diálogo de aviso de versão de desenvolvimento"
 msgid "mail"
 msgstr "email"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Erro de sistema desconhecido."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Incapaz de se registar no OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Ligações Activas</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Base de Dados de Configuração não foi encontrada"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Ligações Activas"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Erro genérico"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Clique OK para fechar estas ligações e ficar desligado"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16144,27 +16927,6 @@ msgstr "Nome de pasta não pode conter o caracter \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution de momento está ligado.  Clique neste botão para trabalhar "
-"desligado."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution está no processo de se desligar."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution de momento está desligado.  Clique neste botão para trabalhar "
-"ligado."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mensagem para %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16183,108 +16945,90 @@ msgstr "Bub buddy não está instalado."
 msgid "Bug buddy could not be run."
 msgstr "Incapaz de executar o Bub buddy."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Caixa de Selecção"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novo"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Novo Teste"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Teste"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Criar um novo item de teste"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Ligações Activas</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Ligações Activas"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution de momento está ligado.  Clique neste botão para trabalhar "
+"desligado."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Clique OK para fechar estas ligações e ficar desligado"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está no processo de se desligar."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "C_alendário:"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution de momento está desligado.  Clique neste botão para trabalhar "
+"ligado."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Contactos:"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mensagem para %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "E_mail:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tarefas:"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Erro de sistema desconhecido."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Tipo de pasta:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Abrir a Pasta de Outro Utilizador"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Incapaz de se registar no OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Cont_a:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Base de Dados de Configuração não foi encontrada"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Nome da _Pasta:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Erro genérico"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Utilizador:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de Configuração do Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "A Importar os Ficheiros"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuso-Horário "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Bem Vindo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16298,7 +17042,7 @@ msgstr ""
 "\n"
 "Prima o botão \"Avançar\" para continuar. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16310,17 +17054,17 @@ msgstr ""
 "\n"
 "Prima o botão \"Aplicar\" para gravar as suas configurações. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Consola do Evolution"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Novo Teste"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Teste do Evolution"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Teste"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Componente de Teste do Evolution"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Criar um novo item de teste"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16382,7 +17126,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar dados dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16418,7 +17162,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho e aguardamos\n"
 "as suas contribuições!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16426,41 +17170,41 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Não apresentar novamente"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Forçar todos os componentes Evolution a terminar"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 "Forçar uma nova actualização de ficheiros de configuração do Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16545,6 +17289,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16791,6 +17557,11 @@ msgstr "Os Seus Certificados"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Certificado já existe"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16992,11 +17763,6 @@ msgstr "ID Único de Sujeito"
 msgid "Certificate Signature Value"
 msgstr "Valor da Assinatura do Certificado"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Certificado já existe"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Senha do Ficheiro PKCS12"
@@ -17136,8 +17902,8 @@ msgstr "Ver o contacto actual"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acções"
@@ -17612,16 +18378,6 @@ msgstr "_Inverter a Selecção"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensagens em Árvore"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fechar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar o Remetente ao Livro de Endereços"
@@ -18024,6 +18780,16 @@ msgstr "Ferramen_tas"
 msgid "_Undelete"
 msgstr "Rec_uperar"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Fechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -18106,10 +18872,6 @@ msgstr "Gravar o ficheiro actual com outro nome"
 msgid "Save the message in a specified folder"
 msgstr "Gravar a mensagem numa pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Enviar"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18670,7 +19432,7 @@ msgid "Evolution Query"
 msgstr "Questão Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18821,27 +19583,269 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Credenciais de Autenticação para o Servidor HTTP"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Calendários seleccionados para publicação"
+
+#~ msgid "Login name:"
+#~ msgstr "Nome de início de sessão:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "Publicações do Utilizador"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "editor-lista-contactos"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Gravar a Lista como um VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Incapaz de inicializar o wombat"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "O calendário seleccionado é apenas de leitura, não podendo ser criados "
+#~ "eventos. Seleccione um calendário para o qual possua permissões de "
+#~ "escrita."
+
+#~ msgid "C_alendar"
+#~ msgstr "C_alendário"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opções Audio de Alarme"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opções de Mensagem de Alarme"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opções de Email de Alarme"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opções de Aplicação de Alarme"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opções Desconhecidas de Alarme"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetição do Alarme"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Mensagem a Apresentar:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Mensagem a Enviar"
+
+#~ msgid "Play sound:"
+#~ msgstr "Reproduzir o som:"
+
+#~ msgid "Run program:"
+#~ msgstr "Executar aplicação:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Com estes argumentos:"
+
+#~ msgid "Basics"
+#~ msgstr "Simples"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Hora:"
+
+#~ msgid "Reminders"
+#~ msgstr "Lembretes"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opções..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Livro de Endereços..."
+
+#~ msgid "Reminder"
+#~ msgstr "Lembrete"
+
+#~ msgid "B_usy"
+#~ msgstr "Oc_upado"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidencial"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data & Hora"
+
+#~ msgid "F_ree"
+#~ msgstr "Liv_re"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vado"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pú_blico"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Adicionar um Par_ticipante"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Adicionar o Remetente ao Li_vro de Endereços"
+
+#~ msgid "Preview"
+#~ msgstr "Antever"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regra de Recorrência"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Recorrência _personalizada"
+
+#~ msgid "_Modify"
+#~ msgstr "_Alterar"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Sem recorrê_ncia"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Recorrência _simples"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Terminada"
+
+#~ msgid "Progress"
+#~ msgstr "Em Curso"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Con_fidencial"
+
+#~ msgid "Folder:"
+#~ msgstr "Pasta:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Início:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Fim:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Terminada:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Expira:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nenhum</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Ocorreu um erro no sistema CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objecto não foi encontrado\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Estado de participante não pode ser actualizado!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Adicionar o Remetente ao Li_vro de Endereços"
+
+#~ msgid "_Options"
+#~ msgstr "_Opções"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Hora de _início da reunião:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Hora de _finalização da reunião:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro ao abrir %s:\n"
+#~ " %s"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "A lista de tarefas seleccionada é apenas de leitura, não podem ser "
+#~ "criados eventos. Seleccione um calendário para o qual possua permissões "
+#~ "de escrita."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Incapaz de encontrar o certificado para `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Incapaz de criar Mensagem CMS"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Incapaz de criar contexto de codificador"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Incapaz de criar a janela de composição:\n"
+#~ "Incapaz de activar o componente de editor HTML."
+
+#~ msgid "_Score Rules"
+#~ msgstr "Regras de _Pontuação"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "No(a) %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nome da Pasta"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propriedades..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Caixa de Selecção"
+
+#~ msgid "C_alendar:"
+#~ msgstr "C_alendário:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "_Contactos:"
+
+#~ msgid "_Mail:"
+#~ msgstr "E_mail:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Tarefas:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Tipo de pasta:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Abrir a Pasta de Outro Utilizador"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Nome da _Pasta:"
+
+#~ msgid "_User:"
+#~ msgstr "_Utilizador:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Incapaz de se ligar ao servidor LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Falha ao autenticar-se no servidor LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Incapaz de efectuar pesquisa no DSE Raíz"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "O servidor respondeu com nenhuma base de procura suportada"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Este servidor não suporta esquema de informação LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Erro ao obter a informação de esquema"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Servidor não respondeu com informação de esquema válida"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  Apresentar _Bases Suportadas "
 
@@ -18917,9 +19921,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "item8"
 #~ msgstr "item8"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Editor de categorias indisponível."
-
 #~ msgid ""
 #~ "The following entries are invalid:\n"
 #~ "\n"
@@ -18971,9 +19972,6 @@ msgstr "%s (%d%% terminado)"
 #~ "O evento a ser apagado é uma reunião, deseja enviar uma notificação de "
 #~ "cancelamento?"
 
-#~ 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?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -18991,44 +19989,16 @@ msgstr "%s (%d%% terminado)"
 #~ "A entrada de diário a ser apagada está publicada, deseja enviar uma "
 #~ "notificação de cancelamento?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Tem a certeza de que deseja cancelar e apagar esta entrada de diário?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Tem a certeza de que deseja apagar o compromisso `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Tem a certeza de que deseja apagar este compromisso sem título?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Tem a certeza de que deseja apagar a tarefa `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Tem a certeza de que deseja apagar esta tarefa sem título?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Tem a certeza de que deseja apagar a entrada de diário `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr ""
 #~ "Tem a certeza de que deseja apagar esta entrada de diário sem título?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Tem a certeza de que deseja apagar %d compromisso?"
-#~ msgstr[1] "Tem a certeza de que deseja apagar %d compromissos?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Tem a certeza de que deseja apagar %d tarefa?"
-#~ msgstr[1] "Tem a certeza de que deseja apagar %d tarefas?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Tem a certeza de que deseja apagar %d entrada de diário?"
-#~ msgstr[1] "Tem a certeza de que deseja apagar %d entradas de diário?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "Conv_idar Outros..."
 
@@ -19069,9 +20039,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "A aprender a distinguir mensagens não-solicitadas das restantes"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Incapaz de obter o artigo %s do servidor NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Afixação não autorizada pelo servidor de notícias"
 
@@ -19111,174 +20078,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Because \"${1}\"."
 #~ msgstr "Devido a \"${1}\"."
 
-#~ msgid "Adjust Score"
-#~ msgstr "Ajustar a Pontuação"
-
-#~ msgid "Assign Color"
-#~ msgstr "Atribuir uma Cor"
-
-#~ msgid "Assign Score"
-#~ msgstr "Atribuir uma Pontuação"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#~ msgid "Beep"
-#~ msgstr "Beep"
-
-#~ msgid "contains"
-#~ msgstr "contém"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copiar para a Pasta"
-
-#~ msgid "Date received"
-#~ msgstr "Data de recepção"
-
-#~ msgid "Date sent"
-#~ msgstr "Data de envio"
-
-#~ msgid "Deleted"
-#~ msgstr "Apagada"
-
-#~ msgid "does not contain"
-#~ msgstr "não contém"
-
-#~ msgid "does not end with"
-#~ msgstr "não termina em"
-
-#~ msgid "does not exist"
-#~ msgstr "não existe"
-
-#~ msgid "does not return"
-#~ msgstr "não devolve"
-
-#~ msgid "does not sound like"
-#~ msgstr "não se assemelha a"
-
-#~ msgid "does not start with"
-#~ msgstr "não começa por"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Não Existe"
-
-#~ msgid "Draft"
-#~ msgstr "Rascunho"
-
-#~ msgid "ends with"
-#~ msgstr "termina em"
-
-#~ msgid "Exist"
-#~ msgstr "Existe"
-
-#~ msgid "exists"
-#~ msgstr "existe"
-
-#~ msgid "Expression"
-#~ msgstr "Expressão"
-
-#~ msgid "Follow Up"
-#~ msgstr "Seguimento"
-
-#~ msgid "is"
-#~ msgstr "é"
-
-#~ msgid "is after"
-#~ msgstr "é posterior a"
-
-#~ msgid "is before"
-#~ msgstr "é anterior a"
-
-#~ msgid "is Flagged"
-#~ msgstr "está Marcada"
-
-#~ msgid "is greater than"
-#~ msgstr "é maior do que"
-
-#~ msgid "is less than"
-#~ msgstr "é menor do que"
-
-#~ msgid "is not"
-#~ msgstr "não é"
-
-#~ msgid "is not Flagged"
-#~ msgstr "não está Marcada"
-
-#~ msgid "Junk Test"
-#~ msgstr "Teste de Não Solicitado"
-
-#~ msgid "Mailing list"
-#~ msgstr "Lista de distribuição"
-
-#~ msgid "Message Body"
-#~ msgstr "Corpo da Mensagem"
-
-#~ msgid "Message Header"
-#~ msgstr "Cabeçalho da Mensagem"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Mensagem é Não Solicitada"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Mensagem não é Não Solicitada"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Mover para a Pasta"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Canal para a Aplicação"
-
-#~ msgid "Play Sound"
-#~ msgstr "Reproduzir o Som"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinatários"
-
-#~ msgid "Regex Match"
-#~ msgstr "Coincidir Expr. Reg."
-
-#~ msgid "Replied to"
-#~ msgstr "Repondido a"
-
-#~ msgid "returns"
-#~ msgstr "devolve"
-
-#~ msgid "returns greater than"
-#~ msgstr "devolve maior do que"
-
-#~ msgid "returns less than"
-#~ msgstr "devolve menor do que"
-
-#~ msgid "Run Program"
-#~ msgstr "Executar Aplicação"
-
-#~ msgid "Sender"
-#~ msgstr "Remetente"
-
-#~ msgid "Set Status"
-#~ msgstr "Definir o Estado"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamanho (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "assemelha-se a"
-
-#~ msgid "Source Account"
-#~ msgstr "Conta de Origem"
-
-#~ msgid "Specific header"
-#~ msgstr "Cabeçalho específico"
-
-#~ msgid "starts with"
-#~ msgstr "começa por"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Parar o Processamento"
-
-#~ msgid "Unset Status"
-#~ msgstr "Retirar o Estado"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "A Verificar as Mensagens _Recebidas"
 
@@ -19455,9 +20254,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "Finished"
 #~ msgstr "Terminado"
 
-#~ msgid "Group:"
-#~ msgstr "Grupo:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a7874bd62f..5ad2916c0d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.7\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-05-17 13:13-0400\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -27,14 +27,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "catálogo de endereços do evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "cabeçalho do contato: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minicartão do evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "pasta atual do catálogo de endereços "
@@ -55,34 +47,255 @@ msgstr " cartões"
 msgid " card"
 msgstr " cartão"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "cabeçalho do contato: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minicartão do evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "O item não pôde ser enviado!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Falha de autenticação com o servidor LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Verifique se a sua senha está correta. Lembre-se que várias senhas "
+"diferenciam maiúsculas de minúsculas; sua tecla caps lock pode estar ligada."
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "O servidor respondeu sem bases de pesquisa suportadas"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Este servidor não suporta informação de schema LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Não foi possível obter artigo %s do servidor NNTP"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "O servidor não respondeu com informação de schema válida"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Não foi possível carregar catálogo de endereços"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Editor de categorias não disponível."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Salvar no catálogo de endereços"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Erro ao carregar catálogo de endereços padrão."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Não é possível processar a pasta de fila"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Você deseja salvar suas alterações?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Descartar"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "e um outro contato."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Não foi possível analisar conteúdo da mensagem"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Erro ao adicionar contato"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Visualizador de endereços do catálogo de endereços do Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+#, fuzzy
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+"Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
+"reiniciado."
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Endereço padrão de sincronização:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Não foi possível carregar catálogo de endereços"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 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.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Acessando servidor LDAP anonimamente"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "A autenticação falhou.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletar"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEntre senha para %s (usuário %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificados"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure aqui o autocompletar"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+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:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualizador de cartões do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Componente do catálogo de endereços do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Controle de gerência de certifcados S/MIME do Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+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:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Gerencie aqui os seus certificados S/MIME"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -113,7 +326,8 @@ msgid "New Contacts Group"
 msgstr "Novo grupo de contatos"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Grupo de _contatos"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -137,15 +351,15 @@ msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Neste computador"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -154,19 +368,19 @@ msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Configurações do autocompletar"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -178,7 +392,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -188,7 +402,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -198,7 +412,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -210,38 +424,47 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra os dados de sincronização com "
 "pilot..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "O catálogo de endereços '%s' será removido. Você tem certeza que deseja "
 "continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Novo catálogo de endereços"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contatos"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Acessando servidor LDAP anonimamente"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "A autenticação falhou.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEntre senha para %s (usuário %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -263,59 +486,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI para a última pasta a ser usada no diálogo selecionar nomes"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Autocompletar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Contatos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Certificados"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Configure aqui o autocompletar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-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:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualizador de cartões do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Componente do catálogo de endereços do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Controle de gerência de certifcados S/MIME do Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-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:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Gerencie aqui os seus certificados S/MIME"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -323,7 +493,7 @@ msgstr "Gerencie aqui os seus certificados S/MIME"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -332,8 +502,7 @@ msgstr "Gerencie aqui os seus certificados S/MIME"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -359,6 +528,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
@@ -400,13 +570,11 @@ msgid "Anonymously"
 msgstr "Anonimamente"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
@@ -662,33 +830,26 @@ msgid "cards"
 msgstr "cartões"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Selecionar contatos do catálogo de endereços"
+#: 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:208
+msgid "Remove All"
+msgstr "Remover tudo"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remover"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remover tudo"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ver lista de contatos"
@@ -703,7 +864,7 @@ msgid "Send HTML Mail?"
 msgstr "Enviar correio HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Adicionar a contatos"
 
@@ -711,15 +872,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Fonte"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Selecionar contatos do catálogo de endereços"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -741,6 +909,11 @@ msgstr "C_ategoria:"
 msgid "_Find"
 msgstr "_Localizar"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Pesquisar"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>E-mail</b>"
@@ -778,9 +951,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabalho</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -801,7 +973,6 @@ msgid "Birthday:"
 msgstr "Aniversário:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Agenda:"
 
@@ -814,15 +985,15 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Contato"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -918,8 +1089,8 @@ msgstr "Página web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -938,43 +1109,27 @@ msgid "_File under:"
 msgstr "A_rquivar em:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "On_de:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Você tem certeza que deseja\n"
-"excluir estes contatos?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Você tem certeza que deseja\n"
-"excluir este contato?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editável"
 
@@ -1946,132 +2101,124 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Serviço"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Local"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nome do usuário"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Residencial"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Catálogo origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Catálogo alvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "É um novo contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Campos editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "A data recorrente é inválida"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Serviço"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Local"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nome do usuário"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Adicionar rápido de contato"
@@ -2089,6 +2236,22 @@ msgstr "Nome _completo:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Você tem certeza que deseja\n"
+"excluir estes contatos?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Você tem certeza que deseja\n"
+"excluir este contato?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Endereço _2:"
@@ -2211,49 +2374,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Selecionar contatos do catálogo de endereços"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membros"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Remover itens selecionados da lista de anexos"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Selecionado"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Esconder endereços ao enviar correio para esta lista"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Digite um endereço de e-mail ou arraste um contato para a lista abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Livro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "É nova lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Participantes necessários"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Salvar lista como VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contato alterado:"
@@ -2292,422 +2476,11 @@ msgstr ""
 "Você deseja adicioná-lo mesmo assim?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Pesquisa avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Listar membros"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Empresa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Cargo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Vídeo conferência"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "trabalho"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefone celular"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "pessoal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Nota"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Função"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Página web"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Sucesso"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr "Backend ocupado"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Repositório desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Catálogo de endereços não existe"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "Não existe contato próprio definido"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Permissão negada"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Contato não encontrado"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "O ID do contato já existe"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocolo não suportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Não foi possível cancelar"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Falhou a autenticação"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Autenticação necessária"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS não disponível"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "Não existe tal fonte"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Outro erro"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Não foi possível abrir este catálogo de endereços.  Por favor, verifique se "
-"o arquivo existe e se você possui as permissões para acessá-lo."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Não foi possível abrir este catálogo de endereços.  Isto significa que você "
-"forneceu uma URI incorreta ou que o servidor LDAP está fora do ar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Esta versão do Evolution não foi compilado com suporte a LDAP. Se você "
-"deseja usar LDAP no Evolution, deve recompilar o programa das fontes em CVS "
-"após obter o OpenLDAP a partir do link abaixo."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Não foi possível abrir este catálogo de endereços.  Isto significa que você "
-"forneceu uma URI incorreta ou que o servidor está fora do ar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"A esta consulta corresponderam mais cartões do que a configuração do\n"
-"servidor permite enviar ou do que a configuração do Evolution permite "
-"exibir.\n"
-"Por favor, torne a sua pesquisa mais específica ou aumente o limite de\n"
-"resultados nas preferências do servidor de diretório para este\n"
-"catálogo de endereços."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"O tempo para executar esta consulta excedeu o limite do servidor ou o\n"
-"limite que você configurou para este catálogo de endereços. Por favor,\n"
-"torne a sua pesquisa 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/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-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/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Esta consulta não terminou com sucesso."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Erro ao adicionar lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Erro ao adicionar contato"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Erro ao modificar lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Erro ao modificar contato"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Erro ao remover lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Erro ao remover contato"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Abrir %d contatos também abrirá %d novas janelas.\n"
-"Você realmente deseja exibir todos estes contatos?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s já existe\n"
-"Você deseja sobrescrevê-lo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Sobrescrever"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "cartao.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Mover contato para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Copiar contato para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Mover contatos para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Copiar contatos para"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Selecionar catálogo de endereços alvo."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Vários VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard para %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(nenhum)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "E-mail principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Selecionar uma ação"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Criar um novo contato \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adicionar endereço a um contato existente \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Consultando catálogo de endereços..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar informação do contato"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Mesclar endereço de e-mail"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "e um outro contato."
-msgstr[1] "e %d outros contatos."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Exibir VCard completo"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Exibir VCard compacto"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Salvar no catálogo de endereços"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Sem contatos"
@@ -2721,9 +2494,9 @@ msgstr[1] "%d contatos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Consulta"
 
@@ -2739,130 +2512,130 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar cartão"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Catálogo de endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Novo contato..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova lista de contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Pesquisar contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Configurações do pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Copiar para catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Mover para catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Visão atual"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualquer categoria"
@@ -2896,6 +2669,8 @@ msgid "Car Phone"
 msgstr "Telefone do carro"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorias"
 
@@ -2903,6 +2678,21 @@ msgstr "Categorias"
 msgid "Company Phone"
 msgstr "Telefone da empresa"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mail 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Sobrenome"
@@ -2939,14 +2729,29 @@ msgstr "Diário"
 msgid "Manager"
 msgstr "Gerente"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefone celular"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Apelido"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Nota"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Escritório"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Empresa"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro fax"
@@ -2998,29 +2803,21 @@ msgstr "Unidade"
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Largura"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Altura"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Possui foco"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selecionado"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Possui cursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Campo"
@@ -3037,7 +2834,11 @@ msgstr "Modelo de texto"
 msgid "Max field name length"
 msgstr "Comprimento máximo de nome de campo"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Largura da coluna"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3051,7 +2852,7 @@ msgstr ""
 "\n"
 "Clique duas vezes aqui para criar um novo contato."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3061,13 +2862,392 @@ msgstr ""
 "\n"
 "Não há itens neste modo de exibição."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adaptador"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Largura da coluna"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selecionado"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Possui cursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Listar membros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Cargo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Vídeo conferência"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "trabalho"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "pessoal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Função"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Página web"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Sucesso"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr "Backend ocupado"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Repositório desconectado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Catálogo de endereços não existe"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "Não existe contato próprio definido"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Permissão negada"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Contato não encontrado"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "O ID do contato já existe"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocolo não suportado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Não foi possível cancelar"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Falhou a autenticação"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Autenticação necessária"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS não disponível"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Não existe tal fonte"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Outro erro"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Não foi possível abrir este catálogo de endereços.  Por favor, verifique se "
+"o arquivo existe e se você possui as permissões para acessá-lo."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Não foi possível abrir este catálogo de endereços.  Isto significa que você "
+"forneceu uma URI incorreta ou que o servidor LDAP está fora do ar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Esta versão do Evolution não foi compilado com suporte a LDAP. Se você "
+"deseja usar LDAP no Evolution, deve recompilar o programa das fontes em CVS "
+"após obter o OpenLDAP a partir do link abaixo."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Não foi possível abrir este catálogo de endereços.  Isto significa que você "
+"forneceu uma URI incorreta ou que o servidor está fora do ar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"A esta consulta corresponderam mais cartões do que a configuração do\n"
+"servidor permite enviar ou do que a configuração do Evolution permite "
+"exibir.\n"
+"Por favor, torne a sua pesquisa mais específica ou aumente o limite de\n"
+"resultados nas preferências do servidor de diretório para este\n"
+"catálogo de endereços."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"O tempo para executar esta consulta excedeu o limite do servidor ou o\n"
+"limite que você configurou para este catálogo de endereços. Por favor,\n"
+"torne a sua pesquisa 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/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Esta consulta não terminou com sucesso."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Erro ao adicionar lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Erro ao adicionar contato"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Erro ao modificar lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Erro ao modificar contato"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Erro ao remover lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Erro ao remover contato"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Abrir %d contatos também abrirá %d novas janelas.\n"
+"Você realmente deseja exibir todos estes contatos?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s já existe\n"
+"Você deseja sobrescrevê-lo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Sobrescrever"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "cartao.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Mover contato para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Copiar contato para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Mover contatos para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Copiar contatos para"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Selecionar catálogo de endereços alvo."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Vários VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard para %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(nenhum)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "E-mail principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Selecionar uma ação"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Criar um novo contato \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adicionar endereço a um contato existente \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Consultando catálogo de endereços..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Editar informação do contato"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Mesclar endereço de e-mail"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "e um outro contato."
+msgstr[1] "e %d outros contatos."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Exibir VCard completo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Exibir VCard compacto"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Salvar no catálogo de endereços"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3111,6 +3291,11 @@ msgstr "Importador VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir envelope"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contatos"
@@ -3120,11 +3305,6 @@ msgstr "Imprimir contatos"
 msgid "Print contact"
 msgstr "Imprimir contato"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir envelope"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3309,6 +3489,22 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Não é possível abrir arquivo"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Não foi possível carregar catálogo de endereços"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Não é possível abrir o catálogo de endereços"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Especifique um arquivo de saída no lugar da saída padrão"
@@ -3366,22 +3562,6 @@ msgstr "No modo normal não é necessário a opção de tamanho."
 msgid "Impossible internal error."
 msgstr "Erro interno impossível."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Não é possível abrir arquivo"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Não foi possível carregar catálogo de endereços"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Não é possível abrir o catálogo de endereços"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erro ao carregar catálogo de endereços padrão."
@@ -3398,39 +3578,368 @@ msgstr "Não foi fornecido um nome de arquivo."
 msgid "Unnamed List"
 msgstr "Lista sem nome"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Não excluir"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Enviar para:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Você tem certeza que deseja excluir %d tarefa?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Você tem certeza que deseja cancelar e excluir este item de diário?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Você tem certeza que deseja excluir %d item de diário?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Você tem certeza que deseja excluir %d comprimisso?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Compromisso"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Você deseja salvar suas alterações?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s  Você fez alterações. Esquecer estas alterações e atualizar o editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "Descartar alterações"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Salvar mensagem"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+#, fuzzy
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+"Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
+"reiniciado."
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Importador vCalendar do Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+#, fuzzy
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+"Se você sair, estas mensagens não serão enviadas até que o Evolution seja "
+"reiniciado."
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Entre a senha"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Dividir eventos de vários dias:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Não foi possível iniciar o servidor wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Não foi possível iniciar wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Não foi possível ler os dados do aplicativo de agenda do pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Prioridade padrão:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Não foi possível ler os dados do aplicativo de tarefas do pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Agenda e tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Agenda e tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Controle de configuração da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visualizador de mensagens de agendamento da agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor da agenda e tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Componente de agenda do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Componente de tarefas do Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Iniciando:"
@@ -3528,10 +4037,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
@@ -3672,9 +4177,29 @@ msgstr "Se as horas são exibidas no formato 24h no lugar de se usar am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Se é necessário exibir o número da semana no navegador de datas"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Resumo contém"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Descrição contém"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comentário contém"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Local contém"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Não casadas"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3695,8 +4220,8 @@ msgid "Purge events older than"
 msgstr "Apagar permanentemente eventos com idade superior a"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dias"
 
@@ -3707,7 +4232,7 @@ msgstr "%A, %d de %B de %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3755,64 +4280,52 @@ msgstr "Não é possível abrir a agenda '%s' para criar eventos e reuniões"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Não há agenda disponível para criar eventos e reuniões"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"A agenda selecionada é de apenas leitura, eventos não podem ser criados. Por "
-"favor, selecione uma agenda com possibilidade de escrita."
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Agendas"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Novo compromisso"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Compromisso"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Criar um novo compromisso"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Reunião"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Criar um novo pedido de reunião"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Novo compromisso de dia inteiro"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Compromisso de _dia inteiro"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Criar um novo compromisso de dia inteiro"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Nova agenda"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "A_genda"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Agenda"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Criar uma nova agenda"
 
@@ -3842,26 +4355,6 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Resumo contém"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Descrição contém"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comentário contém"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Local contém"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Não casadas"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir a agenda"
@@ -3879,216 +4372,132 @@ msgstr "Permissão negada para abrir a agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opções do alarme audível"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opções do alarme de mensagens"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opções do alarme de e-mail"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opções do alarme de programa"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opções do alarme desconhecido"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Repetição do alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Mensagem a exibir:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Mensagem a enviar"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Tocar som:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repetir o alarme"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Executar programa:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Enviar para:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Com estes argumentos:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Alertas</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "vezes extra a cada"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opções da lista de tarefas</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "horas"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Geral</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Ação/gatilho"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Adicionar"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Redigir uma mensagem"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Básico"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/hora:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Mensagens"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Tocar um som"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "Exibir um alerta"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Lembretes"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Executar um programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Enviar para:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Enviar um e-mail"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Resumo:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Conta:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Executar programa"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repetir o alarme"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opções..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "_Enviar"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "após"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "antes"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dia(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "fim do compromisso"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "vezes extra a cada"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hora(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "horas"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Você deve especificar um local de onde pegar a agenda."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "O local fonte '%s' não é bem formado."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "O local fonte '%s' não é uma fonte webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "A fonte com o nome '%s' já existe no grupo selecionado"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"O grupo '%s' é remoto. Você deve especificar um local de onde pegar a agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Adicionar agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Adicionar grupo de tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_or:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Escolha uma cor"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Adicionar agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Adicionar group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "Atuali_zar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Tipo:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Ação/gatilho"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Adicionar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmes"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4197,7 +4606,7 @@ msgid "Free/Busy Publishing"
 msgstr "Publicação de livre/ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Sexta-feira"
@@ -4211,7 +4620,7 @@ msgid "Minutes"
 msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Segunda-feira"
@@ -4221,7 +4630,7 @@ msgid "S_un"
 msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
@@ -4235,7 +4644,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Exibir _números de semana no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domigo"
@@ -4249,7 +4658,7 @@ msgid "T_hu"
 msgstr "Qu_i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Quinta-feira"
@@ -4263,7 +4672,7 @@ msgid "Time format:"
 msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Terça-feira"
@@ -4273,7 +4682,7 @@ msgid "W_eek starts:"
 msgstr "Sema_na começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Quarta-feira"
@@ -4306,7 +4715,8 @@ msgstr "_Comprimir fins de semana na visão de mês"
 msgid "_Day begins:"
 msgstr "Dia _começa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4356,6 +4766,73 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Você deve especificar um local de onde pegar a agenda."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "O local fonte '%s' não é bem formado."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "O local fonte '%s' não é uma fonte webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "A fonte com o nome '%s' já existe no grupo selecionado"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"O grupo '%s' é remoto. Você deve especificar um local de onde pegar a agenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Adicionar agenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Adicionar grupo de tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "C_or:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Escolha uma cor"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Adicionar agenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Adicionar group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "Atuali_zar:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "semanas"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi excluído."
@@ -4401,81 +4878,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Você não fez alterações, atualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Erro de validação: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " para "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Concluída "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Concluída "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Prazo "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Prazo "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Não foi possível atualizar objeto"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editar compromisso"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Compromisso - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Item de diário - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Sem resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Salvar como..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As alterações feitas a este item poderão ser descartadas se houver uma "
 "atualização"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Não foi possível usar a versão atual!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Erro de validação: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " para "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Concluída "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Concluída "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Prazo "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Prazo "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Não foi possível abrir fonte"
@@ -4537,8 +5008,9 @@ 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"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Catálogo de endereços..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Contatos"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4548,160 +5020,221 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Agendar"
 
-#: 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Orientação"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Reunião"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Evento sem data de início"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Evento sem data de término"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "A data de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "A data de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "A hora de início está errada"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "A hora de término está errada"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Não é possível abrir a agenda '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "antes de cada compromisso"
+msgstr[1] "antes de cada compromisso"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "fim do compromisso"
+msgstr[1] "fim do compromisso"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "antes de cada compromisso"
+msgstr[1] "antes de cada compromisso"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Dia inteiro"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "antes de cada compromisso"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Ocupado"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "antes de cada compromisso"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorias..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "antes de cada compromisso"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Lista de tarefas</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Classificação"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Hora</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Co_nfidencial"
+msgid "A_ll day event"
+msgstr "_Dia inteiro"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data & hora"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Salvar visão personalizada..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Li_vre"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorias..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Local:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Agenda:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Partic_ular"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Classificação"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Público"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidencial"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Exibir tempo como"
+msgid "L_ocation:"
+msgstr "_Local:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Particular"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Público"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Exibir tempo como"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "_Resumo:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmes"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descrição:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Hora de tér_mino:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Hora de _início:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Nenhum"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "O organizador selecionada já não possui uma conta."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "É necessário um organizador."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "É necessário pelo menos um participante."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegar para..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "E_xcluir"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Remover"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4740,35 +5273,45 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Adicionar _participante"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Alertas</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Adicionar remetente ao catálo_go de endereços"
+msgid "<b>Organizer</b>"
+msgstr "<b>Outro</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Alterar organizador"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizador:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Contatos"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Alterar organizador"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizador:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4840,145 +5383,139 @@ msgstr "Esta e futuras instâncias"
 msgid "All Instances"
 msgstr "Todas as instâncias"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Este compromisso possui repetições que o Evolution não pode editar."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "A data recorrente é inválida"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "primeiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "segundo"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "terceiro"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "quarto"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "último"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Outra data"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "no"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "ocorrências"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Data/hora"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "A cada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Exceções"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Visualizar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Regra de repetição"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Repetição _personalizada"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modificar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Visualizar</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Sem repetição"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Repetição"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Remover"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "A cada"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "R_epetição simples"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Editar compromisso"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "para"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "para sempre"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mês(es)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "até"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Selecionar destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Fontes de mensagem</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% C_oncluída"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Alertas</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Concluída"
 
@@ -4990,8 +5527,8 @@ msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Em progresso"
@@ -5003,22 +5540,22 @@ msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Não iniciada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Progresso"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Percentagem concluída: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5041,36 +5578,42 @@ msgstr "_Estado:"
 msgid "_Web Page:"
 msgstr "Página _web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Tarefa"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Atribuição"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "O prazo de conclusão está errado"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Não é possível abrir tarefas em '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Confidencial"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opções</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Excluir correio</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrição:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Pasta:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "_Data de início:"
@@ -5079,52 +5622,58 @@ msgstr "_Data de início:"
 msgid "_Due date:"
 msgstr "Pra_zo de conclusão:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Credenciais de autenticação para o servidor HTTP"
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupo:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Agendas selecionadas para publicação"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opções da agenda</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Diariamente"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Freqüência de publicação"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Editor livre/ocupado"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Local de publicação livre/ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Local de publicação livre/ocupado"
+msgid "Free/Busy Editor"
+msgstr "Editor livre/ocupado"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Nome do usuário:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Diariamente"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Senha:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Correio:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Freqüência de publicação"
+#, fuzzy
+msgid "_Password:"
+msgstr "Senha:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Lembrar senha"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nome do _usuário:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "O usuário publica"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Semanalmente"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5206,7 +5755,7 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
@@ -5215,6 +5764,11 @@ msgstr "Clique para abrir %s"
 msgid "Untitled"
 msgstr "Sem título"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Resumo:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5226,7 +5780,7 @@ msgstr "Prazo de conclusão:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5238,20 +5792,93 @@ msgstr "Prioridade:"
 msgid "Web Page:"
 msgstr "Página web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Público"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data de término"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Particular"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data de início"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Resumo"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Livre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupado"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "L"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A posição geográfica deve ser fornecida no formato: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Sim"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Não"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Repetindo"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Atribuido"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5297,95 +5924,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Livre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_brir"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimir..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "C_olar"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Atribuir tarefa"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Encaminhar como iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Marcar como concluída"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Marcar tarefas selecionadas como concluídas"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "E_xcluir"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Excluir tarefas selecionadas"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Salvar como..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Clique para adicionar uma tarefa"
 
@@ -5394,174 +6027,105 @@ msgstr "Clique para adicionar uma tarefa"
 msgid "% Complete"
 msgstr "% Concluída"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Concluída"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Data de conclusão"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Prazo de conclusão"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Data de início"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumo"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Ordenar tarefas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Movendo mensagens"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Copiando mensagens"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecionar _hoje"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "Selecionar data..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para _pasta..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover para pasta..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta ocorrência"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir todas as ocorrências"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Configurações..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data de término"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Data de início"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Repetindo"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Atribuido"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Sim"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Não"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "L"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posição geográfica deve ser fornecida no formato: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5585,36 +6149,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i frações de minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i frações de minuto"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5681,37 +6245,35 @@ msgid ", ending on "
 msgstr ", terminando em "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Começa:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Termina:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Estado"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Concluída:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Prazo:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Prazo "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5719,308 +6281,288 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informação e então selecione uma ação a "
 "partir do menu abaixo."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Nenhum</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Local:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Atualizar"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de agenda visualizáveis"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Ocorreu um erro no sistema CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objeto não pôde ser encontrado\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1861
-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:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
@@ -6049,6 +6591,10 @@ msgstr "Carregando agenda"
 msgid "Loading calendar..."
 msgstr "Carregando agenda..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizador:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mensagem do servidor:"
@@ -6065,11 +6611,6 @@ msgstr "data-inicio"
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Participantes necessários"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
@@ -6137,6 +6678,28 @@ msgstr "Delegado"
 msgid "In Process"
 msgstr "Em andamento"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fora do escritório"
@@ -6145,98 +6708,64 @@ msgstr "Fora do escritório"
 msgid "No Information"
 msgstr "Sem informação"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Adicionar remetente ao catálo_go de endereços"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opções"
+msgid "O_ptions"
+msgstr "Opções"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Exibir apenas _horas do expediente"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Exibir com _menos ampliação"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Atualizar livre/ocupado"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autoseleção"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Todas as pessoas e recursos"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Todas as _pessoas e um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Hora de _início da reunião:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Hora de _término da reunião:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Entre a senha para %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6245,116 +6774,51 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Carregando tarefas"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Erro abrindo %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Carregando tarefas"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tarefas"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Atualizando objetos"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Agenda e tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Agenda e tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Controle de configuração da agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visualizador de mensagens de agendamento da agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor da agenda e tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Componente de agenda do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Componente de tarefas do Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Agendas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tarefas"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6701,10 +7165,6 @@ msgstr "Mês selecionado (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Ano selecionado (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Tarefa"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6735,7 +7195,7 @@ msgid "Contacts: "
 msgstr "Contatos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
@@ -6764,7 +7224,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6785,35 +7245,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-"A lista de tarefas selecionada é de apenas leitura, eventos não podem ser "
-"criados. Por favor, selecione uma agenda com possibilidade de escrita."
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Novo grupo de tarefas"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "Grupo de _tarefas"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Cria um novo grupo de tarefas"
 
@@ -8491,69 +8944,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sincronizando pastas"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Erro ao analisar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Erro ao executar filtro: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Não é possível abrir a pasta de fila"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Não é possível processar a pasta de fila"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Obtendo mensagem %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Não é possível abrir mensagem"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Falhou na mensagem %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sincronizando pasta"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Obtendo mensagem %d de %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Falhou na mensagem %d de %d"
@@ -8575,42 +9028,6 @@ msgstr "Argumentos inválidos para (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar pesquisa por filtro: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operação não suportada: anexar mensagem: para %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operação não suportada: pesquisa por expressão: para %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Operação não suportada: pesquisa por uids: para %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Movendo mensagens"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Copiando mensagens"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Alerta"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtrando novas mensagem(ns)"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8654,7 +9071,43 @@ msgstr "(match-threads) requer um conjunto de pastas"
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta em cabeçalho desconhecido: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Operação não suportada: anexar mensagem: para %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Operação não suportada: pesquisa por expressão: para %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Operação não suportada: pesquisa por uids: para %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Movendo mensagens"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Copiando mensagens"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Alerta"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtrando novas mensagem(ns)"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8665,15 +9118,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 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:758
+#: camel/camel-gpg-context.c:760
 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:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8682,29 +9135,29 @@ msgstr ""
 "Você precisa de uma frase-senha para destravar a chave\n"
 "para o usuário: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelada."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falhou o destravamento da chave secreta: fornecidas 3 frases-senha inválidas."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8715,65 +9168,85 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Falhou a execução de GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Não foi possível gerar dados de assinatura: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Falhou a execução do gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Falhou a execução do gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Não é possível verificar assinatura da mensagem: Formato de mensagem "
 "incorreto"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Não foi possível gerar dados de cifragem: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem cifrada digitalmente"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Conteúdo cifrado"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Não foi possível analisar conteúdo da mensagem"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Não é possível criar pipe de bloqueio auxiliar: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Não é possível executar fork para o auxiliar de bloqueio: %s"
+
+#: 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 "Não foi possível bloquear '%s': erro de protocolo com lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Não foi possível bloquear '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8796,26 +9269,6 @@ msgstr "Falha ao obter bloqueio usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Falha ao obter bloqueio usando flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Não é possível criar pipe de bloqueio auxiliar: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Não é possível executar fork para o auxiliar de bloqueio: %s"
-
-#: 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 "Não foi possível bloquear '%s': erro de protocolo com lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Não foi possível bloquear '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9074,7 +9527,7 @@ msgstr "As credenciais de referência expiraram."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9160,55 +9613,55 @@ msgstr "Autenticação POP antes de SMTP usando uma fonte não POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Falha ao compilar expressão regular: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "A URL '%s' precisa de um componente nome do usuário"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "A URL '%s' precisa de um componente máquina"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "A URL '%s' precisa de um componente caminho"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Falha na consulta de nome: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Falhou a consulta de máquina: não é possível criar thread: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Falhou a consulta de máquina: %s: máquina não encontrada"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Falhou a consulta de máquina: %s: razão desconhecida"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Resolvendo endereço"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Falhou a consulta de máquina: máquina não encontrada"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Falhou a consulta de máquina: razão desconhecida"
 
@@ -9280,7 +9733,7 @@ msgstr "Não é possível adicionar certificado de cifragem"
 msgid "Cannot add CMS SignerInfo"
 msgstr "Não é possível adicionar SignerInfo CMS"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "Não é possível criar contexto de codificador"
 
@@ -9361,7 +9814,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensagem com certificado apenas, certificados importados e verificados"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "Não é possível localizar digests de assinatura"
 
 #: camel/camel-smime-context.c:651
@@ -9374,47 +9828,51 @@ msgid "Decoder failed"
 msgstr "Falhou o decodificador"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Não é possível localizar certificado para `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
+msgstr "Não é possível localizar certificado para '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Não é possível localizar algoritmo comum de cifragem em massa"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Não é possível alocar espaço para chave de cifragem em massa"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "Não é possível criar mensagem CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "Não é possível criar EnvelopedData CMS"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "Não é possível anexar EnvelopedData CMS"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "Não é possível anexar objeto de dados CMS"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "Não é possível criar RecipientInfo CMS"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "Não é possível adicionar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "Não é possível criar contexto do codificador"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falha ao adicionar dados ao codificador"
@@ -9459,7 +9917,8 @@ msgstr "Não é possível criar pasta: %s: pasta existe"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não é possível excluir pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
@@ -9468,8 +9927,8 @@ msgstr "Não é possível renomear pasta: %s: Operação inválida"
 msgid "Trash"
 msgstr "Lixeira"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Lixo"
 
@@ -9590,7 +10049,7 @@ msgstr "O uso da chave não suporta assinatura de certificados"
 msgid "Error in application verification"
 msgstr "Erro na verificação de aplicativo"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9603,11 +10062,11 @@ msgstr ""
 "Impressão digital: %s\n"
 "Assinatura:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "VÁLIDO"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "INVÁLIDO"
 
@@ -9631,7 +10090,7 @@ msgstr ""
 "Você deseja aceitá-lo mesmo assim?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9646,7 +10105,7 @@ msgstr ""
 "\n"
 "Você deseja aceitá-lo?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9655,7 +10114,7 @@ msgstr ""
 "Problema do certificado: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9664,7 +10123,7 @@ msgstr ""
 "Domínio do certificado inválido: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9673,7 +10132,7 @@ msgstr ""
 "Certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9682,7 +10141,7 @@ msgstr ""
 "Lista de revogação do certificado expirou: %s\n"
 "Emissor: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Não foi possível analisar URL `%s'"
@@ -9706,7 +10165,7 @@ msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 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:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
@@ -9725,8 +10184,8 @@ msgid "Checking for new mail"
 msgstr "Verificando novas mensagens"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Verificar novas mensagens em todas as pastas"
 
@@ -9756,8 +10215,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Para acesssar servidores Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9777,318 +10236,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista de tarefas"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Resposta inesperada do servidor IMAP4 %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Não é possível selecionar pasta `%s': Nome de pasta inválido"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Não é possível selecionar pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Servidor IMAP4 %s se desconectou inesperadamente: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Obtive resposta BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Não é possível sincronizar marcas com a pasta `%s': Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Não é possível sincronizar marcas com a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Não é possível excluir permanentemente na pasta `%s': Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Não é possível excluir permanentemente na pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "Não é possível obter mensagem %s da pasta `%s': Mensagem não existe"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "Não é possível obter mensagem %s da pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Não é possível acrescentar mensagem a pasta `%s': Erro desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Não é possível acrescentar mensagem a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Não é possível mover mensagens da pasta `%s' para a pasta `%s': Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Não é possível copiar mensagens da pasta `%s' para a pasta `%s': Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Não é possível mover mensagens da pasta `%s' para a pasta `%s': Comando "
-"inválido"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Não é possível copiar mensagens da pasta `%s' para a pasta `%s': Comando "
-"inválido"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Pastas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Exibir apenas pastas inscritas"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espaço de nomes"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Para ler e armazenar correio em servidores IMAPv4rev1. EXPERIMENTAL !!"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opção estabelelece conexão com o servidor IMAPv4rev1 usando uma senha "
-"em texto claro."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Servidor IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Serviço IMAP para %s em %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Não foi possível conectar à %s (porta %d): %s."
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL não disponível"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexão cancelada"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Falhou a conexão ao servidor IMAP %s em modo seguro: Servidor não suporta "
-"STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Erro desconhecido"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Não é possível autenticar-se com o servidor IMAP %s usando o mecanismo de "
-"autenticação %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sPor favor, entre a senha IMAP para %s na máquina %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Não é possível autenticar-se com o servidor IMAP %s usando %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Não é possível obter pasta `%s' no servidor IMAP %s: Desconhecido"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome de pasta \"%s\" é inválido pois ele contém o caractere \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Não é possível criar pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Não é possível criar pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Não é possível excluir pasta `%s': Pasta especial"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Não é possível excluir pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Não é possível excluir pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-"Não é possível obter informação %s para o padrão `%s' no servidor IMAP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
-msgstr "Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-"Não é possível inscrever a pasta `%s': Nome de caixa de correio inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Não é possível inscrever a pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr ""
-"Não é possível cancelar a inscrição da pasta `%s': Nome de caixa de correio "
-"inválido"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Não é possível cancelar a inscrição da pasta `%s': Comando inválido"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Token inesperado na resposta do servidor IMAP %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Sem dados"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Servidor IMAP %s se desconectou inesperadamente: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor se desconectou inesperadamente: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Erro desconhecido"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10157,7 +10326,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10228,6 +10397,27 @@ msgstr "Usar comando personalizado para conectar ao servidor"
 msgid "Command:"
 msgstr "Comando:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Pastas"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Exibir apenas pastas inscritas"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+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:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Espaço de nomes"
+
 #: 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 de entrada deste servidor"
@@ -10248,43 +10438,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Servidor IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Serviço IMAP para %s em %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Não foi possível conectar à %s (porta %d): %s."
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL não disponível"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexão cancelada"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Extensão SSL/TLS não suportada."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Falharam as negociações SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Não foi possível conectar com o comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s não suporta o tipo de autenticação pedido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor, entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Você não entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10295,30 +10534,277 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "O nome de pasta \"%s\" é inválido pois ele contém o caractere \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Não é possível criar pasta `%s': pasta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Falhou a autenticação com o servidor POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada do servidor IMAP4 %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Não é possível selecionar pasta `%s': Nome de pasta inválido"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Não é possível selecionar pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Servidor IMAP4 %s se desconectou inesperadamente: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Obtive resposta BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Não é possível sincronizar marcas com a pasta `%s': Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Não é possível sincronizar marcas com a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Não é possível excluir permanentemente na pasta `%s': Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Não é possível excluir permanentemente na pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Não é possível obter mensagem %s da pasta `%s': Mensagem não existe"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Não é possível obter mensagem %s da pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Não é possível acrescentar mensagem a pasta `%s': Erro desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Não é possível acrescentar mensagem a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Não é possível mover mensagens da pasta `%s' para a pasta `%s': Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Não é possível copiar mensagens da pasta `%s' para a pasta `%s': Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Não é possível mover mensagens da pasta `%s' para a pasta `%s': Comando "
+"inválido"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Não é possível copiar mensagens da pasta `%s' para a pasta `%s': Comando "
+"inválido"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Para ler e armazenar correio em servidores IMAPv4rev1. EXPERIMENTAL !!"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Esta opção estabelelece conexão com o servidor IMAPv4rev1 usando uma senha "
+"em texto claro."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Falhou a conexão ao servidor IMAP %s em modo seguro: Servidor não suporta "
+"STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Não é possível autenticar-se com o servidor IMAP %s usando o mecanismo de "
+"autenticação %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPor favor, entre a senha IMAP para %s na máquina %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Não é possível autenticar-se com o servidor IMAP %s usando %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Não é possível obter pasta `%s' no servidor IMAP %s: Desconhecido"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Não é possível criar pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Não é possível criar pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Não é possível excluir pasta `%s': Pasta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Não é possível excluir pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Não é possível excluir pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Não é possível excluir pasta `%s': Pasta especial"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Não é possível criar pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Não é possível criar pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Não é possível obter informação %s para o padrão `%s' no servidor IMAP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Não é possível inscrever a pasta `%s': Nome de caixa de correio inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Não é possível inscrever a pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+"Não é possível cancelar a inscrição da pasta `%s': Nome de caixa de correio "
+"inválido"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Não é possível cancelar a inscrição da pasta `%s': Comando inválido"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Token inesperado na resposta do servidor IMAP %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Sem dados"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Servidor IMAP %s se desconectou inesperadamente: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10488,18 +10974,26 @@ msgstr "Não foi possível salvar resumo: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Não é possível adicionar mensagem ao resumo: razão desconhecida"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Cancelado o acréscimo de mensagem maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Não é possível acrescentar mensagem à pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10515,48 +11009,48 @@ msgstr ""
 "Não é possível obter mensagem: %s da pasta %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Conteúdo de mensagem inválido"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Não é possível obter pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Não é possível obter pasta `%s': pasta não existe."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Não é possível criar pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Não é possível obter pasta `%s': não é um diretório maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Não foi possível excluir a pasta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "não é um diretório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11151,20 +11645,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Não foi possível conectar ao servidor POP %s (porta %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Falhou a autenticação com o servidor POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor POP %s em modo seguro: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Não foi possível conectar ao servidor POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11173,28 +11672,28 @@ msgstr ""
 "Não é possível conectar ao servidor POP %s: Não existe suporte para o "
 "mecanismo de autenticação pedido."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "O login SASL `%s' falhou para o servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Não é possível conectar ao servidor POP %s: Erro do protocolo SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Falhou a autenticação com o servidor POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sPor favor, entre a senha POP para %s na máquina %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11203,7 +11702,16 @@ msgstr ""
 "Não é possível conectar ao servidor POP %s.\n"
 "Erro ao enviar senha: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Não é possível conectar ao servidor POP %s.\n"
+"Erro ao enviar senha: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Não existe a pasta `%s'."
@@ -11418,93 +11926,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correio SMTP via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Não é possível enviar mensagem: serviço não conectado."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Não é possível enviar mensagem: não foram definidos destinatários."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Não é possível enviar mensagem: um ou mais destinatários inválidos"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Saudação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Falhou o comando HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Falhou o comando HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Autenticação SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Erro ao criar objeto de autenticação SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Falhou o comando AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Falhou o comando AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Resposta de autenticação inválida do servidor.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Falhou o comando MAIL FROM: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Falhou o comando MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Falhou o comando RCPT TO: %s: a mensagem não foi enviada"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Falhou RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Falhou o comando DATA: %s: a mensagem não foi enviada"
@@ -11512,26 +12020,26 @@ msgstr "Falhou o comando DATA: %s: a mensagem não foi enviada"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Falhou o comando DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Falhou o comando RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Falhou o comando RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Falhou o comando QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Falhou o comando QUIT"
 
@@ -11594,101 +12102,6 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir exibição automática de anexo"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Não é possível assinar a mensagem a ser enviada: Não existe certificado de "
-"assinatura configurado para esta conta"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Não é possível cifrar a mensagem a ser enviada: Não existe certificado de "
-"cifragem configurado para esta conta"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "Não foi possível abrir arquivo"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Não foi possível obter mensagem do editor"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Mensagem sem título"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Abrir arquivo"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Auto-gerado"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Assinatura:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> arquivo anexado"
-msgstr[1] "<b>%d</b> arquivos anexados"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Esconder barra de _anexos (solte aqui os anexos)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Exibir barra de _anexos (solte aqui os anexos)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Redigir uma mensagem"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Não foi possível criar janela de redator:\n"
-"Não é possível ativar o componente editor de HTML.\n"
-"Por favor, verifique se você possui as versões\n"
-"corretas de gtkhtml e libgtkhtml instaladas.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(O redator contém um corpo de mensagem não texto, o qual não pode ser "
-"editado.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicando destino"
@@ -11769,17 +12182,92 @@ msgstr "Clique aqui para selecionar as pastas onde publicar"
 msgid "Attach file(s)"
 msgstr "Anexar arquivo(s)"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Não é possível assinar a mensagem a ser enviada: Não existe certificado de "
+"assinatura configurado para esta conta"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Não é possível cifrar a mensagem a ser enviada: Não existe certificado de "
+"cifragem configurado para esta conta"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Não foi possível abrir arquivo"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Não foi possível obter mensagem do editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mensagem sem título"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir arquivo"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Auto-gerado"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Assinatura:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> arquivo anexado"
+msgstr[1] "<b>%d</b> arquivos anexados"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Esconder barra de _anexos (solte aqui os anexos)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Exibir barra de _anexos (solte aqui os anexos)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Redigir uma mensagem"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mensagem encaminhada - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Anexar mensagem original"
+msgstr[1] "Anexar mensagem original"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(O redator contém um corpo de mensagem não texto, o qual não pode ser "
+"editado.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Você não pode anexar o arquivo `${0}' à esta mensagem."
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 #, fuzzy
@@ -11802,18 +12290,32 @@ msgstr ""
 "Para anexar o conteúdo deste diretório, anexe individualmente os arquivos "
 "nele contidos ou crie um pacote contendo o diretório e anexe-o."
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Não foi possível criar mensagem."
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Pois \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
 msgid "Unfinished messages found"
 msgstr "Foram encontradas mensagens não concluídas"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 msgid "Do you want to recover unfinished messages?"
 msgstr "Você deseja recuperar mensagens não concluídas?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
@@ -11822,31 +12324,31 @@ msgstr ""
 "mensagem. Recuperar a mensagem permitirá que você continue de onde você "
 "parou."
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 msgid "Don't Recover"
 msgstr "Não recuperar"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 msgid "Recover"
 msgstr "Recuperar"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Não foi possível salvar arquivo de recuperação \"{0}\"."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Erro ao salvar arquivo de recuperação devido a \"{1}\"."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Alerta: Mensagem modificada"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11855,7 +12357,7 @@ msgstr ""
 "está compondo?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -11865,21 +12367,17 @@ msgstr ""
 "ser que você decida salvar a mensagem na sua pasta de rascunhos. Isto "
 "permitirá que você continue a mensagem mais tarde."
 
-#: composer/mail-composer-errors.xml.h:29
-msgid "Discard Changes"
-msgstr "Descartar alterações"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
 msgstr "Salvar mensagem"
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 msgid "Could not create message."
 msgstr "Não foi possível criar mensagem."
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 #, fuzzy
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
@@ -11887,27 +12385,49 @@ msgstr ""
 "diferentes."
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 msgid "Could not read signature file \"{0}\"."
 msgstr "Não foi possível ler arquivo de assinatura \"{0}\"."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Pois \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr "Todas as contas foram removidas."
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Você deve configurar uma conta antes de poder redigir uma mensagem."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Não foi possível criar mensagem."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Não foi possível criar janela de redator:\n"
+"Não é possível ativar o controle seletor de endereços."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Não foi possível criar janela de redator:\n"
+"Não é possível ativar o componente editor de HTML.\n"
+"Por favor, verifique se você possui as versões\n"
+"corretas de gtkhtml e libgtkhtml instaladas.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "O conjunto de aplicativos de groupware Ximian Evolution"
@@ -12211,10 +12731,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Selecionar um instante em relação ao qual comparar"
 
-#: filter/filter-editor.c:147
-msgid "_Filter Rules"
-msgstr "_Regras de filtro"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 msgid "Missing date."
@@ -12240,171 +12756,42 @@ msgstr "Você deve especificar um nome de arquivo."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Arquivo \"{0}\" não existe ou não é um arquivo comum."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-msgid "Missing folder."
-msgstr "Pasta faltando."
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Você deve especificar uma pasta."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 msgid "Bad regular expression \"{0}\"."
 msgstr "Expressão regular inválida \"{0}\"."
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr "Não foi possível compilar expressão regular \"{1}\"."
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "Nome faltando."
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Você deve nomear este filtro."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-msgid "You must name this vFolder."
-msgstr "Você deve nomear esta pasta virtual."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr "O nome \"{0}\" já está em uso."
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr "Por favor, selecione outro nome."
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-msgid "No sources selected."
-msgstr "Não foram selecionadas fontes."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"Você deve especificar pelo menos uma pasta como fonte.\n"
-"Faça isso selecionando as pastas individualmente e/ou selecionando\n"
-"todas as pastas locais, todas as pastas remotas ou ambas."
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Escolher um arquivo"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Então</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Selecionar pasta"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>_Regras de filtro</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>Fontes de pastas virtuais</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Comparar em relação a"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Recebidas"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"A data da mensagem será comparada em relação\n"
-"às 00:00h da data que você especificou."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"A data da mensagem será comparada em relação a um\n"
-"instante relativo a quando a filtragem ocorrer."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"A data da mensagem será comparada em relação\n"
-"ao instante atual quando a filtragem ocorrer."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "um instante relativo ao instante atual"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "atrás"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meses"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundos"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "apenas pastas específicas"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "o instante atual"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "um instante especificado por você"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "com todas as pastas remotas ativas"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "com todas as pastas locais e remotas ativas"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "com todas as pastas locais"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "anos"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
@@ -12468,6 +12855,70 @@ msgstr "recebidas"
 msgid "outgoing"
 msgstr "enviadas"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>_Regras de filtro</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Comparar em relação a"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Recebidas"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"A data da mensagem será comparada em relação\n"
+"às 00:00h da data que você especificou."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"A data da mensagem será comparada em relação a um\n"
+"instante relativo a quando a filtragem ocorrer."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"A data da mensagem será comparada em relação\n"
+"ao instante atual quando a filtragem ocorrer."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "um instante relativo ao instante atual"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "atrás"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meses"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundos"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "o instante atual"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "um instante especificado por você"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "anos"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adicionar regra"
@@ -12480,58 +12931,74 @@ msgstr "Editar regra"
 msgid "Rule name"
 msgstr "Nome da regra"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "Regras de _pontuação"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontuação"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferências do redator"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Corpo contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure aqui preferências de correio, incluindo segurança e exibição de "
+"mensagens"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Corpo não contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Configure aqui a verificação ortográfica, assinaturas e o redator de "
+"mensagens"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Corpo ou assunto contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure aqui as suas contas de correio"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Mensagem contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Correio do Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Destinatários contêm"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Controle de configuração de contas do correio do Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Remetente contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Componente correio do Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Assunto contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Redator do correio do Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Assunto não contém"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Controle de configuração do redator do correio do Evolution"
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Pastas _virtuais"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Controle de preferências do correio do Evolution"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Adicionar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Correio"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Fonte de pastas virtuais"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Preferências de correio"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Correio:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12563,45 +13030,305 @@ msgstr "Adicionar script de assinatura"
 msgid "Signature(s)"
 msgstr "Assinatura(s)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Em %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+msgid "_Filter Rules"
+msgstr "_Regras de filtro"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Selecionar pasta"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Ajustar pontuação"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Atribuir cor"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Atribuir pontuação"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexos"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Bip"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contém"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copiar para pasta"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Data de recepção"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Data de envio"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Excluída"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "não contém"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "não termina com"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "não existe"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "não retorna"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "não soa como"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "não começa com"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Não existe"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Rascunho"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "termina com"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existe"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existe"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expressão"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Continuar"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "é"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "é após"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "é antes"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "está Marcada"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "é maior que"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "é menor que"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "não é"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "não está Marcada"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Teste lixo"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Rótulo"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Lista de discussão"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Corpo da mensagem"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Cabeçalho da mensagem"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Mensagem é lixo"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Mensagem não é lixo"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Mover para pasta"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Enviar (pipe) para programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Tocar som"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lida"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinatários"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Casamento com expressão regular"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Em resposta a"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "retorna"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "retorna maior que"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "retorna menor que"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Executar programa"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontuação"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Remetente"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Atribuir estado"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamanho (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "soa como"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Conta fonte"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Cabeçalho específico"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "começa com"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Parar o processamento"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Assunto"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Desconfigurar estado"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Então</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Criar pasta _virtual a partir da pesquisa..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Propriedades da pasta"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propriedades"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Nome da pasta"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Total de mensagens"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Total de mensagens"
+msgstr[1] "Total de mensagens"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Mensagens não lidas"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Mensagens não lidas"
+msgstr[1] "Mensagens não lidas"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12611,454 +13338,295 @@ msgstr "<clique aqui para selecionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Criar pasta"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Pastas virtuais"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NÃO CASADO"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Carregando..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo pasta %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Não é possível depositar mensagem(ns) no repositório topo"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Copiar para _pasta"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "M_over para pasta"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancelar _arraste"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Criando pasta `%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Criar pasta"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Renomear pasta"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Abrir em nova _janela"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Copiar"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "_Mover"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propriedades..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Pastas virtuais"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NÃO CASADO"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Carregando..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Correio"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Encamin_har"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Continuar..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Marcar como concl_uída"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marcar como li_da"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marcar como i_mportante"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Marcar como sem imp_ortância"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Marcar como _lixo"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Marcar como _não lixo"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para pasta..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Rótulo"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "Filtrar _lixo"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _assunto"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtro por a_ssunto"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtro por r_emetente"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtro por des_tinatários"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Padrão"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Copiar local do _vínculo"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Responder-A"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Assunto"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Grupos de notícias"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "anexo %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Não foi possível analisar mensagem S/MIME: Erro desconhecido"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifragem não suportado para multiparte/cifrado"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Formato de assinatura não suportado"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Erro ao verificar assinatura"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Erro desconhecido ao verificar assinatura"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Buscando `%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Não assinado"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Assinatura válida"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Assinatura inválida"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "Assinatura válida, mas não é possível verificar remetente"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Não cifrada"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Cifrada, cifra fraca"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Cifrada"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Cifrada, cifra forte"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Parte external-body malformada."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Apontador para site FTP (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Apontador para arquivo local (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Apontador para dados remotos (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Formatando mensagem"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Programa de correio"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Ocorrências: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Não assinado"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13066,7 +13634,11 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Assinatura válida"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13074,7 +13646,11 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Assinatura inválida"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13082,11 +13658,11 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito. "
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, não é possível verificar remetente"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13094,7 +13670,11 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Não cifrada"
+
+#: mail/em-format-html-display.c:650
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13102,7 +13682,11 @@ msgstr ""
 "Esta mensagem não está cifrada. O seu conteúdo pode ser visto em trânsito "
 "através da Internet."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Cifrada, cifra fraca"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13112,7 +13696,11 @@ msgstr ""
 "difícil, mas não impossível, que um estranho conseguisse ver o conteúdo "
 "desta mensagem em uma quantidade de tempo razoável."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Cifrada"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13120,7 +13708,11 @@ msgstr ""
 "Esta mensagem está cifrada. Seria difícil que um estranho conseguisse ver o "
 "conteúdo desta mensagem."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Cifrada, cifra forte"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13130,39 +13722,161 @@ msgstr ""
 "difícil que um estranho conseguisse ver o conteúdo desta mensagem em uma "
 "quantidade de tempo razoável."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Concluída em %d de %B, %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Buscando `%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "Assinatura válida, mas não é possível verificar remetente"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Parte external-body malformada."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Apontador para site FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Apontador para arquivo local (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Apontador para dados remotos (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatando mensagem"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Responder-A"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Para"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Programa de correio"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Grupos de notícias"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "anexo %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Não foi possível analisar mensagem S/MIME: Erro desconhecido"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifragem não suportado para multiparte/cifrado"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Formato de assinatura não suportado"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Erro ao verificar assinatura"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Erro desconhecido ao verificar assinatura"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (embutido)"
@@ -13274,7 +13988,7 @@ msgstr "Enviar _mensagem a..."
 msgid "_Add to Addressbook"
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -13287,7 +14001,7 @@ msgstr "Este repositório não suporta inscrições ou elas estão desativadas."
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Pasta"
 
@@ -13321,11 +14035,23 @@ msgid "Add address"
 msgstr "Adicionar endereço"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Pastas _virtuais"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Adicionar"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Fonte de pastas virtuais"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Reconhecimento automático de vínculos"
@@ -13802,67 +14528,33 @@ msgstr "porta para iniciar o spamd executado pelo usuário"
 msgid "spamd port"
 msgstr "porta do spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Preferências do redator"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure aqui preferências de correio, incluindo segurança e exibição de "
-"mensagens"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Configure aqui a verificação ortográfica, assinaturas e o redator de "
-"mensagens"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Configure aqui as suas contas de correio"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Correio do Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-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:8
-msgid "Evolution Mail component"
-msgstr "Componente correio do Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importador Elm do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Redator do correio do Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Importador Netscape Mail do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Controle de configuração do redator do correio do Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Importador Outlook Express 4 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/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Importador Pine do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Contas de correio"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importador mbox do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Preferências de correio"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Correio:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13920,34 +14612,6 @@ msgstr "Importando `%s'"
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importador Elm do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Importador Netscape Mail do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Importador Outlook Express 4 do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Importador Pine do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importador mbox do Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14117,77 +14781,83 @@ msgstr "Lista de discussão %s"
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d apagadas"
+msgid_plural "%d deleted"
+msgstr[0] "%d apagadas"
+msgstr[1] "%d apagadas"
 
-#: mail/mail-component.c:463
-#, c-format
+#: mail/mail-component.c:461
+#, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d lixo"
+msgid_plural "%d junk"
+msgstr[0] "%d lixo"
+msgstr[1] "%d lixo"
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d rascunhos"
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d rascunhos"
+msgstr[1] "%d rascunhos"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d enviadas"
+msgid_plural "%d sent"
+msgstr[0] "%d enviadas"
+msgstr[1] "%d enviadas"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d não enviadas"
+msgid_plural "%d unsent"
+msgstr[0] "%d não enviadas"
+msgstr[1] "%d não enviadas"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
 
-#: mail/mail-component.c:496
-#, c-format
+#: mail/mail-component.c:494
+#, fuzzy, c-format
 msgid ", %d unread"
-msgstr ", %d não lidas"
+msgid_plural ", %d unread"
+msgstr[0] ", %d não lidas"
+msgstr[1] ", %d não lidas"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Nova pasta de correio"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de correio"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falhou a atualização das configurações ou pastas de correio."
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Verificando serviço"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
@@ -14251,14 +14921,22 @@ msgstr ""
 "correio do 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:895
+msgid "Checking Service"
+msgstr "Verificando serviço"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Visualizar</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL não é suportado nesta cópia do Evolution</b>"
@@ -14512,7 +15190,7 @@ msgstr "Não citar a mensagem original"
 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:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
@@ -14851,6 +15529,122 @@ msgstr "cor"
 msgid "description"
 msgstr "descrição"
 
+#: mail/mail-dialogs.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"Por favor, leia cuidadosamente o acordo de\n"
+"licença para %s exibido\n"
+"abaixo e marque a caixa para aceitá-lo\n"
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>Fontes de pastas virtuais</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Assinatura digital</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Cifragem</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Aceito"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Concluída"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Diferenciar maiúsculas de minúsculas"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Localizar na mensagem"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Localizar:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Marcar para continuar"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Inscrições de pastas"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Acordo de licença %s"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Nenhum selecionado"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Servidor:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Informação de segurança"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"As mensagens que você selecionou para continuação estão listadas abaixo.\n"
+"Por favor, selecione uma ação de continuação do menu \"Marca\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Lista de licenças aceitas"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Prazo até:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Marca:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Inscrever"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Cancelar inscrição"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "apenas pastas específicas"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "com todas as pastas remotas ativas"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "com todas as pastas locais e remotas ativas"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "com todas as pastas locais"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 msgid "Invalid authentication"
@@ -14872,6 +15666,7 @@ msgstr "Falhou o seu login no seu servidor \"{0}\" como \"{0}\"."
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -14899,8 +15694,9 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "_Enviar"
+msgstr "Enviar"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15027,6 +15823,7 @@ msgstr "Você possui mensagens não enviadas. Você deseja sair mesmo assim?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
+#, fuzzy
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15073,14 +15870,6 @@ msgstr "Erro ao executar operação."
 msgid "{0}."
 msgstr "{0}."
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15242,8 +16031,9 @@ msgstr ""
 "Se você continuar as informações da conta serão excluídas permanentemente."
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Não excluir"
+msgstr "Des_fazer exclusão"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15272,6 +16062,7 @@ msgstr "Descartar alterações?"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "Você deseja salvar suas alterações?"
 
@@ -15343,13 +16134,44 @@ msgstr ""
 "    \"{1}\"\n"
 "e foram atualizadas."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+msgid "Missing folder."
+msgstr "Pasta faltando."
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Você deve especificar uma pasta."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
+msgstr "Você deve nomear esta pasta virtual."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+msgid "No sources selected."
+msgstr "Não foram selecionadas fontes."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+"Você deve especificar pelo menos uma pasta como fonte.\n"
+"Faça isso selecionando as pastas individualmente e/ou selecionando\n"
+"todas as pastas locais, todas as pastas remotas ou ambas."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problemas ao migrar pasta de correio antiga \"{0}\"."
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15361,15 +16183,15 @@ msgstr ""
 "Você pode escolher entre ignorar esta pasta, sobrescrevê-la, adicionar o seu "
 "conteúdo ou sair.\n"
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "S_obrescrever"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Adicionar"
 
@@ -15530,7 +16352,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15539,45 +16361,21 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Diferenciar maiúsculas de minúsculas"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Localizar na mensagem"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Localizar:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Assinatura digital</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Cifragem</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Informação de segurança"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Cancelando..."
@@ -15613,24 +16411,24 @@ msgstr "Atualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Entre a senha"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar esta senha pelo restante desta sessão"
 
@@ -15685,15 +16483,15 @@ msgstr "Atualizando pastas virtuais para URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
@@ -15757,7 +16555,7 @@ msgstr "%d %b %k:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -15813,10 +16611,6 @@ msgstr "Encaminhar"
 msgid "No Response Necessary"
 msgstr "Não é necessário resposta"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lida"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -15829,49 +16623,49 @@ msgstr "Responder a todos"
 msgid "Review"
 msgstr "Revisar"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Marcar para continuar"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Corpo contém"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Concluída"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Corpo não contém"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"As mensagens que você selecionou para continuação estão listadas abaixo.\n"
-"Por favor, selecione uma ação de continuação do menu \"Marca\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Corpo ou assunto contém"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Prazo até:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Mensagem contém"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Marca:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Destinatários contêm"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Inscrições de pastas"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Remetente contém"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Nenhum selecionado"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Assunto contém"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Servidor:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Assunto não contém"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Inscrever"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Shell do Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Cancelar inscrição"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Teste do Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Componente de teste do Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -15940,30 +16734,17 @@ msgstr "Se o diálogo de alerta de desenvolvimento não deve ser exibido"
 msgid "mail"
 msgstr "correio"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Erro de sistema desconhecido."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentos inválidos"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Não é possível registrar no OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Conexões ativas</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Não foi localizado o banco de dados de configuração"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Conexões ativas"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Erro genérico"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Clique em OK para fechar estas conexões e desconectar"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16149,27 +16930,6 @@ msgstr "O nome da pasta não pode conter o caractere \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"O Evolution está atualmente conectado. Clique neste botão para trabalhar "
-"desconectado."
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "O Evolution está em preocesso de se desconectar."
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
-"conectado."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Correio para %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -16188,108 +16948,90 @@ msgstr "Bug buddy não está instalado."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy não pôde ser executado."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Caixa de marcação"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novo"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Novo teste"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Teste"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Criar um novo item de teste"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Conexões ativas</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Conexões ativas"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"O Evolution está atualmente conectado. Clique neste botão para trabalhar "
+"desconectado."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Clique em OK para fechar estas conexões e desconectar"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "O Evolution está em preocesso de se desconectar."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Agenda:"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
+"conectado."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "C_ontatos:"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Correio para %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Correio:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Tarefas:"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Erro de sistema desconhecido."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Tipo da pasta:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentos inválidos"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Abrir uma pasta de outro usuário"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Não é possível registrar no OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Conta:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Nome da pasta:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Erro genérico"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Usuário:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistente de configuração do Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importando arquivos"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Fuso horário "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Bem-vindo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16303,7 +17045,7 @@ msgstr ""
 "\n"
 "Por favor, clique o botão \"Avançar\" para continuar. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16315,17 +17057,17 @@ msgstr ""
 "\n"
 "Clique no botão \"Aplicar\" para salvar as suas configurações. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell do Evolution"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Novo teste"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Teste do Evolution"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Teste"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Componente de teste do Evolution"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Criar um novo item de teste"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16387,7 +17129,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16422,7 +17164,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16430,39 +17172,39 @@ msgstr ""
 "Obrigado\n"
 "A equipe do Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Não me diga novamente"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution ativando o componente especificado"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Iniciar no modo conectado"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Desligar a força todos os componentes do Evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Executar novamente a migração do Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16547,6 +17289,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16793,6 +17557,11 @@ msgstr "Seus certificados"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "O certificado já existe"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16994,11 +17763,6 @@ msgstr "ID único do sujeito"
 msgid "Certificate Signature Value"
 msgstr "Valor da assinatura do certificado"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "O certificado já existe"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Senha de arquivo PKCS12"
@@ -17138,8 +17902,8 @@ msgstr "Ver o contato atual"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Açõe_s"
@@ -17617,16 +18381,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:5
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Fechar"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dicionar remetente ao catálogo de endereços"
@@ -18027,6 +18781,16 @@ msgstr "_Ferramentas"
 msgid "_Undelete"
 msgstr "Des_fazer exclusão"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Fechar esta janela"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Fechar"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -18109,10 +18873,6 @@ msgstr "Salvar o arquivo atual com um nome diferente"
 msgid "Save the message in a specified folder"
 msgstr "Salvar a mensagem em uma pasta especificada"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Enviar"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18674,7 +19434,7 @@ msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18824,27 +19584,267 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Credenciais de autenticação para o servidor HTTP"
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Agendas selecionadas para publicação"
+
+#~ msgid "Login name:"
+#~ msgstr "Nome do usuário:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "User Publishes"
+#~ msgstr "O usuário publica"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Salvar lista como VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Groupwise"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Não foi possível iniciar wombat"
+
+#~ msgid ""
+#~ "Selected calendar is read-only, events cannot be created. Please select a "
+#~ "read-write calendar."
+#~ msgstr ""
+#~ "A agenda selecionada é de apenas leitura, eventos não podem ser criados. "
+#~ "Por favor, selecione uma agenda com possibilidade de escrita."
+
+#~ msgid "C_alendar"
+#~ msgstr "A_genda"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opções do alarme audível"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opções do alarme de mensagens"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opções do alarme de e-mail"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opções do alarme de programa"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opções do alarme desconhecido"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetição do alarme"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Mensagem a exibir:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Mensagem a enviar"
+
+#~ msgid "Play sound:"
+#~ msgstr "Tocar som:"
+
+#~ msgid "Run program:"
+#~ msgstr "Executar programa:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Com estes argumentos:"
+
+#~ msgid "Basics"
+#~ msgstr "Básico"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/hora:"
+
+#~ msgid "Reminders"
+#~ msgstr "Lembretes"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opções..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Catálogo de endereços..."
+
+#~ msgid "Reminder"
+#~ msgstr "Lembrete"
+
+#~ msgid "B_usy"
+#~ msgstr "_Ocupado"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Co_nfidencial"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data & hora"
+
+#~ msgid "F_ree"
+#~ msgstr "Li_vre"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Partic_ular"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Público"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Adicionar _participante"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Adicionar remetente ao catálo_go de endereços"
+
+#~ msgid "Preview"
+#~ msgstr "Visualizar"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regra de repetição"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Repetição _personalizada"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modificar"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Sem repetição"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "R_epetição simples"
+
+#~ msgid "% _Complete"
+#~ msgstr "% C_oncluída"
+
+#~ msgid "Progress"
+#~ msgstr "Progresso"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Confidencial"
+
+#~ msgid "Folder:"
+#~ msgstr "Pasta:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Começa:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Termina:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Concluída:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Prazo:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nenhum</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Ocorreu um erro no sistema CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objeto não pôde ser encontrado\n"
+
+#~ 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"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Estado do participante não pôde ser atualizado!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Adicionar remetente ao catálo_go de endereços"
+
+#~ msgid "_Options"
+#~ msgstr "_Opções"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Hora de _início da reunião:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Hora de _término da reunião:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Erro abrindo %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Selected task list is read-only, events cannot be created. Please select "
+#~ "a read-write calendar."
+#~ msgstr ""
+#~ "A lista de tarefas selecionada é de apenas leitura, eventos não podem ser "
+#~ "criados. Por favor, selecione uma agenda com possibilidade de escrita."
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Não é possível localizar certificado para `%s'"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Não é possível criar mensagem CMS"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "Não é possível criar contexto do codificador"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Não foi possível criar janela de redator:\n"
+#~ "Não é possível ativar o componente editor de HTML."
+
+#~ msgid "_Score Rules"
+#~ msgstr "Regras de _pontuação"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Em %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Nome da pasta"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propriedades..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Caixa de marcação"
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Agenda:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "C_ontatos:"
+
+#~ msgid "_Mail:"
+#~ msgstr "_Correio:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Tarefas:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Tipo da pasta:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Abrir uma pasta de outro usuário"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Nome da pasta:"
+
+#~ msgid "_User:"
+#~ msgstr "_Usuário:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Falha de conexão ao servidor LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Falha de autenticação com o servidor LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Não foi possível realizar consulta na raiz DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "O servidor respondeu sem bases de pesquisa suportadas"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Este servidor não suporta informação de schema LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Erro ao buscar informação de schema"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "O servidor não respondeu com informação de schema válida"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  E_xibir bases suportadas "
 
@@ -18920,9 +19920,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "item8"
 #~ msgstr "item8"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Editor de categorias não disponível."
-
 #~ msgid ""
 #~ "The following entries are invalid:\n"
 #~ "\n"
@@ -18973,9 +19970,6 @@ msgstr "%s (%d%% cumprida)"
 #~ "O evento que está sendo apagado é uma reunião. Você gostaria de enviar um "
 #~ "aviso de cancelamento?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -18993,42 +19987,15 @@ msgstr "%s (%d%% cumprida)"
 #~ "O item de diário que está sendo apagado está publicado. Você gostaria de "
 #~ "enviar um aviso de cancelamento?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Você tem certeza que deseja excluir este comprimisso sem título?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Você tem certeza que deseja excluir esta tarefa sem título?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Você tem certeza que deseja excluir %d comprimisso?"
-#~ msgstr[1] "Você tem certeza que deseja excluir %d comprimissos?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Você tem certeza que deseja excluir %d tarefa?"
-#~ msgstr[1] "Você tem certeza que deseja excluir %d tarefas?"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Você tem certeza que deseja excluir %d item de diário?"
-#~ msgstr[1] "Você tem certeza que deseja excluir %d itens de diário?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Convidar outros..."
 
@@ -19068,9 +20035,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "Aprendendo mensagens que são ou não são lixo"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Não foi possível obter artigo %s do servidor NNTP"
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Publicação não permitida pelo servidor de notícias"
 
@@ -19108,174 +20072,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "Because \"${1}\"."
 #~ msgstr "Devido a \"${1}\"."
 
-#~ msgid "Adjust Score"
-#~ msgstr "Ajustar pontuação"
-
-#~ msgid "Assign Color"
-#~ msgstr "Atribuir cor"
-
-#~ msgid "Assign Score"
-#~ msgstr "Atribuir pontuação"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#~ msgid "Beep"
-#~ msgstr "Bip"
-
-#~ msgid "contains"
-#~ msgstr "contém"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copiar para pasta"
-
-#~ msgid "Date received"
-#~ msgstr "Data de recepção"
-
-#~ msgid "Date sent"
-#~ msgstr "Data de envio"
-
-#~ msgid "Deleted"
-#~ msgstr "Excluída"
-
-#~ msgid "does not contain"
-#~ msgstr "não contém"
-
-#~ msgid "does not end with"
-#~ msgstr "não termina com"
-
-#~ msgid "does not exist"
-#~ msgstr "não existe"
-
-#~ msgid "does not return"
-#~ msgstr "não retorna"
-
-#~ msgid "does not sound like"
-#~ msgstr "não soa como"
-
-#~ msgid "does not start with"
-#~ msgstr "não começa com"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Não existe"
-
-#~ msgid "Draft"
-#~ msgstr "Rascunho"
-
-#~ msgid "ends with"
-#~ msgstr "termina com"
-
-#~ msgid "Exist"
-#~ msgstr "Existe"
-
-#~ msgid "exists"
-#~ msgstr "existe"
-
-#~ msgid "Expression"
-#~ msgstr "Expressão"
-
-#~ msgid "Follow Up"
-#~ msgstr "Continuar"
-
-#~ msgid "is"
-#~ msgstr "é"
-
-#~ msgid "is after"
-#~ msgstr "é após"
-
-#~ msgid "is before"
-#~ msgstr "é antes"
-
-#~ msgid "is Flagged"
-#~ msgstr "está Marcada"
-
-#~ msgid "is greater than"
-#~ msgstr "é maior que"
-
-#~ msgid "is less than"
-#~ msgstr "é menor que"
-
-#~ msgid "is not"
-#~ msgstr "não é"
-
-#~ msgid "is not Flagged"
-#~ msgstr "não está Marcada"
-
-#~ msgid "Junk Test"
-#~ msgstr "Teste lixo"
-
-#~ msgid "Mailing list"
-#~ msgstr "Lista de discussão"
-
-#~ msgid "Message Body"
-#~ msgstr "Corpo da mensagem"
-
-#~ msgid "Message Header"
-#~ msgstr "Cabeçalho da mensagem"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Mensagem é lixo"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Mensagem não é lixo"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Mover para pasta"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Enviar (pipe) para programa"
-
-#~ msgid "Play Sound"
-#~ msgstr "Tocar som"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinatários"
-
-#~ msgid "Regex Match"
-#~ msgstr "Casamento com expressão regular"
-
-#~ msgid "Replied to"
-#~ msgstr "Em resposta a"
-
-#~ msgid "returns"
-#~ msgstr "retorna"
-
-#~ msgid "returns greater than"
-#~ msgstr "retorna maior que"
-
-#~ msgid "returns less than"
-#~ msgstr "retorna menor que"
-
-#~ msgid "Run Program"
-#~ msgstr "Executar programa"
-
-#~ msgid "Sender"
-#~ msgstr "Remetente"
-
-#~ msgid "Set Status"
-#~ msgstr "Atribuir estado"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamanho (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "soa como"
-
-#~ msgid "Source Account"
-#~ msgstr "Conta fonte"
-
-#~ msgid "Specific header"
-#~ msgstr "Cabeçalho específico"
-
-#~ msgid "starts with"
-#~ msgstr "começa com"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Parar o processamento"
-
-#~ msgid "Unset Status"
-#~ msgstr "Desconfigurar estado"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "_Testar mensagens recebidas"
 
@@ -19428,9 +20224,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "Finished"
 #~ msgstr "Concluído"
 
-#~ msgid "Group:"
-#~ msgstr "Grupo:"
-
 #~ msgid ""
 #~ "Specifying a\n"
 #~ "\t\t\t  display name and group is the first step in setting\n"
@@ -19872,9 +20665,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "component"
 #~ msgstr "componente"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmes"
-
 #~ msgid "Geographical position"
 #~ msgstr "Posição geográfica"
 
diff --git a/po/ro.po b/po/ro.po
index a7d64dd73b..740cec088c 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Română <ro@li.org>\n"
@@ -22,16 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Editare agendă"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Contacte"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Fereastra Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -57,40 +47,267 @@ msgstr "Nepornit"
 msgid " card"
 msgstr "Tipăreşte calendar"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Contacte"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Fereastra Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Nu pot încărca cursorul\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Autentificare la serverul IMAP eşuată.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nu pot încărca %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Nu e disponibilă o descriere."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Salvează in agendă"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Eroare la încărcarea fişierului: %s"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Eroare ştergere card"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Doriţi să salvaţi modificările?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#, fuzzy
+msgid "_Discard"
+msgstr "Tipăreşte calendar"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "nu conţine"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nu pot primi mesajul de la editor"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Eroare adăugare card"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Vizualizor agendă minicard Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 #, fuzzy
 msgid "Default Sync Address:"
 msgstr "Adresa email:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nu pot încărca %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Autentificare la serverul IMAP eşuată.\n"
-"%s\n"
-"\n"
+msgid "Autocompletion"
+msgstr "Data terminare"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Introduceţi parola pentru %s"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID certificat:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editare agendă"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, 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:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+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
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -127,7 +344,7 @@ msgstr "Grup de _contact"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "Grup de _contact"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -152,15 +369,15 @@ msgid "Migrating `%s':"
 msgstr "Trimit \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -169,22 +386,22 @@ msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data terminare"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -192,59 +409,72 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Şterg"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 #, fuzzy
 msgid "Properties..."
 msgstr "_Proprietăţi..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacte"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr ""
+"Autentificare la serverul IMAP eşuată.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Introduceţi parola pentru %s"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -264,69 +494,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Data terminare"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "ID certificat:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Crează sau editează conturile de mail şi alte preferinţe"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editare agendă"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, 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:9
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook component"
-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
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -334,7 +501,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -343,8 +510,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
@@ -370,6 +536,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentificare"
@@ -421,13 +588,11 @@ msgid "Anonymously"
 msgstr "Anonim"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "De bază"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalii"
 
@@ -653,33 +818,27 @@ msgid "cards"
 msgstr "Nepornit"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr ""
+#: 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:208
+msgid "Remove All"
+msgstr "Şterge tot"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Şterge"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Şterge tot"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -696,7 +855,7 @@ msgid "Send HTML Mail?"
 msgstr "Trimit mail HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Adaugă la contacte"
 
@@ -705,16 +864,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Sursă"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -741,6 +906,11 @@ msgstr "_Categorie:"
 msgid "_Find"
 msgstr "Găseşte:"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Caută"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -787,9 +957,8 @@ msgid "<b>Work</b>"
 msgstr "Săptămâna de lucru"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -814,7 +983,6 @@ msgid "Birthday:"
 msgstr "Ziua de naştere:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Calendar"
@@ -830,8 +998,8 @@ msgid "Company:"
 msgstr "Companie"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 #, fuzzy
@@ -839,7 +1007,7 @@ msgid "Contact"
 msgstr "Contacte"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
@@ -950,8 +1118,8 @@ msgstr "Adresa paginii de web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 #, fuzzy
@@ -976,43 +1144,29 @@ msgid "_File under:"
 msgstr "Nume fişier:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 #, fuzzy
 msgid "Address"
 msgstr "_Adresa:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 #, fuzzy
 msgid "Editable"
 msgstr "Validează"
@@ -2066,144 +2220,135 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Tipăreşte mesaj"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Port:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Adaug serviciu"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 #, fuzzy
-msgid "GroupWise"
-msgstr "Nume grup:"
+msgid "Location"
+msgstr "_Acţiune"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nume utilizator:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Adresa de acasă"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Alte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Port:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Nume grup:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Sursă"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Câmpul De la"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #, fuzzy
 msgid "Changed"
 msgstr "Scaun"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Această persoană de contact aparţine categoriilor:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Şterge contactele selectate"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nume"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Urmatoarele conexiuni sunt actualmente active:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Conţinut invalid al mesajului"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-#, fuzzy
-msgid "_Discard"
-msgstr "Tipăreşte calendar"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Tipăreşte mesaj"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Adaug serviciu"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "_Acţiune"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nume utilizator:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Adăugare-Rapidă"
@@ -2226,6 +2371,20 @@ msgstr ""
 "\n"
 "E-mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2"
@@ -2354,54 +2513,75 @@ msgid "\n"
 msgstr ""
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#, fuzzy
+msgid "Add an email to the List"
+msgstr "Trimite un email la %s"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Membri"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Scoate articolele selectate din lista de anexe"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Selectează tot"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Ascund adresele când trimiteţi mail la această listă"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Introduceţi o adresă de email sau trageţi contactul în lista de mai jos:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "editor-lista-contact"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 #, fuzzy
 msgid "Book"
 msgstr "Corp"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 #, fuzzy
 msgid "Is New List"
 msgstr "Listă nouă"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+#, fuzzy
+msgid "Required Participants"
+msgstr "Participant necesar"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-#, fuzzy
-msgid "Save List as VCard"
-msgstr "Salvează ca şi card V"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Contact schimbat:"
@@ -2440,442 +2620,11 @@ msgstr ""
 "în acest dosar. Doriţi să continuaţi în acest caz?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Căutare avansată"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "Membri"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizaţie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Jos:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Nume grup:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Inexistent"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Lucrez"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-#, fuzzy
-msgid "Blog"
-msgstr "întotdeauna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefon mobil"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "General"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Notă"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "_Funcţia:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "Fax acasă"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Succes"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Depozitare offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Dosarul `%s' nu există."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Listă contacte nouă"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Acces interzis"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "Nu găsesc card-ul"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "ID-ul card-ului există deja"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protocol nesuportat"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Revocat"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nu pot redenumi dosarul: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "Eşec la autentificare."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Necesită autentificare"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nu există mesaj"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Altă eroare"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nu pot deschide această agendă. Vă rog verificaţi dacă există calea\n"
-"şi daca aveţi drepturi de acces."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nu pot deschide această agendă. Aceasta poate însemna\n"
-"că aţi introdus URI incorect, sau serverul LDAP\n"
-"e căzut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Această versiune de Evolution nu are compilat suport LDAP.\n"
-"Dacă doriţi să folosiţi LDAP în Evolution trebuie să compilaţi\n"
-"programul din sursele CVS după ce descărcaţi OpenLDAP urmând\n"
-"legătura următoare.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nu pot deschide această agendă. Aceasta poate însemna\n"
-"că aţi introdus URI incorect, sau serverul LDAP\n"
-"e căzut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Eroare adăugare listă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Eroare adăugare card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Eroare la modificarea listei"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Eroare la modificare card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Eroare la ştergerea listei"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Eroare ştergere card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-#, fuzzy
-msgid "Overwrite"
-msgstr "Suprascrieţi fişierul?"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-#, fuzzy
-msgid "list"
-msgstr "Ceaţă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Salvează in agendă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Carduri V multiple"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "Card V pentru %s"
-
-#.
-#. * 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:199
-#, fuzzy
-msgid "(none)"
-msgstr "(Fără nume)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Selectez o acţiune"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crează contact nou \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adaugă adresa la contactul existent \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Căutare agendă..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editare informaţii contact"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Reuneşte adresele email:"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "nu conţine"
-msgstr[1] "nu conţine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Arată toate antetele"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Salvează ca şi card V"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Salvează in agendă"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2890,9 +2639,9 @@ msgstr[1] "Contacte"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 #, fuzzy
 msgid "Query"
 msgstr "Fiecare"
@@ -2911,146 +2660,146 @@ msgstr "Mobil"
 msgid "Error modifying card"
 msgstr "Eroare la modificare card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 #, fuzzy
 msgid "Email begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Orice câmp conţine"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Avansat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Salvează ca şi card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Listă contacte nouă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 #, fuzzy
 msgid "Import..."
 msgstr "_Importă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caută contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Surse _agendă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Setări _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Înaintează _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tipăreşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Tipăreşte plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupează"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiază"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lipeşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curentă"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 #, fuzzy
 msgid "Any Category"
@@ -3085,6 +2834,8 @@ msgid "Car Phone"
 msgstr "Telefon maşină"
 
 #: 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:3
 msgid "Categories"
 msgstr "Categorii"
 
@@ -3092,6 +2843,21 @@ msgstr "Categorii"
 msgid "Company Phone"
 msgstr "Telefon companie"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nume de familie"
@@ -3131,14 +2897,29 @@ msgstr "Corean"
 msgid "Manager"
 msgstr "Manager"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Poreclă"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Notă"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birou"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizaţie"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alt Fax"
@@ -3192,33 +2973,23 @@ msgstr "Nevăzut"
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 #, fuzzy
 msgid "Width"
 msgstr "Lăţime:"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 #, fuzzy
 msgid "Height"
 msgstr "Înălţime:"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Şterse"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Sortare sarcini"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3237,7 +3008,11 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 #, fuzzy
 msgid ""
 "\n"
@@ -3252,7 +3027,7 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru crea un contact nou."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 #, fuzzy
 msgid ""
 "\n"
@@ -3265,15 +3040,415 @@ msgstr ""
 "\n"
 "Dublu-click aici pentru crea un contact nou."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 #, fuzzy
 msgid "Adapter"
 msgstr "după"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Şterse"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortare sarcini"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Membri"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Jos:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Inexistent"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Lucrez"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+#, fuzzy
+msgid "Blog"
+msgstr "întotdeauna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "General"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "_Funcţia:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Fax acasă"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Succes"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Depozitare offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Dosarul `%s' nu există."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Listă contacte nouă"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Acces interzis"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "Nu găsesc card-ul"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "ID-ul card-ului există deja"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protocol nesuportat"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Revocat"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nu pot redenumi dosarul: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Eşec la autentificare."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Necesită autentificare"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nu există mesaj"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Altă eroare"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nu pot deschide această agendă. Vă rog verificaţi dacă există calea\n"
+"şi daca aveţi drepturi de acces."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nu pot deschide această agendă. Aceasta poate însemna\n"
+"că aţi introdus URI incorect, sau serverul LDAP\n"
+"e căzut"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Această versiune de Evolution nu are compilat suport LDAP.\n"
+"Dacă doriţi să folosiţi LDAP în Evolution trebuie să compilaţi\n"
+"programul din sursele CVS după ce descărcaţi OpenLDAP urmând\n"
+"legătura următoare.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nu pot deschide această agendă. Aceasta poate însemna\n"
+"că aţi introdus URI incorect, sau serverul LDAP\n"
+"e căzut"
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Eroare adăugare listă"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Eroare adăugare card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Eroare la modificarea listei"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Eroare la modificare card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Eroare la ştergerea listei"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Eroare ştergere card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+#, fuzzy
+msgid "Overwrite"
+msgstr "Suprascrieţi fişierul?"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+#, fuzzy
+msgid "list"
+msgstr "Ceaţă"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Salvează in agendă"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Carduri V multiple"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "Card V pentru %s"
+
+#.
+#. * 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:198
+#, fuzzy
+msgid "(none)"
+msgstr "(Fără nume)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Email principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Selectez o acţiune"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crează contact nou \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adaugă adresa la contactul existent \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Căutare agendă..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Editare informaţii contact"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Reuneşte adresele email:"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "nu conţine"
+msgstr[1] "nu conţine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Arată toate antetele"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Salvează ca şi card V"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Salvează in agendă"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vizualizare card"
@@ -3321,6 +3496,12 @@ msgstr "Compozitorul de mailuiri Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+#, fuzzy
+msgid "Print envelope"
+msgstr "Tipăreşte plic"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3332,12 +3513,6 @@ msgstr "Tipăreşte contactele selectate"
 msgid "Print contact"
 msgstr "Tipăreşte contactele selectate"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-#, fuzzy
-msgid "Print envelope"
-msgstr "Tipăreşte plic"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3526,6 +3701,23 @@ msgstr "_Contact"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nu pot deschide mesajul"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nu pot încărca %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nu pot deschide agenda"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3584,23 +3776,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Altă eroare"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nu pot deschide mesajul"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nu pot încărca %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Nu pot deschide agenda"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -3621,41 +3796,375 @@ msgstr "Nici un destinatar specificat"
 msgid "Unnamed List"
 msgstr "Contact schimbat:"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Nu şterge"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Trimite mai târziu"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această întâlnire?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi intrarea din jurnal?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi intrarea din jurnal `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi intrarea din jurnal `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Întâlnire"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Doriţi să salvaţi modificările?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+"%s Aţi făcut modificări. Ignoraţi aceste modificări şi actualizaţi editorul?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Tipăreşte calendar"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Salvează mesajul ca..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Trimite"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Introduceţi parola pentru %s"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nu pot porni serverul wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nu pot porni wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nu pot citi pilotul blocului aplicaţie calendar"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 #, fuzzy
 msgid "Default Priority:"
 msgstr "_Prioritate:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nu pot citi pilotul blocului aplicaţie ToDo"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "Sarcină"
+
+#: 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:213
 #, fuzzy
 msgid "Starting:"
@@ -3745,11 +4254,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot iniţializa Bonobo"
@@ -3899,9 +4403,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Rezumatul conţine"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Descrierea conţine"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Comentariul conţine"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Descrierea conţine"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3920,8 +4445,8 @@ msgid "Purge events older than"
 msgstr "e mai mic decât"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "zile"
 
@@ -3933,7 +4458,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3985,73 +4510,61 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendar"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 #, fuzzy
 msgid "New appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 #, fuzzy
 msgid "_Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 #, fuzzy
 msgid "New meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Aceasta e o cerere de întâlnire."
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
+msgid "Cale_ndar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Crează un calendar nou"
 
@@ -4081,27 +4594,6 @@ msgstr "Afişare săptamână"
 msgid "Month View"
 msgstr "Afişare lună"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Rezumatul conţine"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Descrierea conţine"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Comentariul conţine"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Descrierea conţine"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr ""
-
 #: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4121,231 +4613,135 @@ msgstr "Acces interzis"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opţiuni alarmă audio"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opţiuni mesaje alarmă"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Opţiuni alarmă mail"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opţiuni alarmă program"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Opţiuni alarmă necunoscute"
+msgid "<b>Alarm</b>\t"
+msgstr "informaţie calendar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Repetare alarmă"
+msgid "<b>Options</b>"
+msgstr "Descriere:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Afişează mesaj"
+msgid "<b>Repeat</b>"
+msgstr "Memorator"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "Corp mesaj"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Redă sunetul:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Repetă alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Rulează programul:"
+msgid "Add Alarm"
+msgstr "Alarme"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "Timite ca:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Cu argumentele:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "timp în plus la fiecare"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ore"
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
+msgid "Custom _message"
+msgstr "Compune un mesaj"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
 #, fuzzy
-msgid "A_dd"
-msgstr "Adaugă"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Baze"
+msgid "Custom alarm sound"
+msgstr "Personalizează bările de unelte"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Ora"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Mesaje"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Redă un sunet"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Reaminteşte"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Rulează un program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Timite ca:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Trimite un email"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Cuprins:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Cont"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opţiuni..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Rulează programul:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Repetă alarma"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Sud"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "după"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "înainte"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "zi(le)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "sfârşit întâlnire"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "timp în plus la fiecare"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ore"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(e)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "început întâlnire"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Nume stil:"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Metoda necesară pentru a încărca `%s' nesuportată"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Adaugă în calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista de sarcini"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Închide"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Alege o culoare"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Adaugă în calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
 #, fuzzy
-msgid "_Add Group"
-msgstr "Grup _Nou..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Reîmprospătează lista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+msgid "A_dd"
+msgstr "Adaugă"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "săptămâni"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarme"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4467,7 +4863,7 @@ msgid "Free/Busy Publishing"
 msgstr "URL liber-ocupat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vineri"
@@ -4483,7 +4879,7 @@ msgid "Minutes"
 msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luni"
@@ -4494,7 +4890,7 @@ msgid "S_un"
 msgstr "Dum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sâmbătă"
@@ -4509,7 +4905,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Duminică"
@@ -4525,7 +4921,7 @@ msgid "T_hu"
 msgstr "Joi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Joi"
@@ -4540,7 +4936,7 @@ msgid "Time format:"
 msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Marţi"
@@ -4550,7 +4946,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miercuri"
@@ -4588,7 +4984,8 @@ msgstr "Comprimă weekend-urile la afişarea lunii"
 msgid "_Day begins:"
 msgstr "Afişează staţiile:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4649,6 +5046,81 @@ msgstr "Mie"
 msgid "before every appointment"
 msgstr "înainte de sfîrşitul întâlnirii"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Nume stil:"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Metoda necesară pentru a încărca `%s' nesuportată"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Adaugă în calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Închide"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Alege o culoare"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Adaugă în calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Grup _Nou..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Reîmprospătează lista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "săptămâni"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Acest eveniment a fost şters."
@@ -4695,81 +5167,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Eroare necunoscută: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " la "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Terminat "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Terminat "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:264
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nu pot actualiza fişierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editează întâlnire"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Întâlnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nu există rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Salvează ca..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nu pot obţine versiunea curentă!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Eroare necunoscută: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " la "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Terminat "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Terminat "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4835,8 +5301,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 #, fuzzy
-msgid "Addressbook..."
-msgstr "Agendă"
+msgid "Contacts..."
+msgstr "_Contacte..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 #, fuzzy
@@ -4848,171 +5314,227 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "Şterse"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Reaminteşte"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 #, 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informaţie"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data început"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "Ora de început"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Acces interzis"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "înainte de sfîrşitul întâlnirii"
+msgstr[1] "înainte de sfîrşitul întâlnirii"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "sfârşit întâlnire"
+msgstr[1] "sfârşit întâlnire"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "înainte de sfîrşitul întâlnirii"
+msgstr[1] "înainte de sfîrşitul întâlnirii"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Eveniment zi_lnic"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "înainte de sfîrşitul întâlnirii"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
 #, fuzzy
-msgid "B_usy"
-msgstr "Ocupat"
+msgid "1 hour before appointment"
+msgstr "înainte de sfîrşitul întâlnirii"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ca_tegorii..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "înainte de sfîrşitul întâlnirii"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "informaţie calendar"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Clasificare"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Data & Ora"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Confidenţial"
+msgid "A_ll day event"
+msgstr "Eveniment zi_lnic"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Data/Ora"
+msgid "C_ustomize..."
+msgstr "Personalizează"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#, fuzzy
-msgid "F_ree"
-msgstr "Grec"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ca_tegorii..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "_Acţiune"
+msgid "Cale_ndar:"
+msgstr "Calendar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Clasificare"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Confidenţial"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Ploaie torenţială"
+msgid "L_ocation:"
+msgstr "_Acţiune"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privat"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Public"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Ploaie torenţială"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Cuprins:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarme"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Descriere:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Ora d_e sfârşit"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Ora de început"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Inexistent"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 #, fuzzy
 msgid "An organizer is required."
 msgstr "Un organizator trebuie setat."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Şterge"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Şte_rge"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -5052,36 +5574,45 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Toţi participanţii"
+msgid "<b>Attendees</b>"
+msgstr "Descriere:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Adaugă expeditorul în agendă"
+msgid "<b>Organizer</b>"
+msgstr "Descriere:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Schimbă organizator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "C_ontacte..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Schimbă organizator"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5158,162 +5689,151 @@ msgstr ""
 msgid "All Instances"
 msgstr "Avansat"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Această întâlnire conţine reveniri pe care Evolution nu le poate edita."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "în"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 #, fuzzy
 msgid "first"
 msgstr "Ceaţă"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "secundă"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "third"
 msgstr "Alte"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "fourth"
 msgstr "Nord"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 #, fuzzy
 msgid "last"
 msgstr "Ceaţă"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 #, fuzzy
 msgid "Other Date"
 msgstr "Alt Fax"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "ziua"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "în"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "apariţii"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ora"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Fiecare"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
-msgid "Exceptions"
-msgstr "Excepţii"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Preview"
-msgstr "Previzualizare:"
+msgid "<b>Exceptions</b>"
+msgstr "Descriere:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Regulă revenire"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-#, fuzzy
-msgid "_Custom recurrence"
-msgstr "Revenire personală"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Modifică"
+msgid "<b>Preview</b>"
+msgstr "Previzualizare"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "_No recurrence"
-msgstr "Nici o revenire"
+msgid "<b>Recurrence</b>"
+msgstr "Revenire"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Şte_rge"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Fiecare"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
 #, fuzzy
-msgid "_Simple recurrence"
-msgstr "Revenire simplă"
+msgid "This appointment rec_urs"
+msgstr "Închide această întâlnire"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "pentru"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "întotdeauna"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "luna"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "pînă la"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "săptămîna"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "anul"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Şterge acest dosar"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Terminat "
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Mesaj de afişat"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% Terminat"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Mesaj de afişat"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Terminat"
 
@@ -5325,8 +5845,8 @@ msgstr "Ridicat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "În derulare"
@@ -5338,23 +5858,22 @@ msgid "Low"
 msgstr "Scăzut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nepornit"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "În derulare"
+msgid "P_ercent complete:"
+msgstr "Întâlnire încheiată:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5379,39 +5898,44 @@ msgstr "_Stare"
 msgid "_Web Page:"
 msgstr "Adresa paginii de web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+#, fuzzy
+msgid "Task"
+msgstr "Sarcină"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 #, fuzzy
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nu pot deschide agenda"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
 #, fuzzy
-msgid "Con_fidential"
-msgstr "Confidenţial"
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Mesaj de afişat"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Mesaj de afişat"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descriere:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Dosar"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5422,60 +5946,58 @@ msgstr "Data de început:"
 msgid "_Due date:"
 msgstr "_Data scadentă:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Răspuns de la server de autentificare eşuată."
+msgid "_Group:"
+msgstr "Nume grup:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Informaţie sursă"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Zi"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Informaţie sursă"
+msgid "<b>Publishing _Location</b>"
+msgstr "URL liber-ocupat"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "URL liber-ocupat"
+msgid "Free/Busy Editor"
+msgstr "Informaţie sursă"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Nume listă:"
+msgid "_Daily"
+msgstr "Zi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Parola"
+msgid "_Manual"
+msgstr "Manager"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Parola"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Memorez această parolă"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Nume utilizator:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Săptămână"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5558,7 +6080,7 @@ msgstr "%s server %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Clic aici să adăugaţi o sarcină"
@@ -5567,6 +6089,11 @@ msgstr "Clic aici să adăugaţi o sarcină"
 msgid "Untitled"
 msgstr "Fără titlu"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Cuprins:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5580,7 +6107,7 @@ msgstr "_Data scadentă:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
@@ -5595,20 +6122,94 @@ msgstr "_Prioritate:"
 msgid "Web Page:"
 msgstr "Adresa paginii de web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Public"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Data sfârşit"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Privat"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Data început"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Confidenţial"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Rezumat"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+#, fuzzy
+msgid "Free"
+msgstr "Grec"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupat"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Poziţia geografică trebuie introdusă in format: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Da"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nu"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Alocat"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5655,103 +6256,108 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-#, fuzzy
-msgid "Free"
-msgstr "Grec"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupat"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Deschide"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Deschide mesajul"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvează ca..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Tipăreşte..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upează"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiază"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lipeşte"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Atribuie task (FIXME)"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 #, fuzzy
 msgid "_Mark as Complete"
 msgstr "Marchează ca terminat"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Marchează sarcinile ca terminate"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Şterge"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 #, fuzzy
 msgid "_Delete Selected Tasks"
 msgstr "Şterge sarcinile selectate"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Salvează ca..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Clic aici să adăugaţi o sarcină"
@@ -5761,191 +6367,122 @@ msgstr "Clic aici să adăugaţi o sarcină"
 msgid "% Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Terminat"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Data terminare"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Data scadentă"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritate"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Data început"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Rezumat"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Mut"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Copiez"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "întâlnire nouă..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 #, fuzzy
 msgid "New Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Selec_tează înlănţuirea"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Şterge..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informaţie liber-ocupat."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copiez în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Mut în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Şterge această apariţie"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "Setări _mail..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data sfârşit"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Data început"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Necunoscut"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr ""
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Alocat"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nu"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Poziţia geografică trebuie introdusă in format: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5969,36 +6506,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i diviziuni minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i diviziuni minute"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 #, fuzzy
@@ -6066,385 +6603,357 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
 #, fuzzy
-msgid "<b>Ends:</b> "
-msgstr "Ora de sfârşit a întâlnirii:"
+msgid "Starts"
+msgstr "Stare"
 
-#: calendar/gui/e-itip-control.c:716
+#: calendar/gui/e-itip-control.c:699
 #, fuzzy
-msgid "<b>Completed:</b> "
-msgstr "Terminat "
+msgid "Ends"
+msgstr "2"
 
-#: calendar/gui/e-itip-control.c:726
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy
-msgid "<b>Due:</b> "
-msgstr "Descriere:"
+msgid "Due"
+msgstr "Iunie"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informaţie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 #, fuzzy
 msgid "An unknown person"
 msgstr "Eroare necunoscută"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 #, fuzzy
 msgid "Location:"
 msgstr "_Acţiune"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 #, fuzzy
 msgid "Accepted"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 #, fuzzy
 msgid "Declined"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 #, fuzzy
 msgid "Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 #, fuzzy
 msgid "Accept"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 #, fuzzy
 msgid "Decline"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informaţie opţională"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de întâlnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Găseşte în mesaj"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 #, fuzzy
 msgid "Task Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 #, fuzzy
 msgid "Task Reply"
 msgstr "Răspunde"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tipăreşte mesaj"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul conţine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1849
-#, 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:1852
-#, fuzzy
-msgid "Object could not be found\n"
-msgstr "Bug buddy nu poate fi rulat."
-
-#: calendar/gui/e-itip-control.c:1855
-#, 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:1858
+#: calendar/gui/e-itip-control.c:1842
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1861
-#, fuzzy
-msgid "Attendee status could not be updated!\n"
-msgstr "Adrese participare"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6473,6 +6982,10 @@ msgstr "Încarc calendar"
 msgid "Loading calendar..."
 msgstr "Încarc calendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Mesaj server:"
@@ -6490,12 +7003,6 @@ msgstr "dată început"
 msgid "Chair Persons"
 msgstr "Telefon maşină"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-#, fuzzy
-msgid "Required Participants"
-msgstr "Participant necesar"
-
 #: calendar/gui/e-meeting-list-view.c:61
 #, fuzzy
 msgid "Optional Participants"
@@ -6570,6 +7077,28 @@ msgstr "Şterse"
 msgid "In Process"
 msgstr "În derulare"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afară din oficiu"
@@ -6578,225 +7107,120 @@ msgstr "Afară din oficiu"
 msgid "No Information"
 msgstr "Nici o informaţie"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Adaugă expeditorul în agendă"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opţiuni"
+msgid "O_ptions"
+msgstr "Opţiuni"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Arată numai _orele de lucru"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Arată mărit"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Act_ualizează liber/ocupat"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Alege automat"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "To_ate persoanele şi resursele"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Toate _persoanele şi o resursă"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Necesa_r o persoană"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Necesar o persoană şi _o resursă"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Ora de început a întâlnirii:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Ora de sfârşit a întâlnirii:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Eroare la start %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, fuzzy, c-format
-msgid "Opening tasks at %s"
-msgstr "Deschid rezerva %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr "Eroare la start %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Deschid rezerva %s"
+
+#: calendar/gui/e-tasks.c:962
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Sarcini"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Actualizez..."
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nu există întâlniri"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Deschide în %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turc"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Calendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "Sarcină"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprilie"
@@ -7147,11 +7571,6 @@ msgstr "Luna curentă (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Anul curent (%Y)"
 
-#: calendar/gui/print.c:2297
-#, fuzzy
-msgid "Task"
-msgstr "Sarcină"
-
 #: calendar/gui/print.c:2356
 #, fuzzy, c-format
 msgid "Status: %s"
@@ -7185,7 +7604,7 @@ msgid "Contacts: "
 msgstr "Contacte"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Previzualizează tipărirea"
 
@@ -7214,7 +7633,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Nu există sarcini"
 msgstr[1] "Nu există sarcini"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7235,36 +7654,30 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 #, fuzzy
 msgid "New task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "Sarcină"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crează o sarcină nouă"
@@ -8983,69 +9396,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sincronizare foldere"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Eroare parsare filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Eroare execuţie filtru: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nu pot deschide dosarul spool"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nu pot procesa dosarul spool"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primesc mesaj %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Nu pot deschide mesajul"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Eşuare la mesajul %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sincronizare dosar"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primesc mesajul %d din %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Eşuare la mesajul %d din %d"
@@ -9070,49 +9483,6 @@ msgstr "Conţinut invalid al mesajului"
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execuţie filtru căutare: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr ""
-
-#: camel/camel-folder.c:1262
-#, fuzzy, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr ""
-"Eroare executare expresia căutare: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1302
-#, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Eroare executare expresia căutare: %s:\n"
-"%s"
-
-#: camel/camel-folder.c:1416
-#, fuzzy
-msgid "Moving messages"
-msgstr "Copiez mesaje"
-
-#: camel/camel-folder.c:1416
-#, fuzzy
-msgid "Copying messages"
-msgstr "Copiez mesajele în %s"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Avertisment"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Primesc mesaje"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -9158,7 +9528,50 @@ msgstr "(potrivire totală) se cere un singur rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Execută interogare în header necunoscut: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr ""
+
+#: camel/camel-folder.c:1262
+#, fuzzy, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr ""
+"Eroare executare expresia căutare: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1302
+#, fuzzy, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Eroare executare expresia căutare: %s:\n"
+"%s"
+
+#: camel/camel-folder.c:1416
+#, fuzzy
+msgid "Moving messages"
+msgstr "Copiez mesaje"
+
+#: camel/camel-folder.c:1416
+#, fuzzy
+msgid "Copying messages"
+msgstr "Copiez mesajele în %s"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Avertisment"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Primesc mesaje"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9166,44 +9579,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9211,65 +9624,85 @@ msgid ""
 "%s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Nu pot crea fişier temp: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mesaj criptat"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nu pot primi mesajul de la editor"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: 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 ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nu pot bloca: '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9291,26 +9724,6 @@ msgstr "Eşuare la blocare prin folosirea fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Eşec la blocarea prin folosirea flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr ""
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr ""
-
-#: 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 ""
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nu pot bloca: '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9557,7 +9970,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Răspuns de la server de autentificare eşuată."
 
@@ -9644,57 +10057,57 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Compilarea expresiei regulate eşuată: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necesită o componentă nume utilizator"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necesită o componentă gazdă"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necesită o componentă de cale"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Eşec la căutarea numelui: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Eşec la căutarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Eşec la căutarea gazdei: %s: gazdă negăsită"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Eşec la căutarea gazdei: %s: motiv necunoscut"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Rezolv: %s"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Eşec la căutarea gazdei: %s: gazdă negăsită"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Eşec la căutarea gazdei: %s: motiv necunoscut"
@@ -9771,7 +10184,7 @@ msgstr "ID certificat:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
@@ -9872,7 +10285,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Adaugă criteriu"
 
 #: camel/camel-smime-context.c:651
@@ -9887,49 +10300,48 @@ msgstr "Comanda IMAP eşuată: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Eşec la găsirea certificatului pentru \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Eşec la găsirea algoritmului comun bulk."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Crează regulă din mesaj"
+msgid "Cannot create CMS Message"
+msgstr "Nu pot deschide mesajul"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Nu pot deschide mesajul"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Nu pot lua dosarul: %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Nu pot lua dosarul: %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Nu pot deschide mesajul"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nu pot crea contextul pentru decodarea S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9978,7 +10390,8 @@ msgstr "Nu pot lua dosarul: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
@@ -9987,8 +10400,8 @@ msgstr "Nu pot crea dosarul blocat la %s: %s"
 msgid "Trash"
 msgstr "Gunoi"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Iunie"
@@ -10120,7 +10533,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10129,11 +10542,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr ""
 
@@ -10155,7 +10568,7 @@ msgstr ""
 "Doriţi să acceptaţi oricum?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10170,35 +10583,35 @@ msgstr ""
 "\n"
 "Doriţi să acceptaţi oricum?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "ID certificat:"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr "ID certificat:"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
@@ -10223,7 +10636,7 @@ msgstr "Verific mesajele noi în toate dosarele"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -10244,8 +10657,8 @@ msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Verific mesajele noi în toate dosarele"
 
@@ -10278,8 +10691,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10299,326 +10712,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Ceaţă densă"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Server deconectat neaşteptat"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dosare"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Arată numai dosare înscrise"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nume spaţiu"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Pentru citirea şi stocarea mesajelor pe servere IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Această opţiune vă va conecta la serverul IMAP folosind o parolă în clar "
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Server SMTP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s serviciu pentru %s în %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nu mă pot conecta la %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexiune anulată"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nu mă pot conecta la serverul POP.\n"
-"Eroare la trimiterea numelui utilizator: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nu mă pot conecta la serverul POP.\n"
-"Eroare la trimiterea numelui utilizator: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Eroare necunoscută"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nu mă pot conecta la serverul POP.\n"
-"Mecanismul de autentificare solicitat este nesuportat."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIntroduceţi vă rog parola SMTP pentru %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Autentificare nereuşită la serverul KPOP: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nu pot deschide directorul cache: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "_Compania:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Nu există sarcini"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Server deconectat neaşteptat"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operaţia anulată"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat neaşteptat"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Eroare necunoscută"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10686,7 +10801,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10761,6 +10876,27 @@ msgstr "Nu mă pot conecta la serverul LDAP."
 msgid "Command:"
 msgstr "_Compania:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Dosare"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Arată numai dosare înscrise"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Nume spaţiu"
+
 #: 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"
@@ -10784,45 +10920,96 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea şi stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Server SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s serviciu pentru %s în %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nu mă pot conecta la %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexiune anulată"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Eroare la trimiterea numelui utilizator: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaţie nesuportată"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Eşec la autentificare."
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nu mă pot conecta la serverul: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serverul IMAP %s nu suportă tipul cerut de autentificare %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVă rog intoduceţi parola IMAP pentru %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nu aţi introdus o parolă."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10833,30 +11020,283 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu există dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nu pot deschide directorul cache: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Eroare necunoscută: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Autentificare nereuşită la serverul KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Server deconectat neaşteptat"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Pentru citirea şi stocarea mesajelor pe servere IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Această opţiune vă va conecta la serverul IMAP folosind o parolă în clar "
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Eroare la trimiterea numelui utilizator: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Mecanismul de autentificare solicitat este nesuportat."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduceţi vă rog parola SMTP pentru %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentificare nereuşită la serverul KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "_Compania:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Nu există sarcini"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server deconectat neaşteptat"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -11027,19 +11467,27 @@ msgstr "Nu pot încărca sumarul pentru %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nu pot adăuga mesajul la sumar: motiv necunoscut"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Inbox"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "Eşuare la mesajul %d"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot adăuga mesajul la dosarul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -11055,48 +11503,48 @@ msgstr ""
 "Nu pot lua mesajul: %s din dosarul %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Conţinut invalid al mesajului"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Dosarul `%s' nu există."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' nu e un director de tip maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nu pot şterge dosarul `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11704,22 +12152,27 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nu mă pot conecta la %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Autentificare nereuşită la serverul KPOP: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, fuzzy, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 "Nu mă pot conecta la serverul POP.\n"
 "Eroare la trimiterea numelui utilizator: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nu mă pot conecta la serverul POP în %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11728,28 +12181,28 @@ msgstr ""
 "Nu mă pot conecta la serverul POP.\n"
 "Mecanismul de autentificare solicitat este nesuportat."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Autentificare nereuşită la serverul KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sVă rog introduceţi parola POP3 pentru %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11758,7 +12211,16 @@ msgstr ""
 "Nu mă pot conecta la serverul POP.\n"
 "Eroare la trimiterea parolei: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Eroare la trimiterea parolei: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nu există dosarul `%s'."
@@ -11980,100 +12442,100 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Server SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP mail livrat prin %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Nu pot trimite mesajul: adresa expeditorului nedefinită."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Nu pot trimite mesajul: adresa expeditorului invalidă."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Trimit mesaj"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 #, fuzzy
 msgid "SMTP Greeting"
 msgstr "Întâlnire"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 #, fuzzy
 msgid "SMTP Authentication"
 msgstr "Autentificare"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Eroare la crearea obiectului de autentificare SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Răspuns de la server: autentificare eşuată.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Comanda MAIL FROM a expirat: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Răspuns de eroare la comanda RCPT TO: %s: mailul nu a fost trimis"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Răspuns de eroare la comanda DATA: %s: mailul nu a fost trimis"
@@ -12081,28 +12543,28 @@ msgstr "Răspuns de eroare la comanda DATA: %s: mailul nu a fost trimis"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Comanda IMAP eşuată: %s"
@@ -12167,98 +12629,6 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afişarea automată a anexei"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nu pot deschide mesajul"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nu pot primi mesajul de la editor"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mesaj fără titlu)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Deschide fişier"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-#, fuzzy
-msgid "Signature:"
-msgstr "Salvează semnătura"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Compune un mesaj"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
-"nici o identitate în componenţa mailului."
-
-#: composer/e-msg-composer.c:3279
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -12344,17 +12714,91 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Attach file(s)"
 msgstr "Anexează un fisier"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nu pot deschide mesajul"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nu pot primi mesajul de la editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mesaj fără titlu)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Deschide fişier"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Salvează semnătura"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Compune un mesaj"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Mesaj înaintat - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Anexează un fişier la mesaj"
+msgstr[1] "Anexează un fişier la mesaj"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Anexează un fişier la mesaj"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12372,37 +12816,51 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nu pot recupera primi de la serverul POP %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Trimite şi mesajele ciornă"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Doriţi să salvaţi modificările?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Nu înlătura"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Şterge"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
@@ -12410,19 +12868,19 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Eroare la salvarea scurtăturilor."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Mesaje înaintate"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12430,63 +12888,74 @@ msgid ""
 msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Tipăreşte calendar"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Salvează mesajul ca..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nu pot crea conexiunea: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr ""
 "Nu pot deschde fişierul semnătură %s:\n"
 "%s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 #, fuzzy
 msgid "All accounts have been removed."
 msgstr "Salvează fişierul curent cu un nume diferit"
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
+msgstr "Nu pot crea fereastra de compunere."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
+"nici o identitate în componenţa mailului."
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12797,11 +13266,6 @@ msgstr "%a %d %Y"
 msgid "Select a time to compare against"
 msgstr "Selectez ora locală"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Reguli filtre"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12832,20 +13296,8 @@ msgstr "Nume stil:"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Fişierul spool `%s' nu există sau nu e un fişier obişnuit."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Rezumare dosar"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "Nume stil:"
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12853,165 +13305,39 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Alocat"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Schimbă numele acestui dosar"
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Schimbă numele acestui dosar"
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Acest eveniment a fost şters."
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 #, fuzzy
 msgid "Choose a file"
 msgstr "Selectez o acţiune"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "Descriere:"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Alege dosar"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Reguli filtre"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Surse dosare V"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Compară faţă de"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Intră"
-
-#: filter/filter.glade.h:6
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Data mesajului va fi comparată indiferent\n"
-"de ora specificată aici."
-
-#: filter/filter.glade.h:8
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Data mesajului va fi comparată chiar dacă un\n"
-"filtru relativ de timp rulează;\n"
-"\"săptămâna trecută\", de exemplu."
-
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Data mesajului va fi comparată indiferent\n"
-"de ora specificată aici."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "o oră relativă la ora curentă"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr ""
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "luni"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "secunde"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "numai dosare specifice"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "ora curentă"
-
-#: filter/filter.glade.h:22
-#, fuzzy
-msgid "the time you specify"
-msgstr "ora specificată"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "cu toate dosarele distante active"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "cu toate dosarele locale şi distante active"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "cu toate dosarele locale"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "ani"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -13084,6 +13410,76 @@ msgstr "intră"
 msgid "outgoing"
 msgstr "iese"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Reguli filtre"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Compară faţă de"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Intră"
+
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Data mesajului va fi comparată indiferent\n"
+"de ora specificată aici."
+
+#: filter/filter.glade.h:6
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Data mesajului va fi comparată chiar dacă un\n"
+"filtru relativ de timp rulează;\n"
+"\"săptămâna trecută\", de exemplu."
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Data mesajului va fi comparată indiferent\n"
+"de ora specificată aici."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "o oră relativă la ora curentă"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr ""
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "luni"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "secunde"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "ora curentă"
+
+#: filter/filter.glade.h:19
+#, fuzzy
+msgid "the time you specify"
+msgstr "ora specificată"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "ani"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adaugă reguli"
@@ -13097,69 +13493,80 @@ msgstr "Editez reguli"
 msgid "Rule name"
 msgstr "Nume regulă:"
 
-#: filter/score-editor.c:110
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
-msgid "_Score Rules"
-msgstr "Reguli de punctaj"
+msgid "Composer Preferences"
+msgstr "Preferinţe calendar"
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Punctaj"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:1
-#, fuzzy
-msgid "Body contains"
-msgstr "conţine"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Body does not contain"
-msgstr "nu conţine"
+msgid "Configure your email accounts here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
 
-#: filter/searchtypes.xml.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Body or subject contains"
-msgstr "Comentariul conţine"
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Message contains"
-msgstr "Numele conţine"
+msgid "Evolution Mail accounts configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
 
-#: filter/searchtypes.xml.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Recipients contain"
-msgstr "Descrierea conţine"
+msgid "Evolution Mail component"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: filter/searchtypes.xml.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Sender contains"
-msgstr "Numele conţine"
+msgid "Evolution Mail composer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: filter/searchtypes.xml.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Subject contains"
-msgstr "Numele conţine"
+msgid "Evolution Mail composer configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
 
-#: filter/searchtypes.xml.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Subject does not contain"
-msgstr "nu conţine"
+msgid "Evolution Mail preferences control"
+msgstr "Componenta Evolution pentru sumarul activităţilor."
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Dosare virtuale"
+msgid "Mail Accounts"
+msgstr "Conturi"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Adaugă"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferinţe calendar"
 
-#: filter/vfolder-rule.c:573
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 #, fuzzy
-msgid "VFolder source"
-msgstr "Surse dosare V"
+msgid "_Mail"
+msgstr "Mail"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -13197,52 +13604,328 @@ msgstr "Şterge tot în afară de semnătură"
 msgid "Signature(s)"
 msgstr "Semnătură HTML:"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Mesaje înaintate"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 #, 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Reguli filtre"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Alege dosar"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Atribuie punctaj"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Atribuie culoare"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Atribuie punctaj"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Anexe"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Mărime"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "conţine"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Copiază în dosar"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Date recepţionate"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Date trimise"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Şterse"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "nu conţine"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "nu se termină cu"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "nu există"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "nu există"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "nu sună ca"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "nu începe cu"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Nu există"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Ciornă"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "se termină cu"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Există"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "există"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Expresie"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "este"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "a fost după"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "a fost înainte"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Marcat"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "e mai mare decât"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "e mai mic decât"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nu este"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Marcat"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Iunie"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+#, fuzzy
+msgid "Label"
+msgstr "eticheta26"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Lista de mail"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Corp mesaj"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Antet mesaj"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Mesajul a fost trimis"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Mesajul %s negăsit."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Mută in dosar"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Ieşire din program"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Redă sunetul:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Citeşte"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Destinatari"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Potrivire regex"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Răspuns la"
+
+#: mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "returns"
+msgstr "Ocupat"
+
+#: mail/em-filter-i18n.h:51
+#, fuzzy
+msgid "returns greater than"
+msgstr "e mai mare decât"
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "e mai mic decât"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Rulează programul:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Punctaj"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Expeditor"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Setează starea"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Mărime (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "sună ca"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Cont sursă"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Antet specific"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "începe cu"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Opresc procesarea"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subiect"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Setează starea"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "Descriere:"
+
 #: mail/em-folder-browser.c:129
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crează dosar virtual din mesaj"
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
-msgstr "Proprietăţi"
-
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
+msgid "Folder Properties"
 msgstr "Proprietăţi"
 
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "Nume dosar:"
-
-#: mail/em-folder-properties.c:146
-#, fuzzy
-msgid "Total messages"
-msgstr "Mesaj _mail"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Mesaj _mail"
+msgstr[1] "Mesaj _mail"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Trimite şi mesajele ciornă"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Trimite şi mesajele ciornă"
+msgstr[1] "Trimite şi mesajele ciornă"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -13253,433 +13936,448 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Create New Folder"
 msgstr "Creză dosar nou..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Precizaţi unde să fie creat dosarul:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Previzualizare"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nume dosar:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Dosare V"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Încarc..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Copiază în folder"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mută in dosar"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Mută"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Anulează sarcina"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiază"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creez dosar nou"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Creez un dosar nou"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Deschide în fereastră nouă"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Copiază..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Mută..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Dosar _nou"
 
-#: mail/em-folder-tree.c:2549
-#, fuzzy
-msgid "_Rename"
-msgstr "Redenumeşte"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Proprietăţi..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Dosare V"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Încarc..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Redenumeşte..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Mail"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editează ca mesaj nou..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Ti_păreşte"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Răspunde la _listă"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Răspunde la toţi"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Înaintează"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Şterge"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Marchează ca citit"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_uperează"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut în folderul..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiază în dosarul..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-#, fuzzy
-msgid "Label"
-msgstr "eticheta26"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaugă expeditorul în agendă"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplică filtre"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Reguli filtre"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crează regulă din mesaj"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V în lista de mail"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Tipăreşte mesaj"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiază legătura către locaţia"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Clic aici să adăugaţi o sarcină"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "De la"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Potriviri:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Răspuns-la:"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Alocat"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "La"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Adaugă criteriu"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
+#: mail/em-format-html-display.c:642
 #, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Subiect"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Adaugă criteriu"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexă"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
+msgid "Unencrypted"
+msgstr "Nedefinit"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
-
-#: mail/em-format.c:1298
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Operaţie anulată de utilizator."
+msgid "Encrypted, weak"
+msgstr "Mesaj criptat"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Eşec la verificarea certificatului."
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Eşec la verificarea certificatului."
+msgid "Encrypted"
+msgstr "Criptare PGP"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Primesc mesajul %s"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
 #, fuzzy
-msgid "Unsigned"
-msgstr "Alocat"
+msgid "Encrypted, strong"
+msgstr "Mesaj criptat"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Valid signature"
-msgstr "Adaugă criteriu"
+msgid "_View Certificate"
+msgstr "ID certificat:"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Adaugă criteriu"
+msgid "This certificate is not viewable"
+msgstr "Mesajul nu este disponibil în mod curent"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1012
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Nedefinit"
+msgid "Overdue:"
+msgstr "Termen depăşit"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Encrypted, weak"
-msgstr "Mesaj criptat"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1085
 #, fuzzy
-msgid "Encrypted"
-msgstr "Criptare PGP"
+msgid "_View Inline"
+msgstr "Vedere inline"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Mesaj criptat"
+msgid "_Hide"
+msgstr "Ascund"
+
+#: mail/em-format-html-print.c:130
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Primesc mesajul %d din %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Primesc mesajul %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
@@ -13715,9 +14413,36 @@ msgstr "Indicator către o dată externă necunoscută (tip \"%s\")"
 msgid "Formatting message"
 msgstr "Copiez mesaje"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "De la"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Răspuns-la:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "La"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+#, fuzzy
+msgid "Bcc"
+msgstr "Bcc:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13734,107 +14459,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Potriviri:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "ID certificat:"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s anexă"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Mesajul nu este disponibil în mod curent"
+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:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:1015
-#, fuzzy
-msgid "Overdue:"
-msgstr "Termen depăşit"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Operaţie anulată de utilizator."
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Vedere inline"
+msgid "Error verifying signature"
+msgstr "Eşec la verificarea certificatului."
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Ascund"
-
-#: mail/em-format-html-print.c:126
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Primesc mesajul %d din %d"
+msgid "Unknown error verifying signature"
+msgstr "Eşec la verificarea certificatului."
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13952,7 +14617,7 @@ msgstr "Trimite _mesaj către lista..."
 msgid "_Add to Addressbook"
 msgstr "Adăugare agendă"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide în %s..."
@@ -13967,7 +14632,7 @@ msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 msgid "Subscribed"
 msgstr "Abonează"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Dosar"
 
@@ -14005,11 +14670,25 @@ msgid "Add address"
 msgstr "_Adresa:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail de la %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Dosare virtuale"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Adaugă"
+
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "Surse dosare V"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14500,73 +15179,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferinţe calendar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crează sau editează conturile de mail şi alte preferinţe"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Componenta Evolution pentru sumarul activităţilor."
+msgid "Evolution Pine importer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Conturi"
+msgid "Evolution mbox importer"
+msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferinţe calendar"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 #, fuzzy
@@ -14631,38 +15274,6 @@ msgstr "Se importă"
 msgid "Importing mailbox"
 msgstr "Se importă"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, fuzzy, c-format
 msgid "Scanning %s"
@@ -14815,82 +15426,88 @@ msgstr "%s lista de mail"
 msgid "Add Filter Rule"
 msgstr "Adaugă regulă de filtrare"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Şterse"
+msgid_plural "%d deleted"
+msgstr[0] "Şterse"
+msgstr[1] "Şterse"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d netrimise"
+msgid_plural "%d junk"
+msgstr[0] "%d netrimise"
+msgstr[1] "%d netrimise"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Ciornă"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Ciornă"
+msgstr[1] "Ciornă"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d netrimise"
+msgid_plural "%d sent"
+msgstr[0] "%d netrimise"
+msgstr[1] "%d netrimise"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d netrimise"
+msgid_plural "%d unsent"
+msgstr[0] "%d netrimise"
+msgstr[1] "%d netrimise"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d netrimise"
+msgid_plural ", %d unread"
+msgstr[0] "%d netrimise"
+msgstr[1] "%d netrimise"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Dosar V Nou"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editează filtre"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Creez un mail nou"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Conectare la server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitate"
@@ -14960,16 +15577,23 @@ msgstr ""
 "rog introduceţi mai jos un nume pentru acest cont. Acest nume va fi folosit "
 "doar pentru afişare."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectare la server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Previzualizare"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -15246,7 +15870,7 @@ msgstr "Nu pot deschide mesajul"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gata"
 
@@ -15627,6 +16251,124 @@ msgstr " culoare"
 msgid "description"
 msgstr "Descriere:"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Surse dosare V"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr " Acceptă "
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Terminat"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Găseşte în mesaj"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Găseşte:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Administrare abonări"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Şterse"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "Mesaj server:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Informaţie sursă"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Conturi"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Data scadentă:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Flag:"
+msgstr "Nume fişier:"
+
+#: mail/mail-dialogs.glade.h:28
+#, fuzzy
+msgid "_Subscribe"
+msgstr "Abonează"
+
+#: mail/mail-dialogs.glade.h:29
+#, fuzzy
+msgid "_Unsubscribe"
+msgstr "Dezabonează"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "numai dosare specifice"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "cu toate dosarele distante active"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "cu toate dosarele locale şi distante active"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "cu toate dosarele locale"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15832,14 +16574,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15944,8 +16678,11 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
+"Nu pot şterge dosarul `%s':\n"
+"%s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15997,8 +16734,9 @@ msgstr "Nu pot redenumi dosarul: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "nu conţine"
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -16007,8 +16745,9 @@ msgstr "Nu aţi completat toată informaţia cerută."
 
 #. mail:account-notunique secondary
 #: mail/mail-errors.xml.h:162
+#, fuzzy
 msgid "You may not create two accounts with the same name."
-msgstr ""
+msgstr "Nu pot crea dosarul blocat la %s: %s"
 
 #. mail:ask-delete-account title
 #: mail/mail-errors.xml.h:164
@@ -16027,8 +16766,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Nu şterge"
+msgstr "Rec_uperează"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -16056,8 +16796,9 @@ msgstr ""
 
 #. mail:ask-signature-changed title
 #: mail/mail-errors.xml.h:179
+#, fuzzy
 msgid "Discard changed?"
-msgstr ""
+msgstr "Tipăreşte calendar"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
@@ -16074,8 +16815,9 @@ msgstr ""
 "Doriţi să salvaţi modificările?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "Tipăreşte calendar"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -16092,8 +16834,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Nu pot şterge dosarul `%s':\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -16127,13 +16872,45 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Rezumare dosar"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "Nume stil:"
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Schimbă numele acestui dosar"
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Acest eveniment a fost şters."
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -16141,16 +16918,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Suprascrieţi fişierul?"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Deschide"
@@ -16315,7 +17092,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16324,46 +17101,21 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr ""
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Găseşte în mesaj"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Găseşte:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Informaţie sursă"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Renunţ..."
@@ -16401,26 +17153,26 @@ msgstr "Actualizez..."
 msgid "Waiting..."
 msgstr "Aştept..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Operaţie anulată de utilizator."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16480,17 +17232,17 @@ msgstr "Scanez dosarele în \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editează dosare V"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
@@ -16554,7 +17306,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -16616,10 +17368,6 @@ msgstr "Înaintează"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Citeşte"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Răspunde"
@@ -16633,55 +17381,60 @@ msgstr "Răspunde la toţi"
 msgid "Review"
 msgstr "Previzualizare"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "conţine"
 
-#: mail/message-tags.glade.h:2
+#: mail/searchtypes.xml.h:2
 #, fuzzy
-msgid "C_ompleted"
-msgstr "Terminat"
+msgid "Body does not contain"
+msgstr "nu conţine"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+#, fuzzy
+msgid "Body or subject contains"
+msgstr "Comentariul conţine"
 
-#: mail/message-tags.glade.h:6
+#: mail/searchtypes.xml.h:4
 #, fuzzy
-msgid "_Due By:"
-msgstr "_Data scadentă:"
+msgid "Message contains"
+msgstr "Numele conţine"
 
-#: mail/message-tags.glade.h:7
+#: mail/searchtypes.xml.h:5
 #, fuzzy
-msgid "_Flag:"
-msgstr "Nume fişier:"
+msgid "Recipients contain"
+msgstr "Descrierea conţine"
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/searchtypes.xml.h:6
 #, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Administrare abonări"
+msgid "Sender contains"
+msgstr "Numele conţine"
 
-#: mail/subscribe-dialog.glade.h:2
+#: mail/searchtypes.xml.h:7
 #, fuzzy
-msgid "None Selected"
-msgstr "Şterse"
+msgid "Subject contains"
+msgstr "Numele conţine"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
 #, fuzzy
-msgid "S_erver:"
-msgstr "Mesaj server:"
+msgid "Subject does not contain"
+msgstr "nu conţine"
 
-#: mail/subscribe-dialog.glade.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "_Subscribe"
-msgstr "Abonează"
+msgid "Evolution Shell"
+msgstr "Shell Evolution."
 
-#: mail/subscribe-dialog.glade.h:5
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
 #, fuzzy
-msgid "_Unsubscribe"
-msgstr "Dezabonează"
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Compozitorul de mailuiri Evolution."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16750,32 +17503,19 @@ msgstr ""
 msgid "mail"
 msgstr "Email"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Eroare necunoscută"
+msgid "<b>Active Connections</b>"
+msgstr "Conexiuni active"
 
-#: shell/e-shell.c:1143
+#: shell/e-active-connection-dialog.glade.h:2
 #, fuzzy
-msgid "Invalid arguments"
-msgstr "Conţinut invalid al mesajului"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr ""
+msgid "Active Connections"
+msgstr "Conexiuni active"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Eroare generică"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Daţi clic pe OK pentru a închide această conexiune şi a vă deconecta"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16961,30 +17701,6 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution este actualmente conectat. Daţi clic pe buton pentru a lucra "
-"deconectat."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution este în proces de deconectare."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution este actualmente deconectat. Daţi clic pe buton pentru a lucra "
-"conectat."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mail la %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
@@ -17003,127 +17719,99 @@ msgstr "Bug buddy nu poate fi rulat."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Nume grup:"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucrează offline"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chinez"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nou"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Sarcină nouă"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Test"
-
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Crează o sarcină nouă"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Conexiuni active"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution este actualmente conectat. Daţi clic pe buton pentru a lucra "
+"deconectat."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Active Connections"
-msgstr "Conexiuni active"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Daţi clic pe OK pentru a închide această conexiune şi a vă deconecta"
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution este în proces de deconectare."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "C_alendar:"
-msgstr "Calendar"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution este actualmente deconectat. Daţi clic pe buton pentru a lucra "
+"conectat."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Contacte"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail la %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "Mail"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Tasks:"
-msgstr "Sarcini"
+msgid "Uknown system error."
+msgstr "Eroare necunoscută"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/e-shell.c:1131
 #, fuzzy
-msgid "Folder _type:"
-msgstr "Tip dosar:"
+msgid "Invalid arguments"
+msgstr "Conţinut invalid al mesajului"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "Creză dosar nou..."
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "Cont"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr ""
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "Nume dosar:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Eroare generică"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "Nume utilizator:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nou"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
 msgstr "Utilitate de import Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 #, fuzzy
 msgid "Importing Files"
 msgstr "Se importă"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 #, fuzzy
 msgid "Timezone "
 msgstr "Zona temporală:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -17132,7 +17820,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -17140,20 +17828,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell Evolution."
+msgid "New Test"
+msgstr "Sarcină nouă"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Compozitorul de mailuiri Evolution."
+msgid "Create a new test item"
+msgstr "Crează o sarcină nouă"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -17223,7 +17911,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution a găsit următoarea sursă de date:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17255,7 +17943,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17264,43 +17952,43 @@ msgstr ""
 "Vă mulţumim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nu mă întreba din nou"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data început:"
 
-#: shell/main.c:500
+#: shell/main.c:465
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data început:"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17373,6 +18061,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17641,6 +18351,12 @@ msgstr "ID certificat:"
 msgid "_Edit CA Trust"
 msgstr "Editare task"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID-ul card-ului există deja"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17873,12 +18589,6 @@ msgstr "Subiectul este %s"
 msgid "Certificate Signature Value"
 msgstr "Fişier semnătură:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID-ul card-ului există deja"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -18030,8 +18740,8 @@ msgstr "ora curentă"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acţiuni"
@@ -18547,16 +19257,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:5
-msgid "Close this window"
-msgstr "Închide această fereastră"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "În_chide"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18997,6 +19697,16 @@ msgstr "_Unelte"
 msgid "_Undelete"
 msgstr "Rec_uperează"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Închide această fereastră"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "În_chide"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ataşează"
@@ -19081,10 +19791,6 @@ msgstr "Salvează fişierul curent cu un nume diferit"
 msgid "Save the message in a specified folder"
 msgstr "Salvez mesajul într-un dosar specificat"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Trimite"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19696,7 +20402,7 @@ msgid "Evolution Query"
 msgstr "Compozitorul de mailuiri Evolution."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19866,19 +20572,285 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
 #, fuzzy
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "Nu mă pot conecta la serverul LDAP."
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Răspuns de la server de autentificare eşuată."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Nume listă:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "editor-lista-contact"
+
+#, fuzzy
+#~ msgid "Save List as VCard"
+#~ msgstr "Salvează ca şi card V"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Nume grup:"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nu pot porni wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Calendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opţiuni alarmă audio"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opţiuni mesaje alarmă"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opţiuni alarmă mail"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opţiuni alarmă program"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Opţiuni alarmă necunoscute"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Repetare alarmă"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Afişează mesaj"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "Corp mesaj"
+
+#~ msgid "Play sound:"
+#~ msgstr "Redă sunetul:"
+
+#~ msgid "Run program:"
+#~ msgstr "Rulează programul:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Cu argumentele:"
+
+#~ msgid "Basics"
+#~ msgstr "Baze"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Ora"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Reaminteşte"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opţiuni..."
+
+#, fuzzy
+#~ msgid "Addressbook..."
+#~ msgstr "Agendă"
+
+#~ msgid "Reminder"
+#~ msgstr "Reaminteşte"
+
+#, fuzzy
+#~ msgid "B_usy"
+#~ msgstr "Ocupat"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Confidenţial"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Data/Ora"
+
+#, fuzzy
+#~ msgid "F_ree"
+#~ msgstr "Grec"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vat"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Pu_blic"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Toţi participanţii"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Adaugă expeditorul în agendă"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Excepţii"
 
 #, fuzzy
-#~ msgid "Failed to authenticate with LDAP server"
+#~ msgid "Preview"
+#~ msgstr "Previzualizare:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Regulă revenire"
+
+#, fuzzy
+#~ msgid "_Custom recurrence"
+#~ msgstr "Revenire personală"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modifică"
+
+#, fuzzy
+#~ msgid "_No recurrence"
+#~ msgstr "Nici o revenire"
+
+#, fuzzy
+#~ msgid "_Simple recurrence"
+#~ msgstr "Revenire simplă"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% Terminat"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "În derulare"
+
+#, fuzzy
+#~ msgid "Con_fidential"
+#~ msgstr "Confidenţial"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Dosar"
+
+#, fuzzy
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "Ora de sfârşit a întâlnirii:"
+
+#, fuzzy
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "Terminat "
+
+#, fuzzy
+#~ msgid "<b>Due:</b> "
+#~ msgstr "Descriere:"
+
+#, fuzzy
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "S-a produs o eroare la descărcarea sursei de ştiri</dt>"
+
+#, fuzzy
+#~ msgid "Object could not be found\n"
+#~ msgstr "Bug buddy nu poate fi rulat."
+
+#, fuzzy
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Nu pot deschide dosarul în `%s'"
+
+#, fuzzy
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Adrese participare"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Adaugă expeditorul în agendă"
+
+#~ msgid "_Options"
+#~ msgstr "_Opţiuni"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Ora de început a întâlnirii:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Ora de sfârşit a întâlnirii:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr "Eroare la start %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Eşec la găsirea certificatului pentru \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Crează regulă din mesaj"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nu pot crea contextul pentru decodarea S/MIME."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
 #~ msgstr ""
-#~ "Autentificare la serverul IMAP eşuată.\n"
-#~ "%s\n"
-#~ "\n"
+#~ "Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
+#~ "nici o identitate în componenţa mailului."
 
 #, fuzzy
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
+#~ msgid "_Score Rules"
+#~ msgstr "Reguli de punctaj"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Nume dosar:"
+
+#, fuzzy
+#~ msgid "_Rename"
+#~ msgstr "Redenumeşte"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Proprietăţi..."
+
+#, fuzzy
+#~ msgid "Checkbox"
+#~ msgstr "Chinez"
+
+#, fuzzy
+#~ msgid "C_alendar:"
+#~ msgstr "Calendar"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Contacte"
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "Mail"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "Sarcini"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Tip dosar:"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Creză dosar nou..."
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "Nume dosar:"
+
+#, fuzzy
+#~ msgid "_User:"
+#~ msgstr "Nume utilizator:"
+
+#, fuzzy
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nu mă pot conecta la serverul LDAP."
 
 #, fuzzy
 #~ msgid "Error retrieving schema information"
@@ -19887,10 +20859,6 @@ msgstr "%s (%d%% complet)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
-
-#, fuzzy
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "Verific tipurile suportate"
 
@@ -19966,10 +20934,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Pagină"
 
 #, fuzzy
-#~ msgid "Category editor not available."
-#~ msgstr "Nu e disponibilă o descriere."
-
-#, fuzzy
 #~ msgid "Could not find widget for a field: `%s'"
 #~ msgstr "Nu pot şterge dosarul sumar al fişierelor `%s': %s"
 
@@ -20004,51 +20968,18 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Source URL:"
 #~ msgstr "Sursă"
 
-#~ 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?"
-
 #~ 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ă?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Sunteţi sigur că doriţî să ştergeţi această sarcină?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
-#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
-#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
-#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Invită pe alţii..."
 
@@ -20117,188 +21048,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Eroare necunoscută: %s"
 
-#, fuzzy
-#~ msgid "Adjust Score"
-#~ msgstr "Atribuie punctaj"
-
-#~ msgid "Assign Color"
-#~ msgstr "Atribuie culoare"
-
-#~ msgid "Assign Score"
-#~ msgstr "Atribuie punctaj"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexe"
-
-#, fuzzy
-#~ msgid "Beep"
-#~ msgstr "Mărime"
-
-#~ msgid "contains"
-#~ msgstr "conţine"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Copiază în dosar"
-
-#~ msgid "Date received"
-#~ msgstr "Date recepţionate"
-
-#~ msgid "Date sent"
-#~ msgstr "Date trimise"
-
-#~ msgid "Deleted"
-#~ msgstr "Şterse"
-
-#~ msgid "does not contain"
-#~ msgstr "nu conţine"
-
-#~ msgid "does not end with"
-#~ msgstr "nu se termină cu"
-
-#~ msgid "does not exist"
-#~ msgstr "nu există"
-
-#, fuzzy
-#~ msgid "does not return"
-#~ msgstr "nu există"
-
-#~ msgid "does not sound like"
-#~ msgstr "nu sună ca"
-
-#~ msgid "does not start with"
-#~ msgstr "nu începe cu"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Nu există"
-
-#~ msgid "Draft"
-#~ msgstr "Ciornă"
-
-#~ msgid "ends with"
-#~ msgstr "se termină cu"
-
-#~ msgid "Exist"
-#~ msgstr "Există"
-
-#~ msgid "exists"
-#~ msgstr "există"
-
-#~ msgid "Expression"
-#~ msgstr "Expresie"
-
-#~ msgid "is"
-#~ msgstr "este"
-
-#, fuzzy
-#~ msgid "is after"
-#~ msgstr "a fost după"
-
-#, fuzzy
-#~ msgid "is before"
-#~ msgstr "a fost înainte"
-
-#, fuzzy
-#~ msgid "is Flagged"
-#~ msgstr "Marcat"
-
-#~ msgid "is greater than"
-#~ msgstr "e mai mare decât"
-
-#~ msgid "is less than"
-#~ msgstr "e mai mic decât"
-
-#~ msgid "is not"
-#~ msgstr "nu este"
-
-#, fuzzy
-#~ msgid "is not Flagged"
-#~ msgstr "Marcat"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Iunie"
-
-#~ msgid "Mailing list"
-#~ msgstr "Lista de mail"
-
-#~ msgid "Message Body"
-#~ msgstr "Corp mesaj"
-
-#~ msgid "Message Header"
-#~ msgstr "Antet mesaj"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Mesajul a fost trimis"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Mesajul %s negăsit."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Mută in dosar"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Ieşire din program"
-
-#, fuzzy
-#~ msgid "Play Sound"
-#~ msgstr "Redă sunetul:"
-
-#~ msgid "Recipients"
-#~ msgstr "Destinatari"
-
-#~ msgid "Regex Match"
-#~ msgstr "Potrivire regex"
-
-#~ msgid "Replied to"
-#~ msgstr "Răspuns la"
-
-#, fuzzy
-#~ msgid "returns"
-#~ msgstr "Ocupat"
-
-#, fuzzy
-#~ msgid "returns greater than"
-#~ msgstr "e mai mare decât"
-
-#, fuzzy
-#~ msgid "returns less than"
-#~ msgstr "e mai mic decât"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Rulează programul:"
-
-#~ msgid "Sender"
-#~ msgstr "Expeditor"
-
-#~ msgid "Set Status"
-#~ msgstr "Setează starea"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Mărime (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "sună ca"
-
-#~ msgid "Source Account"
-#~ msgstr "Cont sursă"
-
-#~ msgid "Specific header"
-#~ msgstr "Antet specific"
-
-#~ msgid "starts with"
-#~ msgstr "începe cu"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Opresc procesarea"
-
-#, fuzzy
-#~ msgid "Unset Status"
-#~ msgstr "Setează starea"
-
 #~ msgid "Working"
 #~ msgstr "Lucrez"
 
@@ -20482,10 +21231,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Găseşte:"
 
 #, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Nume grup:"
-
-#, fuzzy
 #~ msgid "Step 3: Connecting to Server"
 #~ msgstr "Conectare la server..."
 
@@ -20835,9 +21580,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "component"
 #~ msgstr "Întâlnire"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarme"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Poziţie geografică"
 
@@ -21487,22 +22229,10 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "informaţie calendar"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "informaţie calendar"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificare"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Data & Ora"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Descriere:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "Rezu_mat:"
 
@@ -21745,10 +22475,6 @@ msgstr "%s (%d%% complet)"
 #~ 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"
 
@@ -21931,10 +22657,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Primesc rezultatele căutării LDAP..."
 
 #, fuzzy
-#~ msgid "Error performing search"
-#~ msgstr "Eroare ştergere card"
-
-#, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Depozitare offline"
 
@@ -21989,10 +22711,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Vizualizor agendă minicard Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Vizualizor agendă minicard Evolution"
 
@@ -22065,9 +22783,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Use Score"
 #~ msgstr "Punctaj"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Nu pot încărca cursorul\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Dosar conţinând informaţie de contact"
 
@@ -23367,10 +24082,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Implicit"
 
 #, fuzzy
-#~ msgid "Dundee"
-#~ msgstr "Iunie"
-
-#, fuzzy
 #~ msgid "Dyersburg"
 #~ msgstr "_Depanează"
 
@@ -24138,10 +24849,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Mail"
 
 #, fuzzy
-#~ msgid "Managua"
-#~ msgstr "Manager"
-
-#, fuzzy
 #~ msgid "Manassas"
 #~ msgstr "Mesaje"
 
@@ -25386,10 +26093,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Sud Est"
 
 #, fuzzy
-#~ msgid "Southend"
-#~ msgstr "Sud"
-
-#, fuzzy
 #~ msgid "Spencer"
 #~ msgstr "Expeditor"
 
@@ -26570,9 +27273,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "View the selected folder"
 #~ msgstr "Vizualizează dosarul selectat"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Copiază..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Bara dosar"
 
@@ -26583,9 +27283,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Mer_gi la dosarul..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Mută..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Dosar _nou"
 
@@ -26593,9 +27290,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Creză dosar nou..."
 
-#~ msgid "_Rename..."
-#~ msgstr "_Redenumeşte..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Bara cu _scurtături"
 
@@ -26603,9 +27297,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Shortcut..."
 #~ msgstr "_Scurtătură"
 
-#~ msgid "Information"
-#~ msgstr "Informaţie"
-
 #~ msgid "Error"
 #~ msgstr "Eroare"
 
@@ -26705,9 +27396,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Creză dosar nou..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Contacte..."
-
 #, fuzzy
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Procesator pentru  importul fişierelor GnomeCard in Evolution"
@@ -26788,10 +27476,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Implicit"
 
 #, fuzzy
-#~ msgid "Select"
-#~ msgstr "Selectează tot"
-
-#, fuzzy
 #~ msgid "_Add Mapping"
 #~ msgstr "Adaugă acţiune"
 
@@ -26842,9 +27526,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Unnamed Contact List"
 #~ msgstr "Contact schimbat:"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "C_ontacte..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Tipuri de telefon"
 
@@ -26899,10 +27580,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "1"
 
 #, fuzzy
-#~ msgid "nd"
-#~ msgstr "2"
-
-#, fuzzy
 #~ msgid "rd"
 #~ msgstr "3"
 
@@ -27302,10 +27979,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Ora de sfârşit a întâlnirii:"
 
 #, fuzzy
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Informaţie sursă"
-
-#, fuzzy
 #~ msgid "Task Completed: <b>"
 #~ msgstr " (Terminat "
 
@@ -27415,9 +28088,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Send _Later"
 #~ msgstr "Trimite mai târziu"
 
-#~ msgid "Send _later"
-#~ msgstr "Trimite mai târziu"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Setări _pilot..."
 
@@ -27425,10 +28095,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Configuration control for the Evolution Addressbook."
 #~ msgstr "Procesator pentru componentele agendei Evolution."
 
-#, fuzzy
-#~ msgid "Could not query for schema information"
-#~ msgstr "Nu pot bifurca sendmail: %s: mailul nu este trimis"
-
 #~ msgid "Factory for the Calendar Summary component."
 #~ msgstr "Procesator pentru componenta Centralizator a calendarului"
 
@@ -27543,12 +28209,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Could not create a PGP decryption context."
 #~ msgstr "Nu pot crea un context pentru o decriptare PGP."
 
-#~ msgid "Moving"
-#~ msgstr "Mut"
-
-#~ msgid "Copying"
-#~ msgstr "Copiez"
-
 #, fuzzy
 #~ msgid "Signature name:"
 #~ msgstr "Fişier semnătură:"
@@ -27817,9 +28477,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Nu pot deschide dosarul: lista de mesaje a fost incompletă."
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Nu pot recupera primi de la serverul POP %s: %s"
-
 #~ msgid ""
 #~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
 #~ "it."
@@ -28049,9 +28706,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Cannot summarise folder: %s: %s"
 #~ msgstr "Nu pot rezuma dosarul: %s: %s"
 
-#~ msgid "Could not create composer window."
-#~ msgstr "Nu pot crea fereastra de compunere."
-
 #, fuzzy
 #~ msgid "GnomeCard:"
 #~ msgstr "Card: "
@@ -28473,9 +29127,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Week"
 #~ msgstr "_Săptămână"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Închide această întâlnire"
-
 #~ msgid "Print S_etup"
 #~ msgstr "S_etează tipărirea"
 
@@ -28503,9 +29154,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "Personali_zează bara de unelte..."
 
-#~ msgid "Customize toolbars"
-#~ msgstr "Personalizează bările de unelte"
-
 #~ msgid "Delegate Task"
 #~ msgstr "Delegare sarcină"
 
@@ -28758,9 +29406,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Open %s with the default GNOME web browser"
 #~ msgstr "Deschide %s cu navigatorul web implicit GNOME"
 
-#~ msgid "Send an email to %s"
-#~ msgstr "Trimite un email la %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Rulez %s"
 
diff --git a/po/ru.po b/po/ru.po
index e63bd08755..bcd207e17a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-15 16:30+0300\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -25,14 +26,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "адресная книга Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "заголовок контакта: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "миникарточка evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "текущая папка адресной книги "
@@ -53,34 +46,251 @@ msgstr " карточек"
 msgid " card"
 msgstr " карточку"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "заголовок контакта: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "миникарточка evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Элемент не может быть послан!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Сбой аутентификации на сервере IMAP.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Не удается получить список групп с сервера."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Ответ сервера IMAP не содержит информации о %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Не удается загрузить адресную книгу"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Описание не доступно."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Сохранить в адресной книге"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Ошибка при загрузке адресной книги по умолчанию."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Не удается обработать папку спула"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Хотите сохранить изменения?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Отклонить"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "и одна другой контакт."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Не удается разобрать содержимое сообщения"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Ошибка добавления контакта"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Addressbook address viewer"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Адрес синхронизации по умолчанию:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Не удается загрузить адресную книгу"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Не удается прочитать блок приложения адресов Пилота"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонимное подключение к серверу LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Ошибка проверки подлинности.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Автозавершение"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВведите пароль для %s (пользователь %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "К_онтакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Сертификаты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Здесь настраивается автозавершение"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Адресная книга Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Здесь можно управлять вашими сертификатами S/MIME"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -111,7 +321,8 @@ msgid "New Contacts Group"
 msgstr "Создать группу контактов"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "_Группа контактов"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -134,15 +345,15 @@ msgid "Migrating `%s':"
 msgstr "Переносится '%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "На этом компьютере"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -151,19 +362,19 @@ msgid "Personal"
 msgstr "Личный"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Серверы LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Настройка автозавершения"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -175,7 +386,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -187,7 +398,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -199,7 +410,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -211,36 +422,45 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Свойства..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакты"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонимное подключение к серверу LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Ошибка проверки подлинности.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВведите пароль для %s (пользователь %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -262,58 +482,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI папки, использовавшейся в последний раз в диалоге выбора имен"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Автозавершение"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "К_онтакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Сертификаты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Здесь настраивается автозавершение"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Адресная книга Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Здесь можно управлять вашими сертификатами S/MIME"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -321,7 +489,7 @@ msgstr "Здесь можно управлять вашими сертифика
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -330,8 +498,7 @@ msgstr "Здесь можно управлять вашими сертифика
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -357,6 +524,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Проверка подлинности</b>"
 
@@ -400,13 +568,11 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основные"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Подробности"
 
@@ -424,7 +590,8 @@ msgstr "Электронная почта"
 
 #: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
 
 #: addressbook/gui/component/ldap-config.glade.h:23
@@ -657,33 +824,26 @@ msgid "cards"
 msgstr "карточек"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "Удалить все"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Удалить все"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Просмотр списка контактов"
@@ -698,7 +858,7 @@ msgid "Send HTML Mail?"
 msgstr "Отправлять почту в формате HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Добавить к контактам"
 
@@ -706,15 +866,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Выбор контактов из адресной книги"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -736,6 +903,11 @@ msgstr "К_атегория:"
 msgid "_Find"
 msgstr "_Найти"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "П_оиск"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -781,9 +953,8 @@ msgid "<b>Work</b>"
 msgstr "<b>К:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -808,7 +979,6 @@ msgid "Birthday:"
 msgstr "День ро_ждения:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Календарь:"
 
@@ -823,15 +993,15 @@ msgid "Company:"
 msgstr "Команда:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -941,8 +1111,8 @@ msgstr "_Веб-страница:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -964,44 +1134,28 @@ msgid "_File under:"
 msgstr "Имя файла:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить эти контакты?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить этот контакт?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Адрес"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Изменяемый"
 
@@ -1973,133 +2127,125 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#, fuzzy
-msgid "GroupWise"
-msgstr "Novell GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Служба"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Адрес"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Имя пользователя"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Другие"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Книга-источник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Книга назначения"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Является новым конактом"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Поля для записи"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Изменено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Выберите один из следующих вариантов"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Повторяющаяся дата некорректна"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d контактов"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Отклонить"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Служба"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Адрес"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Имя пользователя"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
@@ -2117,6 +2263,22 @@ msgstr "_Полное имя:"
 msgid "E-_mail:"
 msgstr "_Эл. адрес:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2242,48 +2404,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Выбор контактов из адресной книги"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Члены"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Удалить выбранные элементы из списка вложений"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Выбрано"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Скрывать адреса при отправке почты в этот список"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Имя _списка:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Введите эл.адрес или перетащите контакт в список, приведённый ниже:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Редактор списка контактов"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Книга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "является новым списком"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Необходимые участники"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Редактор списка контактов"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Сохранить список как VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Изменённый контакт:"
@@ -2322,427 +2505,11 @@ msgstr ""
 "в этой папке. Всё равно хотите добавить?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Участники списка"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Группа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Видеоконференции"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "работа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Блог"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "личный"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Примечание"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Домашняя страничка"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Успешно"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Репозиторий вне сети"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Адресная книга не существует"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Создать список контактов"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Отказ в доступе"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Контакт не найден"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Идентификатор контакта уже существует"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Протокол не поддерживается"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не удается открыть \"%s\": %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Сбой проверки подлинности"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Требуется проверка подлинности"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS недоступен"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Нет такого сообщения"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Иная ошибка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
-"у вас имеются необходимые права доступа."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
-"URI, либо сервер LDAP недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
-"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
-"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
-"ниже ссылке."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
-"URI, либо сервер недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"С этим запросом совпало больше карточек, чем \n"
-"настроено для выдачи в сервере или Evolution.\n"
-"Пожалуйста, точнее определите условия поиска, или\n"
-"поднимите ограничения для выдачи результатов в\n"
-"настройках сервера каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Время исполнения запроса превысило ограничения сервера\n"
-"или ограничения, определенного для этой адресной книги.\n"
-"Пожалуйста, точнее определите условия поиска или\n"
-"поднимите ограничения времени в настройках сервера\n"
-"каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Этот запрос завершился с ошибкой."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Ошибка добавления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Ошибка добавления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Ошибка изменения списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Ошибка изменения контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Ошибка удаления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Ошибка удаления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 контактов также откроет %d новых окон.\n"
-"Вы действительно хотите отобразить все эти контакты?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s уже существует\n"
-"Хотите переписать?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "список"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Переместить контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Копировать контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Переместить контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Копировать контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Выберите целевую адресную книгу."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Множество VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard для %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(нет)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Основной эл.адрес"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Эл. почта 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Эл. почта 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Выбрать действие"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Создать новый контакт \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Добавить адрес к существующему контакту \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Поиск в адресной книге..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Правка контактной информации"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Объединить эл.адреса"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "и одна другой контакт."
-msgstr[1] "и одна другой контакт."
-msgstr[2] "и одна другой контакт."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Показывать всю карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Показывать компактную карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Сохранить в адресной книге"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Нет контактов"
@@ -2757,9 +2524,9 @@ msgstr[2] "%d контактов"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Запрос"
 
@@ -2775,130 +2542,130 @@ msgstr "Модель"
 msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Дополнительно..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Создать контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Создать список контактов..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Импорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Найти контакты..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Источники адресных книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Настройка Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Напечатать конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Копировать в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Переместить в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вырезать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копировать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Текущий вид"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Любая категория"
@@ -2932,6 +2699,8 @@ msgid "Car Phone"
 msgstr "Телефон в машине"
 
 #: 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:3
 msgid "Categories"
 msgstr "Категории"
 
@@ -2939,6 +2708,21 @@ msgstr "Категории"
 msgid "Company Phone"
 msgstr "Телефон компании"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Эл. почта 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Эл. почта 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Фамилия"
@@ -2975,14 +2759,29 @@ msgstr "Журнал"
 msgid "Manager"
 msgstr "Мeнеджер"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Псевдоним"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Примечание"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Организация"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Другой факс"
@@ -3034,29 +2833,21 @@ msgstr "Подразделение"
 msgid "Web Site"
 msgstr "Веб-сайт"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Высота"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Имеет фокус"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Выбрано"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Имеет курсор"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поле"
@@ -3073,7 +2864,11 @@ msgstr "Текстовая модель"
 msgid "Max field name length"
 msgstr "Максимальная длина имени поля"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ширина столбца"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3087,7 +2882,7 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь, чтобы создать новый контакт."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3097,13 +2892,398 @@ msgstr ""
 "\n"
 "Нет элементов для отображения в этом окне."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина столбца"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Выбрано"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Имеет курсор"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Участники списка"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Видеоконференции"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "работа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Блог"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "личный"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Домашняя страничка"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Успешно"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Репозиторий вне сети"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Адресная книга не существует"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Создать список контактов"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Отказ в доступе"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Контакт не найден"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Идентификатор контакта уже существует"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Протокол не поддерживается"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не удается открыть \"%s\": %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Сбой проверки подлинности"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Требуется проверка подлинности"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS недоступен"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Нет такого сообщения"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Иная ошибка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
+"у вас имеются необходимые права доступа."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
+"URI, либо сервер LDAP недоступен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
+"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
+"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
+"ниже ссылке."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
+"URI, либо сервер недоступен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"С этим запросом совпало больше карточек, чем \n"
+"настроено для выдачи в сервере или Evolution.\n"
+"Пожалуйста, точнее определите условия поиска, или\n"
+"поднимите ограничения для выдачи результатов в\n"
+"настройках сервера каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Время исполнения запроса превысило ограничения сервера\n"
+"или ограничения, определенного для этой адресной книги.\n"
+"Пожалуйста, точнее определите условия поиска или\n"
+"поднимите ограничения времени в настройках сервера\n"
+"каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"База данных для этой адресной книги не смогла обработать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Этот запрос завершился с ошибкой."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Ошибка добавления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Ошибка добавления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Ошибка изменения списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Ошибка изменения контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Ошибка удаления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Ошибка удаления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 контактов также откроет %d новых окон.\n"
+"Вы действительно хотите отобразить все эти контакты?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s уже существует\n"
+"Хотите переписать?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "список"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Переместить контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Копировать контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Переместить контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Копировать контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Выберите целевую адресную книгу."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Множество VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard для %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(нет)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Основной эл.адрес"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Выбрать действие"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Создать новый контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Добавить адрес к существующему контакту \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Поиск в адресной книге..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Правка контактной информации"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Объединить эл.адреса"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "и одна другой контакт."
+msgstr[1] "и одна другой контакт."
+msgstr[2] "и одна другой контакт."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Показывать всю карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Показывать компактную карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сохранить в адресной книге"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3150,6 +3330,11 @@ msgstr "Evolution vCalendar importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Напечатать конверт"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Напечатать контакты"
@@ -3159,11 +3344,6 @@ msgstr "Напечатать контакты"
 msgid "Print contact"
 msgstr "Напечатать контакт"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Напечатать конверт"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3348,6 +3528,22 @@ msgstr "Проверка печати контакта"
 msgid "This should test the contact print code"
 msgstr "Проверка кода печати контакта"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Не удается открыть файл"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Не удается загрузить адресную книгу"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не удается открыть адресную книгу"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Указать файл вместо стандартного вывода"
@@ -3373,7 +3569,8 @@ msgid "Export in asynchronous mode "
 msgstr "Экспорт в асинхронном режиме "
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "Количество карточек в одном файле вывода в асинхронном режиме, по умолчанию "
 "100"
@@ -3383,7 +3580,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Ошибка аргументов командной строки, используйте параметр --help, чтобы "
 "просмотреть доступные аргументы."
@@ -3404,22 +3602,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Невозможная внутренняя ошибка."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Не удается открыть файл"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Не удается загрузить адресную книгу"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Не удается открыть адресную книгу"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Ошибка при загрузке адресной книги по умолчанию."
@@ -3436,39 +3618,371 @@ msgstr "Не указано имя файла."
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не удалять"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Отправить:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Встреча"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Хотите сохранить изменения?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Вы сделали изменения. Отменить их?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Отклонить изменения"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Сохранить сообщение ..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Отправить"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importer"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Ввод пароля"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Разделить многодневные события:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Не удается запустить сервер wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Не удается запустить wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не удается прочитать блок приложения календарь Пилота"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Приоритет по умолчанию:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не удается прочитать блок приложения заданий Пилота"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календарь и задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Календарь и задачи Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Компонент календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Компонент задач Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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 alarm notification service"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Начинается:"
@@ -3570,10 +4084,6 @@ 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 alarm notification service"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Не удается инициализировать Bonobo"
@@ -3716,9 +4226,30 @@ msgstr "Показывать ли время в 24-часовом формате
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показывать ли номера недель в навигаторе по датам"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "\"Коротко\" содержит"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Комментарий содержит"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Прочее"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3741,8 +4272,8 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "дней"
 
@@ -3753,7 +4284,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d %b"
@@ -3802,62 +4333,52 @@ msgstr "Не удаётся открыть календарь '%s' для соз
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Календари"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Еже_дневная встреча"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "К_алендарь"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Календарь"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -3887,27 +4408,6 @@ msgstr "Как неделю"
 msgid "Month View"
 msgstr "как месяц"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "\"Коротко\" содержит"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Комментарий содержит"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Прочее"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Ошибка при открытии календаря"
@@ -3925,223 +4425,133 @@ msgstr "Отказ в доступе при открытии календаря"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Параметры звукового сигнала"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Параметры сигнала-сообщения"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Параметры сигнала по почте"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Параметры программы-сигнала"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Параметры сигнала неизвестного типа"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Повторение сигнала"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Сообщение для отображения:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Сообщение для отправки"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Воспроизвести звук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Повторить сигнал"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Запустить программу:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Отправить:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "С аргументами:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>К:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "дополнительное время каждые"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Параметры списка задач</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "часов"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>К:</b> "
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Действие/Переключатель"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Добавление нового календаря"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Добавить"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Новое сообщение"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Основы"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Дата/Время:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Сообщения"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Воспроизвести звук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Напоминания"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Запустить программу"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Отправить:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Отправить почту"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Сводка:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Учетная запись:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Параметры..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Запустить программу:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Повторить сигнал"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Отправить"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "после"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "до"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "дней"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "завершение встречи"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "дополнительное время каждые"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "часов"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "часов"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "минут"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "начало встречи"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Необходимо указать адрес, откуда можно получить календарь."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Адрес источника '%s' сформирован неверно."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Адрес источника '%s' не является адресом webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Источник с именем '%s' уже существует в выбранной группе"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Добавление нового календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Группа списка задач"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Цвета"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Выбрать цвет"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Добавление нового календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Добавить группу..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Обновить"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Действие/Переключатель"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Добавить"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "недели"
+msgid "Alarms"
+msgstr "Сигнал в %s"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4257,7 +4667,7 @@ msgid "Free/Busy Publishing"
 msgstr "Запрос информации о занятости"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Пятница"
@@ -4271,7 +4681,7 @@ msgid "Minutes"
 msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понедельник"
@@ -4281,7 +4691,7 @@ msgid "S_un"
 msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Суббота"
@@ -4295,7 +4705,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показывать номера недель в навигаторе по датам"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Воскресенье"
@@ -4309,7 +4719,7 @@ msgid "T_hu"
 msgstr "Чтв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четверг"
@@ -4323,7 +4733,7 @@ msgid "Time format:"
 msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вторник"
@@ -4333,7 +4743,7 @@ msgid "W_eek starts:"
 msgstr "Начало недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Среда"
@@ -4366,7 +4776,8 @@ msgstr "Ужимать выходные дни в представлении м�
 msgid "_Day begins:"
 msgstr "_День начинается:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4416,6 +4827,80 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Необходимо указать адрес, откуда можно получить календарь."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Адрес источника '%s' сформирован неверно."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Адрес источника '%s' не является адресом webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Источник с именем '%s' уже существует в выбранной группе"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Добавление нового календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Группа списка задач"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Цвета"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Выбрать цвет"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Добавление нового календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Добавить группу..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Обновить"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "недели"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Это событие было удалено."
@@ -4460,81 +4945,75 @@ msgstr "%s Вы сделали изменения. Отменить их?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Ошибка проверки: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " к "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (к дате"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "К дате"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Не удается обновить объект"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запись в журнале - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Сохранить как..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Изменения этого элемента будут отвергнуты, если по эл. почте придет "
 "обновление."
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Не удается использовать текущую версию!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Ошибка проверки: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " к "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (к дате"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "К дате"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4598,8 +5077,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Этот элемент не может быть удален из-за ошибки"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Адресная книга..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Контакты"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4609,161 +5089,225 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Встреча"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Ориентация"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Собрание"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Дата завершения рашьше даты окончания!"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Неверная дата завершения"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Неверное время начала"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Неверное время завершения"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не удаётся открыть календарь '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "перед каждой встречей"
+msgstr[1] "перед каждой встречей"
+msgstr[2] "перед каждой встречей"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "завершение встречи"
+msgstr[1] "завершение встречи"
+msgstr[2] "завершение встречи"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "перед каждой встречей"
+msgstr[1] "перед каждой встречей"
+msgstr[2] "перед каждой встречей"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Событие на _весь день"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "перед каждой встречей"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Занят"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "перед каждой встречей"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ка_тегории..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "перед каждой встречей"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Параметры списка задач</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Классификация"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>К:</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Ко_нфиденциальное"
+msgid "A_ll day event"
+msgstr "Событие на _весь день"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Дата и время"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Сохранить вид пользователя..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Свободен"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ка_тегории..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Календарь:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Классификация"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Конфиденциальное"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "L_ocation:"
 msgstr "Мес_то:"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
 msgstr "Показать время как"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Коротко:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "О_чистить"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Описание:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Коне_ц:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Нача_ло:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Выбранный организатор больше не имеет учетной записи."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Требуется организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "Доверить..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Удалить"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Удалить"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4802,36 +5346,45 @@ msgid "Member"
 msgstr "Участник"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Заинтересованное лицо"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Состояние"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Участник"
+msgid "<b>Attendees</b>"
+msgstr "<b>К:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Добавить отправителя в _адресную книгу"
+msgid "<b>Organizer</b>"
+msgstr "<b>К:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Изменить организатора"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Контакты"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Изменить организатора"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Организатор:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4878,8 +5431,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Вы изменяете повторяющуюся задачу, что именно вы хотите изменить?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
+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"
@@ -4897,147 +5452,142 @@ msgstr "Эту и последующие записи"
 msgid "All Instances"
 msgstr "Все записи"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Эта встреча имеет правила повторения, не редактируемые в Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Повторяющаяся дата некорректна"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "в"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "первый"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "секунда"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "третий"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "четвертый"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "последний"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Другая дата"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "случаи"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Дата/Время"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Каждый"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Исключения"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Предварительный просмотр"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Правило повторения"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Другое повторение"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Изменить"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Без повторения"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Повторение"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Удалить"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Каждый"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Простое повторение"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Изменить встречу"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "в"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "всегда"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "месяцы"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "до"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "неделя"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "год(лет)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Назначение:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Папка _черновиков:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Список задач"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>_Отображаемые заголовки письма</b>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Выполнено"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Отправленные сообщения и черновики"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Выполнено"
 
@@ -5049,8 +5599,8 @@ msgstr "Высокий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "В процессе"
@@ -5062,22 +5612,22 @@ msgid "Low"
 msgstr "Низкий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Нормальный"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не начато"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Продвижение"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Завершено процентов: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5101,36 +5651,42 @@ msgstr "Состояние:"
 msgid "_Web Page:"
 msgstr "_Веб-страница:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Задание"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Назначение"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удается открыть задачи в '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Кон_фиденциально"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Уведомление о новой почте"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Отправленные сообщения и черновики"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Описание:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Папка:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5141,55 +5697,59 @@ msgstr "Дата начала:"
 msgid "_Due date:"
 msgstr "Дата выполнения:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Неверный ответ от сервера при идентификации."
+msgid "_Group:"
+msgstr "Группа"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Календари, выбранные для публикации"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Параметры календаря</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
 #, fuzzy
-msgid "Daily"
-msgstr "День"
+msgid "<b>Publishing Frequency</b>"
+msgstr "Частота публикации"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Информация о занятости"
+msgid "<b>Publishing _Location</b>"
+msgstr "Адрес для публикации занятости"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Адрес для публикации занятости"
+#, fuzzy
+msgid "Free/Busy Editor"
+msgstr "Информация о занятости"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Учетное имя:"
+#, fuzzy
+msgid "_Daily"
+msgstr "День"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Пароль:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Почта:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Частота публикации"
+#, fuzzy
+msgid "_Password:"
+msgstr "Пароль:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Запомнить пароль"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Имя пользователя:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Еженедельно"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5276,7 +5836,7 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Нажмите, чтобы открыть %s"
@@ -5285,6 +5845,11 @@ msgstr "Нажмите, чтобы открыть %s"
 msgid "Untitled"
 msgstr "Неозаглавленное"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Сводка:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5296,7 +5861,7 @@ msgstr "Дата выполнения:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Состояние:"
 
@@ -5309,20 +5874,94 @@ msgstr "Приоритет:"
 msgid "Web Page:"
 msgstr "_Веб-страница:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Общее"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Дата"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Личное"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Дата начала"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Конфиденциальное"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Сводка"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Свободен"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Занят"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ю"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "В"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географическое положение должно быть введено в формате:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Нет"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Повторение"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Назначено"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5368,95 +6007,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Свободен"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Занят"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Открыть"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Печать..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Вст_авить"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Назначить задачу"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Переслать как iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "По_метить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "По_метить выбранную задачу как выполненную"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "У_далить выделенные задачи"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Сохранить как..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
 
@@ -5465,182 +6110,112 @@ msgstr "Щёлкните здесь, чтобы добавить задачу"
 msgid "% Complete"
 msgstr "% Выполнено"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Выполнено"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Дата выполнения"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Срок выполнения"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Дата начала"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Сводка"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Сортировка задач"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Перемещение сообщений"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Копирование сообщений"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Новая задача"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Выделить подшивку"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Выбрать..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Копировать в папку..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Переместить в папку..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Перейти к сег_одняшнему дню"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Пере_йти к дате..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Настройка..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Повторение"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Назначено"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Да"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Нет"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ю"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "В"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географическое положение должно быть введено в формате:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5664,36 +6239,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "Деления через %02i минут"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "Деления через %02i минут"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5766,37 +6341,35 @@ msgid ", ending on "
 msgstr ", заканчивается на"
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Начинается:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Заканчивается:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Состояние"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Выполнено:</b>"
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>К:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "К дате"
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Сведения iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Неизвестное лицо"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5804,307 +6377,289 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Нет</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Расположение:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Принято"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Отклонено"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Выберите действие:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Обновить"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ок"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Принять"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Отклонить"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Информация о собрании"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желает добавить к существующему собранию."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ответил на приглашение на собрание."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> отменил собрание."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Отмена собрания"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> отправил невразумительное сообщение."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опубликовал информацию о задаче"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желает добавить к существующей задаче."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ответил на назначение задачи."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> отменил задачу."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Отмена задачи"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опубликовал информацию о занятости."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ответил на запрос информации о занятости."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Вложение не содержит правильного сообщения календаря."
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Статус участника не может быть обновлён, потому что элемент больше не "
-"существует"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
+msgstr ""
+"Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "В системе CORBA произошла ошибка\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Объект не может быть найден!\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "У вас нет соответствующих прав для обновления календаря\n"
+msgstr ""
+"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Статус участника не может быть обновлён!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Статус участника не может быть обновлён, потому что элемент больше не "
+"существует"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
@@ -6133,6 +6688,10 @@ msgstr "Загрузка календаря"
 msgid "Loading calendar..."
 msgstr "Загрузка календаря..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Сообщение сервера:"
@@ -6149,11 +6708,6 @@ msgstr "дата-начала"
 msgid "Chair Persons"
 msgstr "Председатели"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Необходимые участники"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Дополнительные участники"
@@ -6221,6 +6775,28 @@ msgstr "Передано"
 msgid "In Process"
 msgstr "В процессе"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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, %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Вне офиса"
@@ -6229,98 +6805,64 @@ msgstr "Вне офиса"
 msgid "No Information"
 msgstr "Нет информации"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Добавить отправителя в _адресную книгу"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+msgid "O_ptions"
 msgstr "Параметры"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Показывать только рабочие часы"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Показывать уменьшенные"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Обновить информацию о занятости"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "<_<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Автовыбор"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Все люди и ресурсы"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Все люди и один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Требуемые люди"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Требуемые люди и один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Время _начала собрания:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Время _завершения собрания:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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, %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Введите пароль для %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6329,117 +6871,52 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Загрузка задач"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Ошибка открытия %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Загрузка задач"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задачи"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Обновление объектов"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка задач"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Турин"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Календарь и задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Календарь и задачи Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Компонент календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Компонент задач Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Календари"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задачи"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Апрель"
@@ -6787,10 +7264,6 @@ msgstr "Выбранный месяц (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Выбранный год (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Задание"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6821,7 +7294,7 @@ msgid "Contacts: "
 msgstr "Контакты: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Предварительный просмотр"
 
@@ -6850,7 +7323,7 @@ msgstr[0] "%d контактов"
 msgstr[1] "%d контактов"
 msgstr[2] "%d контактов"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6872,35 +7345,29 @@ msgstr "Не удается открыть список задач '%s' для �
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Задача"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Группа списка задач"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Создать новую задачу"
@@ -8579,69 +9046,69 @@ msgstr "Подготовка папки \"%s\" для автономной ра�
 msgid "You must be working online to complete this operation"
 msgstr "Для завершения данной операции необходимо подключение к сети"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неверный поток сообщений получен из %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Не удается разобрать фильтр: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Не удается открыть папку спула"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Не удается обработать папку спула"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Не удается открыть сообщение"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
@@ -8663,43 +9130,6 @@ msgstr "Недопустимые аргументы для user-tag"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподдерживаемая операция: поиск выражения: для %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Перемещение сообщений"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Копирование сообщений"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Изменение статуса спама"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Получение %d сообщений"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8745,7 +9175,45 @@ msgstr "(совпадает все) требует единственного л
 msgid "Performing query on unknown header: %s"
 msgstr "Запрашивается неизвестный заголовок: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподдерживаемая операция: поиск выражения: для %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Перемещение сообщений"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копирование сообщений"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Изменение статуса спама"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Получение %d сообщений"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8756,15 +9224,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8773,30 +9241,31 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Не удается зашифровать это сообщение: Не определены корректные получатели"
+msgstr ""
+"Не удается зашифровать это сообщение: Не определены корректные получатели"
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8807,62 +9276,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Сбой при кодировании GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Сбой при исполнении gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Сбой при исполнении gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не удается проверить подпись сообщения: Неверный формат сообщения"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Не удается проверить подпись сообщения: не удается создать временный файл: %s"
+msgstr ""
+"Не удается проверить подпись сообщения: не удается создать временный файл: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Не удается разобрать содержимое сообщения"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не удается создать канал к блокиратору: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не удается запустить блокиратор: %s"
+
+#: 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\": ошибка протокола с блокиратором"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не удается заблокировать \"%s\""
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8885,26 +9375,6 @@ msgstr "Не удается получить блокировку использ
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удается получить блокировку используя flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не удается создать канал к блокиратору: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не удается запустить блокиратор: %s"
-
-#: 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\": ошибка протокола с блокиратором"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не удается заблокировать \"%s\""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8982,7 +9452,8 @@ msgstr "Для чтения почты по запросу к другому н�
 #: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr ""
+"Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
 
 #: camel/camel-provider.c:181
 #, c-format
@@ -9151,7 +9622,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
@@ -9236,55 +9707,55 @@ msgstr "POP до SMTP, используя не-POP источник"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Поиск узла: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ошибка при поиске узла: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Сбой поиска узла: не удается создать поток: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Сбой поиска узла: %s: узел не найден"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Сбой поиска узла: %s: причина неизвестна"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Поиск адреса"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Сбой поиска узла: узел не найден"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Сбой поиска узла: неизвестная причина"
 
@@ -9360,7 +9831,7 @@ msgstr "ID _сертификата:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Не удается заблокировать папку %s: %s"
@@ -9456,7 +9927,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Подпись действительна"
 
 #: camel/camel-smime-context.c:651
@@ -9471,48 +9942,47 @@ msgstr "Сбой команды IMAP: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Не удается создать папку: %s: %s"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Созда_ть правило из сообщения"
+msgid "Cannot create CMS Message"
+msgstr "Не удается открыть сообщение"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Не удается открыть сообщение"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Не удается вложить файл %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Не удается вложить файл %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Не удается открыть сообщение"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Не удается заблокировать папку %s: %s"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9559,7 +10029,8 @@ msgstr "Не удается создать папку: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удается удалить папку: %s: недопустимая операция"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удается переименовать папку: %s: недопустимая операция"
@@ -9568,8 +10039,8 @@ msgstr "Не удается переименовать папку: %s: недо�
 msgid "Trash"
 msgstr "Корзина"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
 
@@ -9689,7 +10160,7 @@ msgstr "Использование ключа не обеспечивает по
 msgid "Error in application verification"
 msgstr "Ошибка при проверке приложения"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9702,11 +10173,11 @@ msgstr ""
 "Отпечаток:         %s\n"
 "Подпись:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "BAD"
 
@@ -9729,7 +10200,7 @@ msgstr ""
 "Принять сертификат в любом случае?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9744,7 +10215,7 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9753,7 +10224,7 @@ msgstr ""
 "Проблема с сертификатом: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9762,7 +10233,7 @@ msgstr ""
 "Некорректный домен сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9771,7 +10242,7 @@ msgstr ""
 "Истек срок действия сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9780,7 +10251,7 @@ msgstr ""
 "Истек срок действия списка аннулированных сертификатов: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не удается разобрать URL \"%s\""
@@ -9804,7 +10275,7 @@ msgstr "Не удается скопировать или переместить
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удается удалить папку: %s: нет такой папки"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удается переименовать папку: %s: нет такой папки"
@@ -9825,14 +10296,15 @@ msgid "Checking for new mail"
 msgstr "Проверка новой почты"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Проверять новую почту во всех папках"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
@@ -9858,8 +10330,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Для доступа к серверам Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9880,320 +10352,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "список"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неожиданный ответ от сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Сервер неожиданно отключился: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Не удается добавить сообщение к папке mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Не удается добавить сообщение к папке mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Папки"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показывать только те папки, на которые вы подписаны"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Переопределять предлагаемое сервером пространство имён для папок"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Пространство имен"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Для чтения и хранения почты на серверах IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Подключение к серверу IMAP будет производиться с использованием "
-"незашифрованного пароля."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Сервис IMAP для %s на %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL недоступен"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Соединение отменено"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
-"механизм идентификации."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sВведите пароль SMTP для %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Сбой идентификации на сервере POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Не удается переименовать папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Не удается удалить папку: %s: нет такой папки"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Команда:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Не удается переименовать папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неожиданный ответ от сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Нет данных"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Сервер неожиданно отключился: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10262,7 +10442,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10291,7 +10471,8 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2660
@@ -10333,9 +10514,31 @@ msgstr "Использовать свою строку для подключен
 msgid "Command:"
 msgstr "Команда:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Папки"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Показывать только те папки, на которые вы подписаны"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Переопределять предлагаемое сервером пространство имён для папок"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Пространство имен"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
 
 #: camel/providers/imap/camel-imap-provider.c:66
 #, fuzzy
@@ -10355,43 +10558,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Сервер IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Сервис IMAP для %s на %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL недоступен"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Соединение отменено"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Расширение SSL/TLS не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Сбой согласований SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удается подключиться командой \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Аутентификация %s не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sВведите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10402,30 +10654,282 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Эта папка не может содержать подпапки"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестная родительская папка: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Сервер неожиданно отключился: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Не удается добавить сообщение к папке mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Не удается добавить сообщение к папке mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Для чтения и хранения почты на серверах IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Подключение к серверу IMAP будет производиться с использованием "
+"незашифрованного пароля."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
+"механизм идентификации."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sВведите пароль SMTP для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не удается удалить папку: %s: нет такой папки"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Не удается удалить папку: %s: нет такой папки"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Команда:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Нет данных"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Сервер неожиданно отключился: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10591,18 +11095,26 @@ msgstr "Не удается сохранить краткую информаци
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не удается добавить сообщение к краткой информации: причина неизвестна"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Входящие"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Добавление сообщения к папке почтового каталога отменено"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не удается добавить сообщение к папке почтового каталога: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10618,48 +11130,48 @@ msgstr ""
 "Не удается получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Неверное содержание сообщения"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Не удается получить папку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папка \"%s\" не существует."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не является почтовым каталогом."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не удается удалить папку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11046,7 +11558,8 @@ msgstr ""
 " %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11059,7 +11572,8 @@ msgstr "Новости USENET"
 
 #: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
 msgid ""
@@ -11250,20 +11764,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Не удается подключиться к серверу POP %s (порт %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Сбой при подключении к серверу POP %s в защищенном режиме: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Не удается подключиться к серверу POP %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11272,28 +11791,28 @@ msgstr ""
 "Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
 "механизм идентификации."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' Ошибка регистрации на сервере POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не удается зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Сбой идентификации на сервере POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sВведите пароль POP для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11302,7 +11821,16 @@ msgstr ""
 "Не удается подключиться к серверу POP%s.\n"
 "Ошибка отправки пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Не удается подключиться к серверу POP%s.\n"
+"Ошибка отправки пароля: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
@@ -11413,7 +11941,8 @@ msgstr "Запрошенное почтовое действие выполне�
 
 #: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
-msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr ""
+"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
@@ -11433,7 +11962,8 @@ msgstr "Пользователь не локальный; установите <
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr ""
+"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11516,99 +12046,99 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Доставка SMTP почты через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Не удается отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Не удается отправить сообщение: неверный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Не удается отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Не удается отправить сообщение: указан один или  несколько некорректных "
 "получателей"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Аутентификация SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Ошибка при создании объекта аутентификации SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Неверный ответ от сервера при аутентификации.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> не удалось"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на 'DATA': %s: почта не отправлена"
@@ -11616,28 +12146,28 @@ msgstr "Превышено время ожидания ответа на 'DATA':
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Сбой команды IMAP: %s"
@@ -11701,100 +12231,6 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предполагать автоматическое отображение вложения"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не удается открыть файл"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Не удается получить сообщение из редактора"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Множество сообщений"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Открыть файл"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Создана автоматически"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Подпись:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Новое сообщение"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать управляющий элемент выбора адреса."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML.\n"
-"Убедитесь, что у вас установлены необходимые\n"
-"версии пакетов gtkhtml и libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Содержимое редактора не является простым текстом и не может "
-"корректироваться.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Назначение:"
@@ -11877,17 +12313,93 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не удается открыть файл"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не удается получить сообщение из редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Множество сообщений"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Открыть файл"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Создана автоматически"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Подпись:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Новое сообщение"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Пересланное сообщение - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Вложить оригинальное сообщение"
+msgstr[1] "Вложить оригинальное сообщение"
+msgstr[2] "Вложить оригинальное сообщение"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Содержимое редактора не является простым текстом и не может "
+"корректироваться.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Вложить файл в сообщение"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11905,54 +12417,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Не удается создать канал: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Непрочитанных сообщений"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Хотите сохранить изменения?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Не удалять"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Удалить"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Не удается сохранить файл подписи: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Ошибка сохранения ярлыков."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Внимание: Изменено сообщение"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11960,57 +12486,74 @@ msgid ""
 msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Отклонить изменения"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Сохранить сообщение ..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Не удается создать канал: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Не удается сохранить файл подписи: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Перед созданием нового письма необходимо настроить учетную запись."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Не удается создать канал: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать управляющий элемент выбора адреса."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать компонент редактора HTML.\n"
+"Убедитесь, что у вас установлены необходимые\n"
+"версии пакетов gtkhtml и libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12321,11 +12864,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Выбрать время для сравнения"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Правила фильтра"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12354,19 +12892,8 @@ msgstr "Необходимо указать имя файла."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Файл \"%s\" не существует или не является обычным файлом."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Удаление папки \"%s\""
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Необходимо указать папку."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12374,158 +12901,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Назначение"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Вы должны наименовать этот фильтр"
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Укажите имя этой виртуальной папки."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Не был выбран сервер"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Выберите файл"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>К:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Выбрать папку"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Правила фильтра"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Источники виртуальных папок"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Сравнивать с"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Входящие"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"12:00am указанной даты."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"времени запуска фильтра."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"текущего времени запуска фильтра."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "время относительно текущего"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "назад"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "месяцы"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "секунд"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "только указанные папки"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "текущее время"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "указанное вами время"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "со всеми активными удалёнными папками"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "со всеми локальными и активными удалёнными папками"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "со всеми локальными папками"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "годы"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важное"
 
@@ -12595,6 +13001,71 @@ msgstr "входящие"
 msgid "outgoing"
 msgstr "исходящие"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила фильтра"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Сравнивать с"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Входящие"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"12:00am указанной даты."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"времени запуска фильтра."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"текущего времени запуска фильтра."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "время относительно текущего"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "назад"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "месяцы"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "секунд"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "текущее время"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "указанное вами время"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "годы"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Добавить правило"
@@ -12607,60 +13078,72 @@ msgstr "Изменить правило"
 msgid "Rule name"
 msgstr "Имя правила"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Правила назначения весов"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Вес"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Настройка редактора"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Тело содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут настраиваются параметры почты, включая безопасность и отображение "
+"сообщений"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Тело не содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тело или тема содержат"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Настройте тут учётные записи почты"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Сообщение содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Почта Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "\"Получатели\" содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "\"Отправитель\" содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Компонент Evolution Mail"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Тема содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Тема не содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Виртуальные папки"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Добавить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Почта"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "Настройка почты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Почта:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12693,46 +13176,355 @@ msgstr "Добавить подпись"
 msgid "Signature(s)"
 msgstr "Подпись(и)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересланное сообщение --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "В сообщении от %d.%m.%Y %H:%M %%+05d, %%s пишет:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Правила фильтра"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Выбрать папку"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Назначить задачу"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Назначено"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Вложение"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Белиз"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Тело содержит"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Копировать в папку"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Получено"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Элемент отправлен!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Удалить"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "Файл \"%s\" не существует."
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Файл \"%s\" не существует."
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "Не удается запустить wombat"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Дата"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Имя начинается с"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "В_ыйти"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Текст"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Годен до"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "К исполнению"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Список"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "после"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "до"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Отмечено"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Список"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Отмечено"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Июнь"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Надпись"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "список рассылки %s"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Сообщение для отправки"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Сообщение для отправки"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Сообщения"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Пометить как _не спам"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Переместить в папку"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Выйти из программы"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Воспроизвести звук:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочитанное"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "\"Получатели\" содержит"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Получатели"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Запустить программу:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Вес"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Отправить"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Состояние"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Размер"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Книга-источник"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "только указанные папки"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Остановить загрузку"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Соединенные Штаты"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>К:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Создать _виртуальную папку результатов поиска..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Свойства шрифтов"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Свойства"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Имя папки"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Всего сообщений"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Всего сообщений"
+msgstr[1] "Всего сообщений"
+msgstr[2] "Всего сообщений"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Непрочитанных сообщений"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Непрочитанных сообщений"
+msgstr[1] "Непрочитанных сообщений"
+msgstr[2] "Непрочитанных сообщений"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12742,466 +13534,311 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Create New Folder"
 msgstr "Создание новой папки"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Создать новую папку"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копировать в папку"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Отменить задачу"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Копировать"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Создать новую папку"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Переименовать папку \"%s\" в:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Переименование папки"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Вид"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Копировать"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "Пере_местить"
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
 msgstr "Пе_реименовать"
 
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Свойства..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Входящие"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Почта"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Свойства"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Печать"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Ответить в с_писок"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Пе_реслать"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "К _исполнению..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "_Флаг \"Выполнено\""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "О_чистить флаг"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "По_метить как прочитанные"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Пометит_ь как непрочитанные"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Пометить как неважное"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Пометить как _спам"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Пометить как _не спам"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Надпись"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Добавить отправителя в _адресную книгу"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Применить _фильтры"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила фильтра"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Виртуальная папка по теме"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Виртуальная папка по получателю"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "По умолчанию"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "От"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Обратный адрес"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Кому"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Копия"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Скр.копия"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Тема"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "вложение %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Неподдерживаемый формат подписи"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Получение '%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Не подписано"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Подпись действительна"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Подпись недействительна"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Не зашифровано"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Зашифровано"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Часть external-body неверно сформирована"
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указатель на FTP сайт (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указатель на локальный файл (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указатель на удаленные данные (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Форматирование сообщения"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Почтовый клиент"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
 #, c-format
 msgid "Matches: %d"
 msgstr "Совпадения: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Не подписано"
+
+#: mail/em-format-html-display.c:641
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr ""
+"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Подпись действительна"
+
+#: mail/em-format-html-display.c:642
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13210,7 +13847,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Подпись недействительна"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13218,11 +13859,11 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13230,7 +13871,11 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Не зашифровано"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13239,61 +13884,196 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:651
 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:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Зашифровано"
+
+#: mail/em-format-html-display.c:652
 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:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
 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:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Этот сертификат нельзя просмотреть"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 #, fuzzy
 msgid "Overdue:"
 msgstr "Просроченные задачи:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Получение '%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Часть external-body неверно сформирована"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указатель на FTP сайт (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указатель на локальный файл (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указатель на удаленные данные (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Форматирование сообщения"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "От"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Обратный адрес"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Кому"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Копия"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Скр.копия"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Почтовый клиент"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "вложение %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Неподдерживаемый формат подписи"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
@@ -13407,7 +14187,7 @@ msgstr "Отправить сообщение в список..."
 msgid "_Add to Addressbook"
 msgstr "_Добавить в адресную книгу"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
@@ -13421,7 +14201,7 @@ msgstr "Этот сервер не поддерживает информацию
 msgid "Subscribed"
 msgstr "Подписан"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Папка"
 
@@ -13455,11 +14235,24 @@ msgid "Add address"
 msgstr "Добавить адрес"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Почта от %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Виртуальные папки"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Добавить"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Источник виртуальных папок"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Автоматическое распознавание гиперссылок"
@@ -13703,7 +14496,8 @@ msgstr ""
 "папке."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
@@ -13720,15 +14514,18 @@ msgstr "Предупреждать, если пользователь запол
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr ""
+"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
 #: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr ""
+"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
 #: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
@@ -13926,64 +14723,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Порт spamd"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Настройка редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут настраиваются параметры почты, включая безопасность и отображение "
-"сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Настройте тут учётные записи почты"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Почта Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Компонент Evolution Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Учётные записи"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Настройка почты"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Почта:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14045,34 +14811,6 @@ msgstr "Импорт"
 msgid "Importing mailbox"
 msgstr "Импорт файлов"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14238,80 +14976,93 @@ msgstr "список рассылки %s"
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "Удалённое"
+msgid_plural "%d deleted"
+msgstr[0] "Удалённое"
+msgstr[1] "Удалённое"
+msgstr[2] "Удалённое"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d дней"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d дней"
+msgstr[1] "%d дней"
+msgstr[2] "%d дней"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d секунд"
+msgid_plural "%d sent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
+msgstr[2] "%d секунд"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d секунд"
+msgid_plural "%d unsent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
+msgstr[2] "%d секунд"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
 #, fuzzy, c-format
 msgid "%d total"
-msgstr "%d контактов"
+msgid_plural "%d total"
+msgstr[0] "%d контактов"
+msgstr[1] "%d контактов"
+msgstr[2] "%d контактов"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая виртуальная папка"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Почтовые фильтры"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Создать новый календарь"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Проверка сервиса"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Подключение к серверу..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Подлинность"
@@ -14374,16 +15125,23 @@ msgstr ""
 "учетной записи в строке ниже. Это имя будет использовано только для "
 "отображения."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Проверка сервиса"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Подключение к серверу..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " Проверка поддерживаемых типов "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Предварительный просмотр"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14659,7 +15417,7 @@ msgstr "Не цитировать исходное сообщение"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не подписывать приглашения (для совместимости с Outlook)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
@@ -14990,7 +15748,8 @@ msgstr "Никогда не загружать изображения"
 
 #: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgstr ""
+"_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
 #: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
@@ -15025,6 +15784,118 @@ msgstr "цвет"
 msgid "description"
 msgstr "описание"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Источники виртуальных папок"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Принято"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Завершено"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Учитывать регистр"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Поиск в сообщении"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Поиск:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Пометить к исполнению"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Подписка на папки"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ничего не выбрано"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "С_ервер:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Сведения о безопасности"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
+"Выберите действие из меню \"Флаг\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Список учетных записей"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Срок до:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Флаг:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Подписаться"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Отказаться от подписки"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "только указанные папки"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "со всеми активными удалёнными папками"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "со всеми локальными и активными удалёнными папками"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "со всеми локальными папками"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15094,7 +15965,8 @@ msgstr ""
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
 #. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
@@ -15118,7 +15990,8 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
@@ -15232,14 +16105,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15341,8 +16206,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Не удается переместить папку: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15393,8 +16259,9 @@ msgstr "Не удается открыть \"%s\": %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "и одна другой контакт."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15414,8 +16281,11 @@ msgstr "Удалить выбранные контакты"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "Вы действительно хотите удалить эту учётную запись?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
@@ -15423,8 +16293,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Не удалять"
+msgstr "Восстановить"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15488,8 +16359,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Не удается удалить папку:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15531,13 +16405,44 @@ msgstr ""
 "    '%s'\n"
 "и была обновлена."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Удаление папки \"%s\""
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Необходимо указать папку."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Укажите имя этой виртуальной папки."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не был выбран сервер"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15545,16 +16450,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Перезаписать"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Отправить"
@@ -15718,7 +16623,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15727,45 +16632,21 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Учитывать регистр"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Поиск в сообщении"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Поиск:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Сведения о безопасности"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Отмена..."
@@ -15801,24 +16682,24 @@ msgstr "Обновление..."
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Операция отменена пользователем."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введите пароль для %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Ввод пароля"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Запомнить этот пароль"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль до завершения этого сеанса"
 
@@ -15875,15 +16756,15 @@ msgstr "Обновление виртуальных папок для uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Обновление виртуальных папок для uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Править виртуальную папку"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Новая виртуальная папка"
 
@@ -15947,7 +16828,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -16003,10 +16884,6 @@ msgstr "Переслать"
 msgid "No Response Necessary"
 msgstr "Можно не отвечать"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитанное"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Ответить"
@@ -16019,50 +16896,50 @@ msgstr "Ответить всем"
 msgid "Review"
 msgstr "Проверить"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Пометить к исполнению"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тело содержит"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Завершено"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тело не содержит"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
-"Выберите действие из меню \"Флаг\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тело или тема содержат"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Срок до:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Сообщение содержит"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Флаг:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "\"Получатели\" содержит"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Подписка на папки"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "\"Отправитель\" содержит"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ничего не выбрано"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Тема содержит"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "С_ервер:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Тема не содержит"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Подписаться"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Оболочка Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Отказаться от подписки"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16094,7 +16971,8 @@ msgstr ""
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
-msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr ""
+"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
@@ -16103,7 +16981,8 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
@@ -16126,31 +17005,18 @@ msgstr "Пропускать ли предупреждение о тестово
 msgid "mail"
 msgstr "почта"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Неизвестная ошибка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Недопустимые аргументы"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Не удается зарегистрировать в OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Активные соединения"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "База данных настроек не найдена"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Активные соединения"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Обычная ошибка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16329,30 +17195,6 @@ msgstr "Имя папки не может содержать символ \"#\".
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" и \"..\" -- зарезервированные имена папок."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
-"перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
-"для перехода в режим работы в сети."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Почта к %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
@@ -16370,112 +17212,94 @@ msgstr "Bug buddy не установлен."
 msgid "Bug buddy could not be run."
 msgstr "Не удается запустить Bug buddy."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Группа"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Флажок"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Создать"
-
-#: shell/evolution-test-component.c:140
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "New Test"
-msgstr "Новая задача"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
+"перехода в режим работы вне сети."
 
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "_Test"
-msgstr "Проверка"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Создать новый тестовый элемент"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Активные соединения"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Активные соединения"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
+"для перехода в режим работы в сети."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Почта к %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "К_алендарь:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Контакты: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Почта:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Задачи:"
+msgid "Uknown system error."
+msgstr "Неизвестная ошибка"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Тип папки:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Недопустимые аргументы"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Открыть папку другого пользователя"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Не удается зарегистрировать в OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Учетная запись:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "База данных настроек не найдена"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Имя _папки:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Обычная ошибка"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Пользователь:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Создать"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помощник по установке Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Импорт файлов"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Часовой пояс "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16489,7 +17313,7 @@ msgstr ""
 "\n"
 "Нажмите \"Далее\" для продолжения. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16501,22 +17325,24 @@ msgstr ""
 "\n"
 "Нажмите \"Применить\" для сохранения параметров. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Оболочка Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Новая задача"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Проверка"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Создать новый тестовый элемент"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+msgstr ""
+"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
 
 #: shell/importer/import.glade.h:2
 msgid "Evolution Import Assistant"
@@ -16574,7 +17400,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution может импортировать данные из следующих файлов:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16594,7 +17420,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16603,39 +17429,39 @@ msgstr ""
 "С благодарностью\n"
 "команда Ximian Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Не напоминать больше"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Запуск Evolution с активированием указанного компонента"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Запуск в режиме подключения к интернету"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Принудительное закрытие всех компонентов evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16710,6 +17536,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16940,7 +17788,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
@@ -16955,6 +17804,11 @@ msgstr "Ваши сертификаты"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Сертификат уже существует"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17159,11 +18013,6 @@ msgstr "Уникальный ID темы"
 msgid "Certificate Signature Value"
 msgstr "Значение подписи сертификата"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Сертификат уже существует"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Пароль файла PKCS12"
@@ -17194,7 +18043,8 @@ msgstr "Описание вложения."
 
 #: tools/evolution-launch-composer.c:328
 msgid "Mark attachment to be shown inline by default."
-msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr ""
+"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
 
 #: tools/evolution-launch-composer.c:329
 msgid "Default subject for the message."
@@ -17305,8 +18155,8 @@ msgstr "Просмотреть текущий контакт"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Действия"
@@ -17715,7 +18565,8 @@ msgid "Hide _Read Messages"
 msgstr "Скрыть п_рочитанные сообщения"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "Скрывать сообщения, помеченные как удаленные, вместо их перечеркивания"
 
 #: ui/evolution-mail-list.xml.h:9
@@ -17782,16 +18633,6 @@ msgstr "Обратить выделение"
 msgid "_Threaded Message List"
 msgstr "Показывать подшивки в списке сообщений"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Закрыть"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18198,6 +19039,16 @@ msgstr "С_ервис"
 msgid "_Undelete"
 msgstr "Восстановить"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Вложить"
@@ -18280,10 +19131,6 @@ msgstr "Сохранить текущий файл под другим имен�
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Отправить"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18855,9 +19702,10 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "Отправленные сообщения и черновики"
 
 #: widgets/misc/e-expander.c:181
@@ -19014,3 +19862,233 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Неверный ответ от сервера при идентификации."
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Календари, выбранные для публикации"
+
+#~ msgid "Login name:"
+#~ msgstr "Учетное имя:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Редактор списка контактов"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Сохранить список как VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Группа"
+
+#~ msgid "C_alendar"
+#~ msgstr "К_алендарь"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Параметры звукового сигнала"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Параметры сигнала-сообщения"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Параметры сигнала по почте"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Параметры программы-сигнала"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Параметры сигнала неизвестного типа"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Повторение сигнала"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Сообщение для отображения:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "С аргументами:"
+
+#~ msgid "Basics"
+#~ msgstr "Основы"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Дата/Время:"
+
+#~ msgid "Reminders"
+#~ msgstr "Напоминания"
+
+#~ msgid "_Options..."
+#~ msgstr "_Параметры..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Адресная книга..."
+
+#~ msgid "Reminder"
+#~ msgstr "Напоминание"
+
+#~ msgid "B_usy"
+#~ msgstr "Занят"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Ко_нфиденциальное"
+
+#~ msgid "Date & Time"
+#~ msgstr "Дата и время"
+
+#~ msgid "F_ree"
+#~ msgstr "Свободен"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Личное"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Общее"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Участник"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Добавить отправителя в _адресную книгу"
+
+#~ msgid "Preview"
+#~ msgstr "Предварительный просмотр"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило повторения"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Другое повторение"
+
+#~ msgid "_Modify"
+#~ msgstr "Изменить"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Без повторения"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Простое повторение"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Выполнено"
+
+#~ msgid "Progress"
+#~ msgstr "Продвижение"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Кон_фиденциально"
+
+#~ msgid "Folder:"
+#~ msgstr "Папка:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Начинается:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Заканчивается:</b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Выполнено:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>К:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Нет</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "В системе CORBA произошла ошибка\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Объект не может быть найден!\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "У вас нет соответствующих прав для обновления календаря\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Статус участника не может быть обновлён!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Добавить отправителя в _адресную книгу"
+
+#~ msgid "_Options"
+#~ msgstr "Параметры"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Время _начала собрания:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Время _завершения собрания:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ошибка открытия %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Не удается создать папку: %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Созда_ть правило из сообщения"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Не удается заблокировать папку %s: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Не удается создать окно редактора:\n"
+#~ "Не удается активировать компонент редактора HTML."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Правила назначения весов"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "В сообщении от %d.%m.%Y %H:%M %%+05d, %%s пишет:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Имя папки"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Свойства..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Флажок"
+
+#~ msgid "C_alendar:"
+#~ msgstr "К_алендарь:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Контакты: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Почта:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Задачи:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Тип папки:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Открыть папку другого пользователя"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Имя _папки:"
+
+#~ msgid "_User:"
+#~ msgstr "_Пользователь:"
diff --git a/po/sk.po b/po/sk.po
index 6fe1335ec0..a250446ccc 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\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"
@@ -26,16 +26,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Adresár Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakty: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Okno Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -61,35 +51,256 @@ msgstr "karty"
 msgid " card"
 msgstr "1 karta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakty: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Okno Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kurzor nie je možné načítať\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Server odpovedal nepodporovanými databázami hľadania"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Tento server nepodporuje informácie schém LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nie je možné získať skupinu: %s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Server neodpovedal platnou informáciou o schéme"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nie je možné načítať %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Editor kategórií nie je k dispozícii."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Uložiť do adresára"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Chyba pri načítavaní štandardného adresára"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Chyba počas hľadania"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Chcete uložiť zmeny?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Zahodiť"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "a jedna iná karta."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Nie je možné získať správu z editora"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Chyba pri pridávaní karty"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Prehliadač adries adresára Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nie je možné načítať %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 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.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Používam server LDAP anonymne"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Nepodarilo sa prihlásiť.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Priečinky automatického dopĺňania"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sZadajte heslo pre %s (používateľ %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikátu:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nastavenie emailových účtov"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Adresár Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Okno adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Prehliadač adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Prehliadač kariet adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponent Adresár Evolution"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+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:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -124,7 +335,7 @@ msgstr "Nový kontakt:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakty:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -149,15 +360,15 @@ msgid "Migrating `%s':"
 msgstr "Prehľadávam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -166,22 +377,22 @@ msgid "Personal"
 msgstr "Osobný"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Priečinky automatického dopĺňania"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -189,58 +400,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adresár"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakty"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Používam server LDAP anonymne"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Nepodarilo sa prihlásiť.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sZadajte heslo pre %s (používateľ %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -260,63 +480,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Priečinky automatického dopĺňania"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikátu:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Nastavenie emailových účtov"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Adresár Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Okno adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Prehliadač adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Prehliadač kariet adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Komponent Adresár Evolution"
-
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-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:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -324,7 +487,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -333,8 +496,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -360,6 +522,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Overenie"
@@ -409,13 +572,11 @@ msgid "Anonymously"
 msgstr "Anonymne"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základné"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaily"
 
@@ -671,34 +832,26 @@ msgid "cards"
 msgstr "karty"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minút"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Vyberte kontakty z adresára"
+#: 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:208
+msgid "Remove All"
+msgstr "Odstrániť všetky"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Odstrániť"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Odstrániť všetky"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Zobraziť zoznam kontaktov"
@@ -713,7 +866,7 @@ msgid "Send HTML Mail?"
 msgstr "Poslať poštu HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Pridať do kontaktov"
 
@@ -721,15 +874,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Zdroj"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Vyberte kontakty z adresára"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -756,6 +917,11 @@ msgstr "_Kategória:"
 msgid "_Find"
 msgstr "Nájsť"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Nájsť"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -802,9 +968,8 @@ msgid "<b>Work</b>"
 msgstr "Pracovný týždeň"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -829,7 +994,6 @@ msgid "Birthday:"
 msgstr "Dátum na_rodenia:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Kalen_dár:"
@@ -845,15 +1009,15 @@ msgid "Company:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -963,8 +1127,8 @@ msgstr "Adresa _WWW stránky:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -986,42 +1150,28 @@ msgid "_File under:"
 msgstr "Meno súboru:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Naozaj chcete odstrániť\n"
-"tieto kontakty?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Naozaj chcete odstrániť tento kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Upraviteľný"
 
@@ -2000,141 +2150,133 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Poslať správu"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Zoznam bez mena"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Skupina"
+msgid "Service"
+msgstr "Služba pripravená"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Umiestnenie:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Po_užívateľ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Iné"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Skupina"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Zdroj"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Zmenené"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Dátum opakovania je neplatný"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Neplatný účel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Zahodiť"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Poslať správu"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Služba pripravená"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Umiestnenie:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Po_užívateľ:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
@@ -2152,6 +2294,20 @@ msgstr "_Celé meno:"
 msgid "E-_mail:"
 msgstr "E_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Naozaj chcete odstrániť\n"
+"tieto kontakty?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Naozaj chcete odstrániť tento kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2278,48 +2434,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Vyberte kontakty z adresára"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Členovia"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Odstráni vybrané položky zo zoznamu príloh"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Výbrané"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skryť adresy pri posielaní e-mailu do tohto zoznamu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Meno _zoznamu:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Za_dajte emailovú adresu, alebo do zoznamu pretiahnite kontakt myšou:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "editor-zoznamu-kontaktov"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Kniha"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Je nový zoznam"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Vyžadovaní účastníci"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Uložiť zoznam ako VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Zmenený kontakt:"
@@ -2358,11 +2535,414 @@ msgstr ""
 "existuje. Chcete ho aj tak pridať?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Zobraziť kontakty"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakty"
+msgstr[1] "Kontakty"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Dotaz"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Chyba pri vytváraní pohľadu na adresár"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Model"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Chyba pri zmene karty"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Meno začína na"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "E-mail končí na"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategória je"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Ľubovoľné pole obsahuje"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Pokročilé..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Typ"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Adresár"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Uložiť ako VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Nový kontakt..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Nový zoznam kontaktov..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Prejsť do priečinku..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Importovať..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Hľadať kontakty..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Zdroje adresára..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Nastavenie pilota..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Predať ďalej kontakt"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Poslať správu kontaktu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Tlačiť"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Tlačiť obálku"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Adresár..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Adresár..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Vystrihnúť"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopírovať"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Vložiť"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Aktuálny pohľad"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Ľubovoľná kategória"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Asistent"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Asistentov telefón"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Pracovný fax"
+
+#: 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:5
+msgid "Business Phone 2"
+msgstr "Telefón do zamestnania 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Spätné volanie"
+
+#: 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:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+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:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: 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
+#, fuzzy
+msgid "Given Name"
+msgstr "Meno poľa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Domáci fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Telefón domov"
+
+#: 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:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefón"
+
+#: 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:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Prezývka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Poznámka"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Pracovisko"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizácia"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Ďalší fax"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Iný telefón"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pager"
+
+#: 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:32
+msgid "Radio"
+msgstr "Rádio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Titul"
+
+#: 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"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Šírka"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Výška"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Je aktívny"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Pole"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Meno poľa"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Model textu"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Maximálna dĺžka mena poľa"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Šírka stĺpca"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"V tomto pohľade nie je čo ukázať\n"
+"\n"
+"Dvojitým kliknutím vytvoríte nový kontakt."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"V tomto pohľade nie je čo ukázať."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Adaptér"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Výbrané"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Má kurzor"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2374,117 +2954,90 @@ msgid "map"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Členovia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizácia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Skupina"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Zamestnanie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Boloňa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobil"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Osobný"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Poznámka"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Domáci fax"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Úspech"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adresár neexistuje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nový zoznam kontaktov"
@@ -2492,74 +3045,74 @@ msgstr "Nový zoznam kontaktov"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karta nenájdená"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID karty už existuje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Zrušený"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Overenie zlyhalo"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Vyžadované overenie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Taká správa neexistuje"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Iná chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2568,7 +3121,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/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2577,7 +3130,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2588,7 +3141,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/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2597,7 +3150,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo server nefunguje."
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2609,7 +3162,7 @@ msgstr ""
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2620,48 +3173,48 @@ 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/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokončený úspešne."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2670,7 +3223,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:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2679,49 +3232,49 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Prepísať"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopírovať karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -2731,48 +3284,38 @@ msgstr "VKartapre %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(nič)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Primárny e-mail"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-mail 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Vyberte akciu"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Vytvoriť nový kontakt \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Otázka pre adresár..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Upraviť kontakt"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Zliať e-mailovú adresu"
 
@@ -2798,377 +3341,6 @@ msgstr "Uložiť kontakt ako VCard"
 msgid "Save in addressbook"
 msgstr "Uložiť do adresára"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Zobraziť kontakty"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Kontakty"
-msgstr[1] "Kontakty"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Dotaz"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Chyba pri vytváraní pohľadu na adresár"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Model"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Chyba pri zmene karty"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Meno začína na"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "E-mail končí na"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategória je"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Ľubovoľné pole obsahuje"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Pokročilé..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Typ"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Adresár"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Uložiť ako VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Nový kontakt..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Nový zoznam kontaktov..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Prejsť do priečinku..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Importovať..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Hľadať kontakty..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Zdroje adresára..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Nastavenie pilota..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Predať ďalej kontakt"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Poslať správu kontaktu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Tlačiť"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Tlačiť obálku"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Adresár..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Adresár..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Vystrihnúť"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopírovať"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Vložiť"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Aktuálny pohľad"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Ľubovoľná kategória"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Asistent"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Asistentov telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Pracovný fax"
-
-#: 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:5
-msgid "Business Phone 2"
-msgstr "Telefón do zamestnania 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Spätné volanie"
-
-#: 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:8
-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: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
-#, fuzzy
-msgid "Given Name"
-msgstr "Meno poľa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Domáci fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Telefón domov"
-
-#: 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:20
-#, fuzzy
-msgid "ISDN Phone"
-msgstr "Telefón"
-
-#: 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
-msgid "Nickname"
-msgstr "Prezývka"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Pracovisko"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Ďalší fax"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Iný telefón"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Pager"
-
-#: 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:32
-msgid "Radio"
-msgstr "Rádio"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: 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:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Titul"
-
-#: 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"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Šírka"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Výška"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Je aktívny"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Výbrané"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Má kurzor"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Pole"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Meno poľa"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model textu"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Maximálna dĺžka mena poľa"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"V tomto pohľade nie je čo ukázať\n"
-"\n"
-"Dvojitým kliknutím vytvoríte nový kontakt."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"V tomto pohľade nie je čo ukázať."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Adaptér"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Šírka stĺpca"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Karta"
@@ -3211,6 +3383,11 @@ msgstr "Import formátu VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Tlačiť obálku"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3222,11 +3399,6 @@ msgstr "Tlačiť vybrané kontakty"
 msgid "Print contact"
 msgstr "Tlačiť vybrané kontakty"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Tlačiť obálku"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bd. Tahoma"
@@ -3413,6 +3585,23 @@ msgstr "Zoznam _kontaktov"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nie je možné otvoriť správu"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nie je možné načítať %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nie je možné otvoriť adresár"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3470,23 +3659,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Interná chyba"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nie je možné otvoriť správu"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nie je možné načítať %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Nie je možné otvoriť adresár"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Chyba pri načítavaní štandardného adresára"
@@ -3503,40 +3675,366 @@ msgstr "Nezadané meno súboru."
 msgid "Unnamed List"
 msgstr "Zoznam bez mena"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Neodstraňovať"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Adresát:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Naozaj chcete odstrániť %d úloh?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Naozaj chcete odstrániť %d položiek denníka?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Naozaj chcete odstrániť %d schôdzok?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Schôdzka"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Chcete uložiť zmeny?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Zahodiť zmeny"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Poslať"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Databáza pre lokálny kalendár Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Zadajte heslo"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Rozdeliť viacdňové udalosti:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nie je možné spustiť server wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nie je možné spustiť wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nie je možné prečítať blok aplikácie Calendar pilota"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Štandardná priorita:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendár a úlohy"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendár a úlohy Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+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:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Kalendár Evolution/Editor úloh"
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Od:"
@@ -3631,10 +4129,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
@@ -3783,9 +4277,30 @@ msgstr ""
 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:50
+msgid "Summary contains"
+msgstr "Súhrn obsahuje"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentár obsahuje"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Nenájdené"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3809,8 +4324,8 @@ msgid "Purge events older than"
 msgstr "vráti menej než"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dní"
 
@@ -3821,7 +4336,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3871,68 +4386,56 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendár"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Celodenná Schôdzka"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "Kalen_dár:"
+msgid "Cale_ndar"
+msgstr "Kalendár"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový priečinok"
@@ -3963,27 +4466,6 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Súhrn obsahuje"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentár obsahuje"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Nenájdené"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Chyba pri otváraní kalendára"
@@ -4001,226 +4483,132 @@ msgstr "Prístup zamietnutý pri otváraní kalendára"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Zvukové alarmy"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Alarmy správami"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Možnosti e-mailového alarmu"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programové alarmy"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Neznáme alarmy"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Opakovanie alarmu"
+msgid "<b>Alarm</b>\t"
+msgstr "Informácie o kalendári"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Zobrazovanie správ"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Posielaná správa"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Prehrať zvuk:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Opakovať alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Spustiť program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Adresát:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "S týmito argumentami:"
+msgid "<b>Options</b>"
+msgstr "Popis:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Pripomenutia"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "extra oprakovanie každých"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmy"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "hodín"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Napísať správu"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Pridať"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Základné"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Dátum a čas:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Správy"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Prehrať zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Pripomenutie"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Spustiť program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Adresát:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Poslať e-mail"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Súhrn:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Úče_t:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Spustiť program:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Opakovať alarm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Možnosti..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pred"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dňa/í"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "koniec schôdzky"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "extra oprakovanie každých"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "hodín"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minút"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "začiatok schôdzky"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Musíte zadať meno súboru."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Nová Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Zoznam úloh"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Farby"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Vyberte farbu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Nová Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Pridať skupinu..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Aktualizovať"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Typ:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Pridať"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "týždňov"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmy"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4338,7 +4726,7 @@ msgid "Free/Busy Publishing"
 msgstr "Požiadavka na informácie o voľnom čase"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piatok"
@@ -4352,7 +4740,7 @@ msgid "Minutes"
 msgstr "Minúty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pondelok"
@@ -4362,7 +4750,7 @@ msgid "S_un"
 msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sobota"
@@ -4376,7 +4764,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedeľa"
@@ -4390,7 +4778,7 @@ msgid "T_hu"
 msgstr "Š_tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Štvrtok"
@@ -4404,7 +4792,7 @@ msgid "Time format:"
 msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorok"
@@ -4414,7 +4802,7 @@ msgid "W_eek starts:"
 msgstr "_Týždeň začína:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Streda"
@@ -4448,7 +4836,8 @@ msgstr "Z_hustiť víkendy v mesačnom pohľade"
 msgid "_Day begins:"
 msgstr "_Deň začína:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4498,6 +4887,80 @@ msgstr "_Str"
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Musíte zadať meno súboru."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Nová Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Farby"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Vyberte farbu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Nová Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Pridať skupinu..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Aktualizovať"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "týždňov"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Táto udalosť bola odstránená."
@@ -4542,80 +5005,74 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Chyba validácie: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "u do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Termín do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Termín do "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Uložiť ako..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Chyba validácie: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "u do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Termín do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Termín do "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4683,8 +5140,9 @@ 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"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresár..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakty"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4694,163 +5152,222 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Pripomenutie"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informácia"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Stretnutie"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Koncový dátum je pred dátumom začiatku."
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Dátum konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Čas začiatku je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Čas konca je neplatný"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "pred každou schôdzkou"
+msgstr[1] "pred každou schôdzkou"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "koniec schôdzky"
+msgstr[1] "koniec schôdzky"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "pred každou schôdzkou"
+msgstr[1] "pred každou schôdzkou"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Celodenná udalosť"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "pred každou schôdzkou"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Zaneprázdnený"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "pred každou schôdzkou"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegórie..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "pred každou schôdzkou"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Informácie o kalendári"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikácia"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Dátum a čas"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Tajný"
+msgid "A_ll day event"
+msgstr "_Celodenná udalosť"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Dátum a čas:"
+msgid "C_ustomize..."
+msgstr "Uložiť vlastný pohľad..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Voľné"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegórie..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Umiestnenie:"
+msgid "Cale_ndar:"
+msgstr "Kalen_dár:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Súkromné"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikácia"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Verejné"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Tajný"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Zobraziť čas ako"
+msgid "L_ocation:"
+msgstr "Umiestnenie:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Súkromný"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Verejný"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Zobraziť čas ako"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "_Súhrn:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmy"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Popis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Čas _konca:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Čas _začiatku:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Žiadna"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Vybraný organizér už nemá účet."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Organizátor je vyžadovaný."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Odstrániť"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4890,36 +5407,45 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Účastník"
+msgid "<b>Attendees</b>"
+msgstr "<b>Začína:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Pridať odosielateľa do _adresára"
+msgid "<b>Organizer</b>"
+msgstr "<b>Termín:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Zmeniť organizátora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizátor:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakty"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Zmeniť organizátora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizátor:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -4996,152 +5522,144 @@ msgstr "Tento a budúce výskyty"
 msgid "All Instances"
 msgstr "Všetky výskyty"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Táto schôdzka obsahuje opakovanie, ktoré Evolution nedokáže upraviť."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Dátum opakovania je neplatný"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "zapnutá"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "prvý"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekundy"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "tretí"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "štvrtý"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "posledný"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Iný dátum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "deň"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "výskytov"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Dátum a čas:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Každých"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Výnimky"
+msgid "<b>Exceptions</b>"
+msgstr "Popis:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Náhľad:"
+msgid "<b>Preview</b>"
+msgstr "Ukážka"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Pravidlo opakovania"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Vlastné opakovanie"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Upraviť"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Neopakovať"
+msgid "<b>Recurrence</b>"
+msgstr "Opakovanie"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Odstrániť"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Každých"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Jednoduché opakovanie"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "počas"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "navždy"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesiaca/ov"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "pokým"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "týždňov"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Odstrániť tento priečinok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Zobrazené správy:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% hotových"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Zobrazené správy:"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Dokončený"
 
@@ -5153,8 +5671,8 @@ msgstr "Vysoká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Prebieha"
@@ -5166,23 +5684,22 @@ msgid "Low"
 msgstr "Nízka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normálny"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nezačal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Prebieha"
+msgid "P_ercent complete:"
+msgstr "Dokončených percent: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5207,37 +5724,42 @@ msgstr "_Stav:"
 msgid "_Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Úloha"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie je možné otvoriť adresár"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Tajné"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Zobrazené správy:"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Zobrazené správy:"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Popis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_Priečinok:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5248,60 +5770,58 @@ msgstr "_Počiatočný dátum:"
 msgid "_Due date:"
 msgstr "_Termín:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Neplatná odpoveď na overenie od serveru."
+msgid "_Group:"
+msgstr "Skupina"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Informácie o kalendári"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Deň"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Informácie o voľnom čase"
+msgid "<b>Publishing _Location</b>"
+msgstr "Požiadavka na informácie o voľnom čase"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Požiadavka na informácie o voľnom čase"
+msgid "Free/Busy Editor"
+msgstr "Informácie o voľnom čase"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Meno _zoznamu:"
+msgid "_Daily"
+msgstr "Deň"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Heslo"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Heslo"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Uložiť toto heslo"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Po_užívateľ:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Týždeň"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5383,7 +5903,7 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknutím pridáte úlohu"
@@ -5392,6 +5912,11 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Untitled"
 msgstr "Bez mena"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Súhrn:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5405,7 +5930,7 @@ msgstr "_Termín:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stav:"
 
@@ -5419,20 +5944,93 @@ msgstr "_Priorita:"
 msgid "Web Page:"
 msgstr "Adresa _WWW stránky:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Verejný"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Dátum konca"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Súkromný"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Dátum štartu"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Tajný"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Súhrn"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Voľný"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zaneprázdnený"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geografické miesto musí byť zadané vo formáte:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Áno"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nie"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Neznámy"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Opakovanie"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Priradené"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5478,96 +6076,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Voľný"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zaneprázdnený"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvoriť"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Otvoriť správu"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Tlačiť..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Vložiť"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Priradiť úlohu"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "Poslať ďalej ako i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Označiť ako dokončenú"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označiť úlohy ako dokončené"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Odstrániť"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "O_dstrániť vybrané úlohy"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Uložiť ako..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknutím pridáte úlohu"
 
@@ -5576,181 +6180,112 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "% Complete"
 msgstr "% hotových"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Hotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Dátum dokončenia"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Termín"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Priorita"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Dátum štartu"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Súhrn"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Triedenie úloh"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Presúvam správy"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopírujem správy"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vybrať _vlákno"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Odstrániť..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopírovať do priečinku..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Nas_tavenie..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Dátum konca"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Dátum štartu"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Neznámy"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Opakovanie"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Priradené"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Áno"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nie"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "V"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografické miesto musí byť zadané vo formáte:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5774,36 +6309,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "dopoludnia"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "popoludní"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i rozdelení minúty"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "dopoludnia"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "popoludní"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5870,344 +6405,323 @@ msgid ", ending on "
 msgstr ", končiace na "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Začína:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Končí:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Stav"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Dokončený:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Termín:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Termín do "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 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:918
-msgid "<i>None</i>"
-msgstr "<i>Žiadna</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 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:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Nastala chyba v systéme CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objekt sa nepodarilo nájsť\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Stav účastníka nie je možné aktualizovať!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
@@ -6236,6 +6750,10 @@ msgstr "Načítavam kalendár"
 msgid "Loading calendar..."
 msgstr "Načítavam kalendár..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizátor:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Správa serveru:"
@@ -6252,11 +6770,6 @@ msgstr "dátum začiatku"
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Vyžadovaní účastníci"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
@@ -6324,6 +6837,28 @@ msgstr "Delegované"
 msgid "In Process"
 msgstr "Prebieha"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
@@ -6332,98 +6867,64 @@ msgstr "Mimo kancelárie"
 msgid "No Information"
 msgstr "Žiadna informácia"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Pridať odosielateľa do _adresára"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Nastavenie"
+msgid "O_ptions"
+msgstr "Nastavenie"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Ukázať z_menšené"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Autovýber"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Všetky osoby a zdroje"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Vyžadované osoby"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "_Začiatok stretnutia:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "_Koniec stretnutia:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6432,120 +6933,53 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Otváram úlohy na %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Chyba pre %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Otváram úlohy na %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Úlohy"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Aktualizujem objekty"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Žiadne schôdzky."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvoriť v %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendár a úlohy"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendár a úlohy Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-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:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Kalendár Evolution/Editor úloh"
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendár"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "Ú_lohy"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -6885,10 +7319,6 @@ msgstr "Vybraný mesiac (%b - %Y)"
 msgid "Selected year (%Y)"
 msgstr "Vybraný rok (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Úloha"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6919,7 +7349,7 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -6948,7 +7378,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Žiadne úlohy"
 msgstr[1] "Žiadne úlohy"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6969,35 +7399,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Vytvorí novú úlohu"
@@ -8676,69 +9100,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Prijatý neplatný tok správy %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Synchronizujem priečinky"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Chyba pri spracovávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Chyba pri vykonávaní filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nie je možné otvoriť priečinok fronty"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Získavam správu %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Nie je možné otvoriť správu"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Zlyhala správa %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Synchronizujem priečinok"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Získavam správu %d z %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Zlyhanie na správe %d z %d"
@@ -8760,43 +9184,6 @@ msgstr "Neplatné argumenty pre (používateľské značky)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodporovaná operácia: pridať správu: pre %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Presúvam správy"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopírujem správy"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Získavam %d správ"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8842,7 +9229,44 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodporovaná operácia: pridať správu: pre %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Presúvam správy"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopírujem správy"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Získavam %d správ"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8853,15 +9277,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepodarilo sa spracovať radu gpg userid."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepodarilo sa spracovať požiadavku na heslo gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8870,28 +9294,28 @@ msgstr ""
 "Musíte zadať heslo pre odomkntie kľúča\n"
 "pre používateľa: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8902,85 +9326,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepodarilo sa použiť GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, 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:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nepodarilo sa spustiť gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Nepodarilo sa spustiť gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, 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:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Vytvoriť index obsahu správ"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nie je možné získať správu z editora"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Nie je možné vytvoriť súbor so zámkom pre %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Vypršal čas pri pokuse o získanie zámku na %s. Skúste to neskôr."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Nepodarilo sa získať zámok pomocou fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Nepodarilo sa získať zámok pomocou flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9001,6 +9405,26 @@ msgstr "Nepodarilo sa zamknúť '%s': chyba protokolu s lock-helper"
 msgid "Could not lock '%s'"
 msgstr "Nepodarilo sa zamknúť '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Nie je možné vytvoriť súbor so zámkom pre %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Vypršal čas pri pokuse o získanie zámku na %s. Skúste to neskôr."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Nepodarilo sa získať zámok pomocou fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Nepodarilo sa získať zámok pomocou flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9253,7 +9677,7 @@ msgstr "Poverenie, na ktoré sa odkazujete, vypršalo."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -9336,55 +9760,55 @@ msgstr "Prihlásenie POP pred SMTP nie pomocou zdroja POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Preklad regulárneho výrazu zlyhal: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' vyžaduje komponentu používateľského mena"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' vyžaduje komponentu hostiteľa"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' vyžaduje komponentu cesty"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Zisťujem adresu: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Zlyhalo hľadanie mena: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Zlyhalo hľadanie hostiteľa: nie je možné vytvoriť vlákno: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: hostiteľ nenájdený"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: %s: neznámy dôvod"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Zisťujem adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Zlyhalo hľadanie hostiteľa: hostiteľ nenájdený"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Zlyhalo hľadanie hostiteľa: neznámy dôvod"
 
@@ -9460,7 +9884,7 @@ msgstr "ID _certifikátu:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
@@ -9556,7 +9980,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Upraviť podpis"
 
 #: camel/camel-smime-context.c:651
@@ -9571,49 +9995,48 @@ msgstr "IMAP príkaz zlyhal: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Nepodarilo sa nájsť certifikát pre \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nepodarilo sa nájsť obvyklý bulk algoritmus."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Vytvoriť pra_vidlo zo správy"
+msgid "Cannot create CMS Message"
+msgstr "Nie je možné otvoriť správu"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Nie je možné otvoriť správu"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Nie je možné priložiť súbor %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Nie je možné priložiť súbor %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Nie je možné otvoriť správu"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9660,7 +10083,8 @@ msgstr "Nie je možné získať priečinok: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
@@ -9669,8 +10093,8 @@ msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 msgid "Trash"
 msgstr "Odpadky"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jún"
@@ -9791,7 +10215,7 @@ msgstr "Použitie kľúča nepodporuje podpis certifikátu"
 msgid "Error in application verification"
 msgstr "Chyba pri použití overenia"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9804,11 +10228,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "ZLE"
 
@@ -9832,7 +10256,7 @@ msgstr ""
 "Chcete ho aj tak akceptovať?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9847,7 +10271,7 @@ msgstr ""
 "\n"
 "Chcete ho akceptovať?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9856,7 +10280,7 @@ msgstr ""
 "Problém certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9865,7 +10289,7 @@ msgstr ""
 "Neplatná doména certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9874,7 +10298,7 @@ msgstr ""
 "Platnosť certifikátu vypršala: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9883,7 +10307,7 @@ msgstr ""
 "Vypršala platnosť zoznamu zrušených certifikátov: %s\n"
 "Vydal: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
@@ -9908,7 +10332,7 @@ msgstr ""
 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:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
@@ -9929,8 +10353,8 @@ msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Kontrolujem novú poštu vo všetkých priečinkoch"
 
@@ -9964,8 +10388,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9985,323 +10409,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Hustý opar"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Server neočakávane zrušil spojenie: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Priečinky"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Zobraziť iba prihlásené priečinky"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Predefinovať mená priečinkov zo serveru"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Priestor mien"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Služba IMAP pre %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nie je možné spojenie s %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS nie je k dispozícii"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Spojenie zrušené"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Neznáma chyba"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nepodarilo sa pripojiť k POP serveru %s. Požadovaný spôsob overenia nie je "
-"podporovaný."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Meno priečinku \"%s\" nie je platné, pretože obsahuje znak \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Firma"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Nie je možné získať priečinok: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Žiadne úlohy"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Server neočakávane zrušil spojenie: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Neznáma chyba"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10370,7 +10499,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10445,6 +10574,27 @@ msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 msgid "Command:"
 msgstr "Firma"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Priečinky"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Zobraziť iba prihlásené priečinky"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Predefinovať mená priečinkov zo serveru"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Priestor mien"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10468,43 +10618,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Služba IMAP pre %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nie je možné spojenie s %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS nie je k dispozícii"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Spojenie zrušené"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Rozšírenie SSL/TLS nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Zlyhala dohoda SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10515,30 +10715,281 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Meno priečinku \"%s\" nie je platné, pretože obsahuje znak \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámy rodičovský priečinok: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Server neočakávane zrušil spojenie: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru %s. Požadovaný spôsob overenia nie je "
+"podporovaný."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Firma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Žiadne úlohy"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server neočakávane zrušil spojenie: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10706,18 +11157,26 @@ msgstr "Nie je možné uložiť súhrn: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Nie je možné pridať správu do súhrnu: neznámy dôvod"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Pridanie správy maildir zrušené"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinku maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10733,48 +11192,48 @@ msgstr ""
 "Nie je možné získať správu: %s z priečinku %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Priečinok `%s' neexistuje."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' nie je priečinok maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nie je možné odstrániť priečinok `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11370,20 +11829,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nepodarilo sa pripojiť k POP serveru %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nepodarilo sa pripojiť k POP serveru %s v zabezpečenom režime:%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nie je možné sa spojiť s POP serverom %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11392,28 +11856,28 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru %s. Požadovaný spôsob overenia nie je "
 "podporovaný."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prihlásenie zlyhalo pre POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Nepodarilo sa prihlásiť na POP server %s: chyba protokolu SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sProsím, zadajte POP heslo pre %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11422,7 +11886,16 @@ msgstr ""
 "Nepodarilo sa pripojiť k POP serveru %s.\n"
 "Chyba pri posielaní hesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru %s.\n"
+"Chyba pri posielaní hesla: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
@@ -11635,97 +12108,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Doručenie pošty SMTP pomocou %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Posielam správu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Nie je možné poslať správu: adresáti nie sú definovaní."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Nie je možné poslať správu: adresáti nie sú platní"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Prihlásenie SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Chyba pri vytváraní overovacieho objektu SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Neplatná odpoveď na overenie od serveru.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Vypršal čas odpovede MAIL FROM: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Vypršal čas odpovede RCPT TO: %s: pošta neodoslaná"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> zlyhal"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
@@ -11733,28 +12206,28 @@ msgstr "Vypršal čas posielania DATA: %s: pošta neodoslaná"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP príkaz zlyhal: %s"
@@ -11818,101 +12291,6 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Vždy podpisovať správy pri použití tohto účtu"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "_Vždy podpisovať správy pri použití tohto účtu"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nie je možné otvoriť správu"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Nie je možné získať správu z editora"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Správa bez mena)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otvoriť súbor"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automaticky generované"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Napísať správu"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
-"Nepodarilo sa aktivovať komponent HTML editor.\n"
-"Overte, že máte nainštalovanú správnu verziu\n"
-"gtkhtml a libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
-"Nepodarilo sa aktivovať komponent HTML editor."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cieľ posielania"
@@ -11995,17 +12373,92 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Vždy podpisovať správy pri použití tohto účtu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Vždy podpisovať správy pri použití tohto účtu"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nie je možné otvoriť správu"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nie je možné získať správu z editora"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Správa bez mena)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvoriť súbor"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automaticky generované"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Napísať správu"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Predaná správa - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Priložiť pôvodnú správu"
+msgstr[1] "Priložiť pôvodnú správu"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Priloží súbor k správe"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12023,54 +12476,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nie je možné vytvoriť rúru: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Nasledujúca _neprečítaná správa"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Chcete uložiť zmeny?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Neimportovať"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Odstrániť"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Chyba pri ukladaní skratiek."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Varovanie: Zmenená správa"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12078,57 +12545,74 @@ msgid ""
 msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zahodiť zmeny"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Uložiť správu ako..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nie je možné vytvoriť rúru: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nie je možné vytvoriť rúru: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať komponent HTML editor.\n"
+"Overte, že máte nainštalovanú správnu verziu\n"
+"gtkhtml a libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12430,11 +12914,6 @@ msgstr "%d.%b.%Y"
 msgid "Select a time to compare against"
 msgstr "Vyberte čas, s ktorým sa má porovnávať"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Pravidlá filtra"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12463,19 +12942,8 @@ msgstr "Musíte zadať meno súboru."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Odstraňujem priečinok %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Musíte zadať meno priečinku."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12483,160 +12951,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Priradenie"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Musíte tento filter pomenovať."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Musíte tento vpriečinok pomenovať."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nebol vybraný žiadny server"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Vyberte súbor"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Termín:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Vybrať priečinok"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Pravidlá filtra"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Zdroje vpriečinkov"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Porovnať s"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Prijatá"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s dátumom o 12:00, ktorý tu uvediete."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s časom relatívnym k okamžiku, keď bol\n"
-"filter spustený."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Dátum správy bude porovnaný\n"
-"s aktuálnym časom filtrovania."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "čas relatívny k aktuálnemu času"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "späť"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mesiacov"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekúnd"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "iba špecifické priečinky"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "aktuálny tento"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "zadaný čas"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "pre všetky aktívne vzdialené priečinky"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "pre všetky lokálne priečinky"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "rokov"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Dôležité"
 
@@ -12706,6 +13051,72 @@ msgstr "prijatá"
 msgid "outgoing"
 msgstr "odoslaná"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Pravidlá filtra"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Porovnať s"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Prijatá"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s dátumom o 12:00, ktorý tu uvediete."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s časom relatívnym k okamžiku, keď bol\n"
+"filter spustený."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Dátum správy bude porovnaný\n"
+"s aktuálnym časom filtrovania."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "čas relatívny k aktuálnemu času"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "späť"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mesiacov"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekúnd"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "aktuálny tento"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "zadaný čas"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "rokov"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
@@ -12718,60 +13129,70 @@ msgstr "Upraviť pravidlo"
 msgid "Rule name"
 msgstr "Meno pravidla"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Pravidlá skóre"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skóre"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Nastavenie editora správ"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Telo obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Nastavenie pošty vrátane zabezpečenia a zobrazovania správ"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Telo neobsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Nastavenie kontroly pravopisu, podpisov a editora správ"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Telo alebo predmet obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Nastavenie emailových účtov"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Správa obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Pošta Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Adresát obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvok pre nastavenie poštových účtov Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Odosielateľ obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Poštový komponent Evolution"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Predmet obsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Editor správ Evolution"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Predmet neobsahuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtuálne priečinky"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Pridať"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pošta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Zdroj vPriečinku"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Nastavenie pošty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12804,51 +13225,313 @@ msgstr "_Pridať podpis"
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Predaná správa"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Pravidlá filtra"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Vybrať priečinok"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Upraviť skóre"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Priradiť farbu"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Priradiť skóre"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Prílohy"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Pípnuť"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "obsahuje"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopírovať do priečinku"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Dátum prijatia"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Dátum odoslania"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Odstránené"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "neobsahuje"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "nekončí na"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "neexistuje"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "nevrátiť"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "nevyzerá ako"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "nezačína na"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Neexistuje"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Návrh"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "končí na"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Existuje"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "existuje"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Výraz"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Follow Up"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "je po"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "bolo pred"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označený"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "je viac než"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "je menej než"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nie je"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nie je označený"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Jún"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Popis"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Konferencia"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Telo správy"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Hlavička správy"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Správy"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Označiť ako _dôležitú"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Presunúť do priečinku"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Ukončí program"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Zahrať zvuk"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Prečítaná"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Adresáti"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regul. výraz"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Odpovedaná"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "vráti"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "vráti viac než"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "vráti menej než"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Spustiť program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skóre"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Odosielateľ"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Nastaviť stav"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Veľkosť (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "vyzerá ako"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Zdrojový účet"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Špecifická hlavička"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "začína na"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Zastaviť spracovanie"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Predmet"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Zrušiť nastavenie stavu"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
 #, 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:"
+msgid "<b>Then</b>"
+msgstr "<b>Termín:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok z hľadania..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Vlastnosti písma"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Vlastnosti"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "_Meno priečinku:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Správa pomocníka"
+msgstr[1] "Správa pomocníka"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Správa pomocníka"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Nasledujúca _neprečítaná správa"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nasledujúca _neprečítaná správa"
+msgstr[1] "Nasledujúca _neprečítaná správa"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12858,415 +13541,432 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Create New Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VPriečinky"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Načítavam..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Presunúť"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Zrušiť úlohu"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopírovať"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Premenovať priečinok"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Pohľad"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Otvoriť v novom okne"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopírovať..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Presunúť..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Nový _priečinok..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Premenovať"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Vlastnosti..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VPriečinky"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Načítavam..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Premenovať..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pošta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Odpoveď..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Vyčistiť _značku"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Označiť ako _prečítanú"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Popis"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Použiť filtre"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Pravidlá filtra"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Štandard"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Odpovedá:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Reply-To"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Priradené"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Komu"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Upraviť podpis"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Predmet"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Upraviť podpis"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dátum"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s príloha"
+#: mail/em-format-html-display.c:644
+#, 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.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, 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 "Unencrypted"
+msgstr "Prerušené"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-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-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodporovaná schéma"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Nepodarilo sa overiť listový podpis"
+msgid "Encrypted"
+msgstr "Šifrovanie PGP"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Nepodarilo sa overiť listový podpis"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Získavam správu %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Priradené"
+msgid "_View Certificate"
+msgstr "ID _certifikátu:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Upraviť podpis"
+msgid "This certificate is not viewable"
+msgstr "Certifikát ešte nie je platný"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Upraviť podpis"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Po termíne:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Prerušené"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Zobraziť v texte"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Šifrovanie PGP"
+msgid "_Hide"
+msgstr "Skryť"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stránka %d z %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Získavam správu %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13303,9 +14003,35 @@ msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
 msgid "Formatting message"
 msgstr "Presúvam správy"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Komu"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Poštový klient"
 
@@ -13319,106 +14045,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Odpovedá:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Dátum"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s príloha"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, 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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "ID _certifikátu:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Certifikát ešte nie je platný"
+#: mail/em-format.c:1279
+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-display.c:1007
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Po termíne:"
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%B %d, %Y, %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Nepodporovaná schéma"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Zobraziť v texte"
+msgid "Error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Skryť"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Stránka %d z %d"
+msgid "Unknown error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13538,7 +14205,7 @@ msgstr "Poslať _správu zoznamu..."
 msgid "_Add to Addressbook"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
@@ -13553,7 +14220,7 @@ msgstr "Tento server nepodporuje informácie schém LDAPv3"
 msgid "Subscribed"
 msgstr "Prihlásiť si"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -13590,11 +14257,24 @@ msgid "Add address"
 msgstr "Adresa"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pošta od %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtuálne priečinky"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Pridať"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Zdroj vPriečinku"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -14085,63 +14765,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Nastavenie editora správ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Nastavenie emailových účtov"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Pošta Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-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:8
-msgid "Evolution Mail component"
-msgstr "Poštový komponent Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import Elm pre Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Editor správ Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Import Netscape Mail pre Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import Outlook Express 4 pre Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvok nastavenia pošty Evolution"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Import z Pine pre Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštové účty"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Import formátu mbox pre Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Nastavenie pošty"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Pošta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14203,34 +14853,6 @@ msgstr "Importujem"
 msgid "Importing mailbox"
 msgstr "Importujem súbory"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import Elm pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Import Netscape Mail pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import Outlook Express 4 pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Import z Pine pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Import formátu mbox pre Evolution"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14394,80 +15016,86 @@ msgstr "%s konferencia"
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d vybraných"
+msgid_plural "%d deleted"
+msgstr[0] "%d vybraných"
+msgstr[1] "%d vybraných"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d neposlaných"
+msgid_plural "%d junk"
+msgstr[0] "%d neposlaných"
+msgstr[1] "%d neposlaných"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Koncepty"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Koncepty"
+msgstr[1] "Koncepty"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d poslaných"
+msgid_plural "%d sent"
+msgstr[0] "%d poslaných"
+msgstr[1] "%d poslaných"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d neposlaných"
+msgid_plural "%d unsent"
+msgstr[0] "%d neposlaných"
+msgstr[1] "%d neposlaných"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "celkovo %d"
+msgid_plural "%d total"
+msgstr[0] "celkovo %d"
+msgstr[1] "celkovo %d"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d neposlaných"
+msgid_plural ", %d unread"
+msgstr[0] "%d neposlaných"
+msgstr[1] "%d neposlaných"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nový vPriečinok"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poštové filtre"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Kontrolujem službu"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Pripájam sa na server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identita"
@@ -14529,16 +15157,24 @@ msgstr ""
 "Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
 "zobrazenie."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Kontrolujem službu"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Pripájam sa na server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Ukážka"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14815,7 +15451,7 @@ 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:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hotovo"
 
@@ -15177,6 +15813,119 @@ msgstr "farba"
 msgid "description"
 msgstr "popis"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Zdroje vpriečinkov"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Akceptované"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Dokončený"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Rozlišovať veľkosť písmen"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Nájsť v správe"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Hľadať:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Značka pre Follow Up"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Prihlásené priečinky"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Žiadne vybrané"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Informácia o účte"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Správy, ktoré ste označili ako nasledujúce, sú uvedené dole.\n"
+"Prosím, vyberte akciu follow up z menu \"Značka\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Poštové účty"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Termín:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Značka:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Prihlásiť si"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "O_dhlásiť"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "iba špecifické priečinky"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "pre všetky aktívne vzdialené priečinky"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "pre všetky lokálne a aktívne vzdialené priečinky"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "pre všetky lokálne priečinky"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15383,14 +16132,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15495,8 +16236,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Nie je možné presunúť priečinok: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15547,8 +16289,9 @@ msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "a jedna iná karta."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15577,8 +16320,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Neodstraňovať"
+msgstr "Obnoviť _zmazané"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15642,8 +16386,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Nie je možné odstrániť priečinok:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15685,13 +16432,44 @@ msgstr ""
 "    '%s'\n"
 "A boli aktualizované."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Odstraňujem priečinok %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Musíte zadať meno priečinku."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Musíte tento vpriečinok pomenovať."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nebol vybraný žiadny server"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15699,16 +16477,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prepísať"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15870,7 +16648,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15879,46 +16657,21 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Rozlišovať veľkosť písmen"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Nájsť v správe"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Hľadať:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Informácia o účte"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Ruším..."
@@ -15954,24 +16707,24 @@ msgstr "Obnovujem..."
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -16028,15 +16781,15 @@ msgstr "Aktualizujem vpriečinky pre uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
@@ -16100,7 +16853,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -16156,10 +16909,6 @@ msgstr "Poslať ďalej"
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Prečítaná"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odpovedať"
@@ -16172,50 +16921,51 @@ msgstr "Odpovedať všetkým"
 msgid "Review"
 msgstr "Revízia"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Značka pre Follow Up"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Telo obsahuje"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Dokončený"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Telo neobsahuje"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Správy, ktoré ste označili ako nasledujúce, sú uvedené dole.\n"
-"Prosím, vyberte akciu follow up z menu \"Značka\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Telo alebo predmet obsahuje"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Termín:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Správa obsahuje"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Značka:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Adresát obsahuje"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Prihlásené priečinky"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Odosielateľ obsahuje"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Žiadne vybrané"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Predmet obsahuje"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Predmet neobsahuje"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Prihlásiť si"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "O_dhlásiť"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Testovací komponent Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16285,31 +17035,18 @@ msgstr ""
 msgid "mail"
 msgstr "E-mail"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Neznáma chyba"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Neplatné argumenty"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Nie je možné zaregistrovať u OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktívne spojenia"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Konfiguračná databáza nenájdená"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktívne spojenia"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Všeobecná chyba"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16501,30 +17238,6 @@ msgstr "Meno priečinku nesmie obsahovať znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution prechádza do módu off-line."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pošta pre %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
@@ -16542,113 +17255,94 @@ msgstr "Priateľ v núdzi nie je nainštalovaný."
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Skupina"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Zaškrtávacie tlačidlo"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nová"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Nová úloha"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Test"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Vytvorí novú úlohu"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution prechádza do módu off-line."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktívne spojenia"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktívne spojenia"
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta pre %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "Kalen_dár:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontakty: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Pošta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "Ú_lohy:"
+msgid "Uknown system error."
+msgstr "Neznáma chyba"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Typ priečinku:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Neplatné argumenty"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Otvoriť priečinok iného používateľa"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Úče_t:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Meno priečinku:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Všeobecná chyba"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Používateľ:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nová"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Asistent pre nastavenie"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importujem súbory"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Časová zóna "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Vitajte"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16662,7 +17356,7 @@ msgstr ""
 "\n"
 "Stlačením \"Nasledujúci\" môžete spustiť toto nastavenie."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16674,19 +17368,20 @@ msgstr ""
 "\n"
 "Stlačením \"Použiť\" uložíte tieto nastavenia."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Nová úloha"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Testovací komponent Evolution"
+msgid "Create a new test item"
+msgstr "Vytvorí novú úlohu"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16752,7 +17447,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16787,7 +17482,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16796,39 +17491,39 @@ msgstr ""
 "Ďakujeme\n"
 "Tím Ximian Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynútiť ukončenie všetkých komponentov Evolution"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16903,6 +17598,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17170,6 +17887,12 @@ msgstr "ID _certifikátu:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID karty už existuje"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17400,12 +18123,6 @@ msgstr "Predmet je %s"
 msgid "Certificate Signature Value"
 msgstr "Zlyhanie podpisu certifikátu"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID karty už existuje"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17549,8 +18266,8 @@ msgstr "Zobraziť aktuálny kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "A_kcie"
@@ -18035,16 +18752,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:5
-msgid "Close this window"
-msgstr "Zavrie toto okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zavrieť"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18457,6 +19164,16 @@ msgstr "_Nástroje"
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zavrie toto okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Zavrieť"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
@@ -18539,10 +19256,6 @@ msgstr "Uloží aktuálny súbor pod iným menom"
 msgid "Save the message in a specified folder"
 msgstr "Uložiť správu do daného priečinku"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Poslať"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19126,7 +19839,7 @@ msgid "Evolution Query"
 msgstr "Súhrn Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19290,27 +20003,276 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Neplatná odpoveď na overenie od serveru."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Meno _zoznamu:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "editor-zoznamu-kontaktov"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Uložiť zoznam ako VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Skupina"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nie je možné spustiť wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Kalen_dár:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Zvukové alarmy"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Alarmy správami"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Možnosti e-mailového alarmu"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programové alarmy"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Neznáme alarmy"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Opakovanie alarmu"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Zobrazovanie správ"
+
+#~ msgid "Message to Send"
+#~ msgstr "Posielaná správa"
+
+#~ msgid "Play sound:"
+#~ msgstr "Prehrať zvuk:"
+
+#~ msgid "Run program:"
+#~ msgstr "Spustiť program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "S týmito argumentami:"
+
+#~ msgid "Basics"
+#~ msgstr "Základné"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Dátum a čas:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Pripomenutie"
+
+#~ msgid "_Options..."
+#~ msgstr "_Možnosti..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresár..."
+
+#~ msgid "Reminder"
+#~ msgstr "Pripomenutie"
+
+#~ msgid "B_usy"
+#~ msgstr "_Zaneprázdnený"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Tajný"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Dátum a čas:"
+
+#~ msgid "F_ree"
+#~ msgstr "_Voľné"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Súkromné"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Verejné"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Účastník"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Pridať odosielateľa do _adresára"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Výnimky"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Náhľad:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravidlo opakovania"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Vlastné opakovanie"
+
+#~ msgid "_Modify"
+#~ msgstr "_Upraviť"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Neopakovať"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Jednoduché opakovanie"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% hotových"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Prebieha"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Tajné"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_Priečinok:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Začína:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Končí:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Dokončený:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Termín:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Žiadna</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Nastala chyba v systéme CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objekt sa nepodarilo nájsť\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Nemáte práva pre aktualizáciu kalendára\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Stav účastníka nie je možné aktualizovať!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Pridať odosielateľa do _adresára"
+
+#~ msgid "_Options"
+#~ msgstr "_Nastavenie"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "_Začiatok stretnutia:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "_Koniec stretnutia:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Chyba pre %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nepodarilo sa nájsť certifikát pre \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Vytvoriť pra_vidlo zo správy"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+#~ "Nepodarilo sa aktivovať komponent HTML editor."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Pravidlá skóre"
+
+#, 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:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Meno priečinku:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Premenovať"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Vlastnosti..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Zaškrtávacie tlačidlo"
+
+#~ msgid "C_alendar:"
+#~ msgstr "Kalen_dár:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontakty: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Pošta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "Ú_lohy:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Typ priečinku:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Otvoriť priečinok iného používateľa"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Meno priečinku:"
+
+#~ msgid "_User:"
+#~ msgstr "_Používateľ:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Server odpovedal nepodporovanými databázami hľadania"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Tento server nepodporuje informácie schém LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Chyba pri načítavaní informácie zo schémy"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Server neodpovedal platnou informáciou o schéme"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "Zobraziť _podporované základy"
 
@@ -19382,9 +20344,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Webcam:"
 #~ msgstr "Strana"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Editor kategórií nie je k dispozícii."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19439,9 +20398,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr ""
 #~ "Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie o jej zrušení?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19458,45 +20414,15 @@ msgstr "%s (%d%% hotových)"
 #~ "Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať oznámenie o "
 #~ "jeho zrušení?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Naozaj chcete odstrániť úlohu `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Naozaj chcete odstrániť úlohu bez mena?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Naozaj chcete odstrániť %d schôdzok?"
-#~ msgstr[1] "Naozaj chcete odstrániť %d schôdzok?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Naozaj chcete odstrániť %d úloh?"
-#~ msgstr[1] "Naozaj chcete odstrániť %d úloh?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Naozaj chcete odstrániť %d položiek denníka?"
-#~ msgstr[1] "Naozaj chcete odstrániť %d položiek denníka?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Pozvať ostatných..."
 
@@ -19528,10 +20454,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nie je možné získať skupinu: %s"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Chyba pri automatickom ukladaní správ: %s\n"
@@ -19555,179 +20477,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Neznáma odpoveď serveru: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Upraviť skóre"
-
-#~ msgid "Assign Color"
-#~ msgstr "Priradiť farbu"
-
-#~ msgid "Assign Score"
-#~ msgstr "Priradiť skóre"
-
-#~ msgid "Attachments"
-#~ msgstr "Prílohy"
-
-#~ msgid "Beep"
-#~ msgstr "Pípnuť"
-
-#~ msgid "contains"
-#~ msgstr "obsahuje"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopírovať do priečinku"
-
-#~ msgid "Date received"
-#~ msgstr "Dátum prijatia"
-
-#~ msgid "Date sent"
-#~ msgstr "Dátum odoslania"
-
-#~ msgid "Deleted"
-#~ msgstr "Odstránené"
-
-#~ msgid "does not contain"
-#~ msgstr "neobsahuje"
-
-#~ msgid "does not end with"
-#~ msgstr "nekončí na"
-
-#~ msgid "does not exist"
-#~ msgstr "neexistuje"
-
-#~ msgid "does not return"
-#~ msgstr "nevrátiť"
-
-#~ msgid "does not sound like"
-#~ msgstr "nevyzerá ako"
-
-#~ msgid "does not start with"
-#~ msgstr "nezačína na"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Neexistuje"
-
-#~ msgid "Draft"
-#~ msgstr "Návrh"
-
-#~ msgid "ends with"
-#~ msgstr "končí na"
-
-#~ msgid "Exist"
-#~ msgstr "Existuje"
-
-#~ msgid "exists"
-#~ msgstr "existuje"
-
-#~ msgid "Expression"
-#~ msgstr "Výraz"
-
-#~ msgid "Follow Up"
-#~ msgstr "Follow Up"
-
-#~ msgid "is"
-#~ msgstr "je"
-
-#~ msgid "is after"
-#~ msgstr "je po"
-
-#~ msgid "is before"
-#~ msgstr "bolo pred"
-
-#~ msgid "is Flagged"
-#~ msgstr "je označený"
-
-#~ msgid "is greater than"
-#~ msgstr "je viac než"
-
-#~ msgid "is less than"
-#~ msgstr "je menej než"
-
-#~ msgid "is not"
-#~ msgstr "nie je"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nie je označený"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Jún"
-
-#~ msgid "Mailing list"
-#~ msgstr "Konferencia"
-
-#~ msgid "Message Body"
-#~ msgstr "Telo správy"
-
-#~ msgid "Message Header"
-#~ msgstr "Hlavička správy"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Správy"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Označiť ako _dôležitú"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Presunúť do priečinku"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Ukončí program"
-
-#~ msgid "Play Sound"
-#~ msgstr "Zahrať zvuk"
-
-#~ msgid "Recipients"
-#~ msgstr "Adresáti"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regul. výraz"
-
-#~ msgid "Replied to"
-#~ msgstr "Odpovedaná"
-
-#~ msgid "returns"
-#~ msgstr "vráti"
-
-#~ msgid "returns greater than"
-#~ msgstr "vráti viac než"
-
-#~ msgid "returns less than"
-#~ msgstr "vráti menej než"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Spustiť program:"
-
-#~ msgid "Sender"
-#~ msgstr "Odosielateľ"
-
-#~ msgid "Set Status"
-#~ msgstr "Nastaviť stav"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Veľkosť (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "vyzerá ako"
-
-#~ msgid "Source Account"
-#~ msgstr "Zdrojový účet"
-
-#~ msgid "Specific header"
-#~ msgstr "Špecifická hlavička"
-
-#~ msgid "starts with"
-#~ msgstr "začína na"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Zastaviť spracovanie"
-
-#~ msgid "Unset Status"
-#~ msgstr "Zrušiť nastavenie stavu"
-
 #~ msgid "Working"
 #~ msgstr "Pracujem"
 
@@ -19938,10 +20687,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Finished"
 #~ msgstr "Dokončené"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Skupina"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20470,9 +21215,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "component"
 #~ msgstr "Schôdzka"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmy"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Geografické umiestnenie"
 
@@ -21016,10 +21758,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Vyberte kontakty z adresára"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "Dátum na_rodenia:"
 
@@ -21088,22 +21826,10 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Informácie o kalendári"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klasifikácia"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Dátum a čas"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Popis:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Začína:</b> "
 
@@ -21527,9 +22253,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Prijímam výsledky hľadania LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Chyba počas hľadania"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Sklad off-line"
@@ -21670,9 +22393,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Databáza pre lokálne/LDAP kontakty Adresára Evolution"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Databáza pre lokálny kalendár Evolution"
-
 #, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Databáza pre lokálne/LDAP kontakty Adresára Evolution"
@@ -21773,9 +22493,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Use Score"
 #~ msgstr "Použiť skóre"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kurzor nie je možné načítať\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Priečinok obsahujúci informácie o kontaktoch"
 
@@ -24062,9 +24779,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -25448,9 +26162,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25841,9 +26552,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -28220,9 +28928,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "South Dakota"
 #~ msgstr "Južná Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "Južné Marshallove ostrovy"
 
@@ -30436,9 +31141,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "View the selected folder"
 #~ msgstr "Zobraziť vybraný priečinok"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopírovať..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Pru_h priečinkov"
 
@@ -30448,27 +31150,18 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Prejsť do priečinku..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Presunúť..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Nový _priečinok"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Odstrániť priečinok iného používateľa"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Premenovať..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Panel skratiek"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "Klávesová _skratka..."
 
-#~ msgid "Information"
-#~ msgstr "Informácia"
-
 #~ msgid "Error"
 #~ msgstr "Chyba"
 
diff --git a/po/sl.po b/po/sl.po
index 6c794f865d..e836242701 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -20,16 +20,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolucijin adresarjev veznik"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Stiki: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Okno Evolucije"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -55,36 +45,265 @@ msgstr "ni vizitk"
 msgid " card"
 msgstr "1 vizitka"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Stiki: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Okno Evolucije"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kazalec se ni mogel naložiti\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Strežniku IMAP se nisem mogel avtentificirati.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nisem mogel dobiti seznama skupin s strežnika."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nisem mogel naložiti %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Urejevalnik kategorij ni na voljo."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Shranite v adresarju"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Napaka ob nalaganju privzetega adresarja."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Napaka ob iskanju"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Želite shraniti spremembe"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#, fuzzy
+msgid "_Discard"
+msgstr "_Prikaz"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "in ena druga vizitka."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Napaka ob dodajanju vizitke"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Privzet usklajevalni naslov:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "Autocompletion"
+msgstr "Krajevne mape"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Vpišite geslo za %s (uporabnik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikata:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nastavi mapo..."
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolucijin adresarjev veznik"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -121,7 +340,7 @@ msgstr "Skupina _stikov"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "Skupina _stikov"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -146,15 +365,15 @@ msgid "Migrating `%s':"
 msgstr "Ustvarjam \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -164,22 +383,22 @@ msgid "Personal"
 msgstr "Priština"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Krajevne mape"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -187,58 +406,68 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Zbriši"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Stiki"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+#, fuzzy
+msgid "Failed to authenticate.\n"
+msgstr "Nisem mogel preveriti certifikatov."
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Vpišite geslo za %s (uporabnik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -258,69 +487,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Krajevne mape"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Stiki"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikata:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Nastavi mapo..."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolucijin adresarjev veznik"
-
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Nastavitev Evolucijine pošte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -328,7 +494,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -337,8 +503,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
@@ -364,6 +529,7 @@ msgid "636"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Avtentifikacija"
@@ -414,13 +580,11 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -657,34 +821,27 @@ msgid "cards"
 msgstr "ni vizitk"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Izberi stike iz adresarja"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Odstrani vse"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Odstrani"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Odstrani vse"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -701,7 +858,7 @@ msgid "Send HTML Mail?"
 msgstr "Pošlji pošto v obliki HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj k stikom"
 
@@ -709,16 +866,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
+msgid "Select Contacts from Address Book"
+msgstr "Izberi stike iz adresarja"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -745,6 +909,11 @@ msgstr "_Kategorija:"
 msgid "_Find"
 msgstr "Poišči"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "I_skanje"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -791,9 +960,8 @@ msgid "<b>Work</b>"
 msgstr "Delavni teden"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -818,7 +986,6 @@ msgid "Birthday:"
 msgstr "_Rojstni dan:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Koledar"
@@ -834,8 +1001,8 @@ msgid "Company:"
 msgstr "Podjetje"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 #, fuzzy
@@ -843,7 +1010,7 @@ msgid "Contact"
 msgstr "Stiki"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -953,8 +1120,8 @@ msgstr "Naslov _spletne strani:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 #, fuzzy
@@ -979,46 +1146,29 @@ msgid "_File under:"
 msgstr "Ime datoteke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "Strežniki"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 #, fuzzy
 msgid "Address"
 msgstr "_Naslov:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 #, fuzzy
 msgid "Editable"
 msgstr "Vključi"
@@ -1998,144 +2148,135 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Na_tisni sporočilo"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Neimenovan seznam stikov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Idaho"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Dodaj storitev"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
 #, fuzzy
-msgid "GroupWise"
-msgstr "Skupina"
+msgid "Location"
+msgstr "_Lega:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Uporabniško ime:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Idaho"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Skupina"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Virtualne mape"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #, fuzzy
 msgid "Changed"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Čas ni veljaven"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Neveljaven argument"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-#, fuzzy
-msgid "_Discard"
-msgstr "_Prikaz"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Na_tisni sporočilo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Dodaj storitev"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "_Lega:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Uporabniško ime:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -2158,6 +2299,23 @@ msgstr ""
 "\n"
 "E-naslov:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Naslov _2:"
@@ -2286,51 +2444,74 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#, fuzzy
+msgid "Add an email to the List"
+msgstr "Pošlji e-pošto %s"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Izberi stike iz adresarja"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Člani"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Odstrani izbrane predmete iz seznama prilog"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Zbrisano"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Skrij naslove ob pošiljanju pošte na ta seznam"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "_Ime seznama::"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Vpišite e-poštni naslov ali potegnite skik na spodnji seznam:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Urejevalnik stikov"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+#, fuzzy
+msgid "dialog1"
+msgstr "Kaži dialog"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 #, fuzzy
 msgid "Is New List"
 msgstr "Nov seznam"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Potrebni udeleženci"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Shrani kot vVizitko"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Spremenjen stik:"
@@ -2369,441 +2550,11 @@ msgstr ""
 "Ga želite vseeno dodati?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "Člani"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Poklic"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Skupina"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Telefon v avtu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "Delam"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Prenosni telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Priština"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Opomba"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "Službeni _naziv:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "Domači faks"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Uspeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Skladišče, ki ni na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Mapa %s ne obstaja"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nov seznam stikov"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "Vizitka ni bila najdena"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "ID vizitke že obstaja"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol ni podprt"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "preklicano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nisem mogel preimenovati mape: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "Avtentifikacija ni uspela."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Potrebna je avtentifikacija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Ni takšnega sporočila"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Drugačna napaka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
-"pot obstaja in ali imate dovoljenje za dostop."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Ne morem odpreti tega adresarja. To pomeni, da \n"
-"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Ta različica Evolucije nima vgrajene podpore za LDAP.\n"
-"Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
-"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
-"Evolucijo prevesti iz izvorne kode CVS.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Ne morem odpreti tega adresarja. To pomeni, da \n"
-"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Napaka ob dodajanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Napaka ob dodajanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Napaka ob spreminjanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Napaka ob spreminjanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Napaka ob odstranjevanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"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:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s že obstaja\n"
-"Jo želite prepisati?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-#, fuzzy
-msgid "Overwrite"
-msgstr "Prepiši datoteko?"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "vizitka.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "seznam"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Prestavi vizitko v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopiraj vizitko v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Prestavi vizitke v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopiraj vizitke v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Izberi stike iz adresarja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Več vVizitk"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VVizitka za %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(brez)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-naslov 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Izberi dejanje"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Ustvari nov stik \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Poizvedujem v adresarju..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Uredi podatke stika"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Zlij E-poštne naslove"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "in ena druga vizitka."
-msgstr[1] "in ena druga vizitka."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Kaži celotne _glave"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Shrani stik kot vVizitko"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Shranite v adresarju"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2818,9 +2569,9 @@ msgstr[1] "Stiki"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 #, fuzzy
 msgid "Query"
 msgstr "Vsak"
@@ -2838,142 +2589,142 @@ msgstr "Prestavi"
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 #, fuzzy
 msgid "Email begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Vrsta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nov stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 #, fuzzy
 msgid "Import..."
 msgstr "_Uvozi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Išči po kontaktih"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Viri _adresarja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "katerakoli kategorija"
@@ -3007,6 +2758,8 @@ msgid "Car Phone"
 msgstr "Telefon v avtu"
 
 #: 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:3
 msgid "Categories"
 msgstr "kategorije"
 
@@ -3014,6 +2767,21 @@ msgstr "kategorije"
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-naslov 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Družinsko ime"
@@ -3053,14 +2821,29 @@ msgstr "Jordanija"
 msgid "Manager"
 msgstr "Upravljalec"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Vzdevek"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Opomba"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pisarna"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3114,33 +2897,23 @@ msgstr "Enote: "
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 #, fuzzy
 msgid "Width"
 msgstr "Širina:"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 #, fuzzy
 msgid "Height"
 msgstr "Višina:"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Zbrisano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Sortiranje opravil"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3160,7 +2933,12 @@ msgstr "_Velikost besedila"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#, fuzzy
+msgid "Column Width"
+msgstr "Kolumbija"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3174,7 +2952,7 @@ msgstr ""
 "\n"
 "Če želite ustvariti nov stik, dvojno kliknite tu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3184,15 +2962,413 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 #, fuzzy
 msgid "Adapter"
 msgstr "po"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: addressbook/gui/widgets/e-minicard.c:160
 #, fuzzy
-msgid "Column Width"
-msgstr "Kolumbija"
+msgid "Selected"
+msgstr "Zbrisano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortiranje opravil"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Člani"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Poklic"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Delam"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Priština"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "Službeni _naziv:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Domači faks"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Uspeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Skladišče, ki ni na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nov seznam stikov"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "Vizitka ni bila najdena"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "ID vizitke že obstaja"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol ni podprt"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "preklicano"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Avtentifikacija ni uspela."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Potrebna je avtentifikacija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Ni takšnega sporočila"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Drugačna napaka"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
+"pot obstaja in ali imate dovoljenje za dostop."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Ne morem odpreti tega adresarja. To pomeni, da \n"
+"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ta različica Evolucije nima vgrajene podpore za LDAP.\n"
+"Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
+"ko boste s spodnje povezave prenesli program OpenLDAP,\n"
+"Evolucijo prevesti iz izvorne kode CVS.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Ne morem odpreti tega adresarja. To pomeni, da \n"
+"ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Napaka ob dodajanju seznama"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Napaka ob dodajanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Napaka ob spreminjanju seznama"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Napaka ob odstranjevanju seznama"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"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:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s že obstaja\n"
+"Jo želite prepisati?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+#, fuzzy
+msgid "Overwrite"
+msgstr "Prepiši datoteko?"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "vizitka.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "seznam"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Prestavi vizitko v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopiraj vizitko v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Prestavi vizitke v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopiraj vizitke v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Izberi stike iz adresarja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Več vVizitk"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VVizitka za %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(brez)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Poizvedujem v adresarju..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Uredi podatke stika"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-poštne naslove"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "in ena druga vizitka."
+msgstr[1] "in ena druga vizitka."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Kaži celotne _glave"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Shrani stik kot vVizitko"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Shranite v adresarju"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3241,6 +3417,11 @@ msgstr "Evolucijin setavljalnik pošte."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Natisni kuverto"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3252,11 +3433,6 @@ msgstr "Na_tisni stike..."
 msgid "Print contact"
 msgstr "Na_tisni stike..."
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Natisni kuverto"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pik Tahoma"
@@ -3443,6 +3619,23 @@ msgstr "Seznam _stikov"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Ne morem dobiti sporočila"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nisem mogel naložiti %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kliknite tu za odprtje adresarja"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3501,23 +3694,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Notranja napaka"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Ne morem dobiti sporočila"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nisem mogel naložiti %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Kliknite tu za odprtje adresarja"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Napaka ob nalaganju privzetega adresarja."
@@ -3535,40 +3711,373 @@ msgstr "Ime datoteke ni navedeno."
 msgid "Unnamed List"
 msgstr "Neimenovan seznam stikov"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ne zbriši"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Pošlji _kasneje"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Ste prepričani, da želite zbrisati %d opravil?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ste prepričani, da želite zbrisati %d sestankov?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Sestanek"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Želite shraniti spremembe"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Zavrzi to sporočilo"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Shrani sporočilo kot..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Pošlji"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolucijin veznik Koledarja"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Vpišite geslo"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nisem mogel pognati strežnika wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nisem mogel pognati programa wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Privzeta prioriteta:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavitve koledarja in nalog"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Koledar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucijin veznik koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolucijin veznik Koledarja"
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Koledar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Naloga"
+
+#: 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:213
 msgid "Starting:"
 msgstr "Pričetek ob:"
@@ -3664,11 +4173,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
@@ -3818,9 +4322,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Povzetek vsebuje"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentar vsebuje"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Brez zadetka"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3844,8 +4369,8 @@ msgid "Purge events older than"
 msgstr "je manjše"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dni"
 
@@ -3856,7 +4381,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3906,69 +4431,57 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Koledar"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sestanek"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
+msgid "Cale_ndar"
 msgstr "Koledar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
@@ -3998,27 +4511,6 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Povzetek vsebuje"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentar vsebuje"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Brez zadetka"
-
 #: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
@@ -4038,231 +4530,134 @@ msgstr "Nimate dovoljenja"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Možnosti zvočnega alarma"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "možnosti alrama sporočil"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Možnosti alarma pošte"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Možnosti alarma programa"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Neznane možnosti alarma"
+msgid "<b>Alarm</b>\t"
+msgstr "Podatki o kodledarju"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Ponovitev alarma"
+msgid "<b>Options</b>"
+msgstr "Opis:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Prikaz _sporočila"
+msgid "<b>Repeat</b>"
+msgstr "Opomnilniki"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "Jedro sporočila"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Predvajaj zvok:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Ponovi alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Poženi program:"
+msgid "Add Alarm"
+msgstr "Alarmi"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "Pošlji kot:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "S temi argumenti:"
+msgid "Custom _message"
+msgstr "Sestavi novo sporočilo"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
 #, fuzzy
-msgid "dialog1"
-msgstr "Kaži dialog"
+msgid "Custom alarm sound"
+msgstr "Prliagodi orodne vrstice"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "dodatnih ponovitev vsakih"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ur"
-
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Osnove"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datum/ura:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Sporočila"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Opomnilnik"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Poženi program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Pošlji kot:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pošlji e-pošto"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Povzetek:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Račun"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Možnosti..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "_Program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Ponovi alarm"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Pošlji"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "po"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pred"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dni"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "konec sestanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "dodatnih ponovitev vsakih"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ur"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "pričetek sestanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Navedite ime datoteke:"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Postopek potreben za naložitev `%s' ni podprt"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj _koledarju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Seznam _nalog"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Zapri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Izberi barvo"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj _koledarju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Nova skupina..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Osveži"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Vrsta:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tedenov"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4380,7 +4775,7 @@ msgid "Free/Busy Publishing"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "petek"
@@ -4394,7 +4789,7 @@ msgid "Minutes"
 msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "ponedeljek"
@@ -4405,7 +4800,7 @@ msgid "S_un"
 msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "sobota"
@@ -4419,7 +4814,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "nedeljo"
@@ -4434,7 +4829,7 @@ msgid "T_hu"
 msgstr "č_et"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "četrtek"
@@ -4448,7 +4843,7 @@ msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "torek"
@@ -4458,7 +4853,7 @@ msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "sreda"
@@ -4493,7 +4888,8 @@ msgstr "_Skrči vikende v mesečnem pogledu"
 msgid "_Day begins:"
 msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4548,6 +4944,81 @@ msgstr "_sre"
 msgid "before every appointment"
 msgstr "pred koncem sestanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Navedite ime datoteke:"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Postopek potreben za naložitev `%s' ni podprt"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj _koledarju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Zapri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Izberi barvo"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj _koledarju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Nova skupina..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Osveži"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Vrsta:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "tedenov"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
@@ -4592,81 +5063,75 @@ msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Neznana napaka: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Rok"
+
+#: calendar/gui/dialogs/comp-editor.c:264
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Shrani kot..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Neznana napaka: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Rok "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Rok"
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4738,8 +5203,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresar..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Stiki..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4749,167 +5215,225 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Opomnilnik"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Podatki"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Datum pričetka"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 #, fuzzy
 msgid "Start time is wrong"
 msgstr "_Čas pričetka:"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nimate dovoljenja"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "pred koncem sestanka"
+msgstr[1] "pred koncem sestanka"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "konec sestanka"
+msgstr[1] "konec sestanka"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "pred koncem sestanka"
+msgstr[1] "pred koncem sestanka"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Celodnevni dogodek"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "pred koncem sestanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Zaseden"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "pred koncem sestanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorije..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "pred koncem sestanka"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Podatki o kodledarju"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Uvrstitev"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Datum in ura"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "zaupno"
+msgid "A_ll day event"
+msgstr "_Celodnevni dogodek"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Datum/ura:"
+msgid "C_ustomize..."
+msgstr "_Prilagodi..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "P_rost"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorije..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "_Lega:"
+msgid "Cale_ndar:"
+msgstr "Koledar"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_vatno"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Uvrstitev"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Javno"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "zaupno"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Kaži čas kot"
+msgid "L_ocation:"
+msgstr "_Lega:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "osebno"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "javno"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Kaži čas kot"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Povzetek:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmi"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Čas konca:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Čas pričetka:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "brez"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Potreben je organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Zbriši"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Odstrani"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4948,36 +5472,45 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Vsi udeleženi"
+msgid "<b>Attendees</b>"
+msgstr "Stanje:"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Pošiljatelja dodaj v _adresar"
+msgid "<b>Organizer</b>"
+msgstr "končano "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Spremeni organizatorja"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Stiki..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Spremeni organizatorja"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5056,158 +5589,150 @@ msgstr "Wallisovi in Futunini otoki"
 msgid "All Instances"
 msgstr "Vse _postaje:"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ta sestanek vsebuje ponovitve, ki jih Evolucija ne zna urejati."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 #, fuzzy
 msgid "Recurrence date is invalid"
 msgstr "Čas ni veljaven"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "prvi"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "sekunda"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 #, fuzzy
 msgid "third"
 msgstr "ta"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 #, fuzzy
 msgid "fourth"
 msgstr "sever"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 #, fuzzy
 msgid "last"
 msgstr "seznam"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 #, fuzzy
 msgid "Other Date"
 msgstr "Drugi faks"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Datum/ura:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Vsak"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Izjeme"
+msgid "<b>Exceptions</b>"
+msgstr "Opis:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Predogled:"
+msgid "<b>Preview</b>"
+msgstr "Predogled"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Poljubna ponovitev"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Spremeni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Brez ponovitve"
+msgid "<b>Recurrence</b>"
+msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Odstrani"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Vsak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Enostavna ponovitev"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Zapri ta sestanek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "vseskozi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesec"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "tednov"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Zbriši to mapo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "končano "
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Sporočila za prikaz"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% končano"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Sporočila za prikaz"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "končano"
 
@@ -5219,8 +5744,8 @@ msgstr "visoka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "v teku"
@@ -5232,23 +5757,22 @@ msgid "Low"
 msgstr "nizka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "običajna"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "ni pričeto"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "v teku"
+msgid "P_ercent complete:"
+msgstr "Procentov opravljeno: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5273,37 +5797,42 @@ msgstr "_Stanje:"
 msgid "_Web Page:"
 msgstr "Naslov _spletne strani:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Naloga"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Zaupno"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Sporočila za prikaz"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Sporočila za prikaz"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "_Mapa:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5314,58 +5843,58 @@ msgstr "Datum _pričetka:"
 msgid "_Due date:"
 msgstr "_Do datuma:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
+msgid "_Group:"
+msgstr "Skupina"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Podatki o zasedenosti se končajo: <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Dan"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Podatki o zasedenosti"
+msgid "<b>Publishing _Location</b>"
+msgstr "Zahtevek po podatkih o zasedenosti"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Zahtevek po podatkih o zasedenosti"
+msgid "Free/Busy Editor"
+msgstr "Podatki o zasedenosti"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Ime seznama::"
+msgid "_Daily"
+msgstr "Dan"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Geslo:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Pošta"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Geslo:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Zapomni si geslo"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Uporabniško ime:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Tedenske"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5447,7 +5976,7 @@ msgstr "%s ob %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sprožilca"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Kliknite tu za dodajanje opravila"
@@ -5456,6 +5985,11 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "Untitled"
 msgstr "Neimenovan"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Povzetek:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5468,7 +6002,7 @@ msgstr "Do datuma:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5482,20 +6016,93 @@ msgstr "_Prioriteta:"
 msgid "Web Page:"
 msgstr "Naslov _spletne strani:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "javno"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Datum konca"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "osebno"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Datum pričetka"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "zaupno"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Povzetek"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Prost"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zaseden"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Zemljepisna lega mora biti zapisana v obliki: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Da"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ne"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "neznano"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ponovi se"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Določena"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5541,99 +6148,105 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Prost"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zaseden"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Odpri"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "FIXME: _Odpri spletno stran"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Na_tisni..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreži"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Dodeli nalogo"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Označi opravila kot opravljena"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Zbriši"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Zbriši izbrana opravila"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Shrani kot..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Kliknite tu za dodajanje opravila"
 
@@ -5642,186 +6255,117 @@ msgstr "Kliknite tu za dodajanje opravila"
 msgid "% Complete"
 msgstr "% končano"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Končano"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Do datuma"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Datum pričetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Prestavljam"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopiram"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izberi ni_t"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Zbriši..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Presta_vi v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Nastavitve pošte..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Datum pričetka"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "neznano"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Ponovi se"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Določena"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Zemljepisna lega mora biti zapisana v obliki: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5845,36 +6389,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pop"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "dop"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pop"
 
 #: calendar/gui/e-itip-control.c:585
 #, fuzzy
@@ -5943,39 +6487,35 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:696
-#, fuzzy
-msgid "<b>Ends:</b> "
-msgstr "Konec: <b>"
-
-#: calendar/gui/e-itip-control.c:716
 #, fuzzy
-msgid "<b>Completed:</b> "
-msgstr "končano "
+msgid "Starts"
+msgstr "Stanje"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Rok"
+
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5983,309 +6523,287 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Nič</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 #, fuzzy
 msgid "Location:"
 msgstr "_Lega:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-#, fuzzy
-msgid "There was an error on the CORBA system\n"
-msgstr "Napaka ob prenašanju podatkov za"
-
-#: calendar/gui/e-itip-control.c:1852
-#, fuzzy
-msgid "Object could not be found\n"
-msgstr "Predmeta ni bilo mogoče poslati!\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
@@ -6314,6 +6832,10 @@ msgstr "Nalagam koledar"
 msgid "Loading calendar..."
 msgstr "Nalagam koledar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Sporočilo strežnika:"
@@ -6330,11 +6852,6 @@ msgstr "začetni-datum"
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Potrebni udeleženci"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Možni udeleženci"
@@ -6403,6 +6920,28 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "V obdelavi"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Iz pisarne"
@@ -6411,98 +6950,64 @@ msgstr "Iz pisarne"
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Pošiljatelja dodaj v _adresar"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Možnosti"
+msgid "O_ptions"
+msgstr "Možnosti"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Kaži le delavne ure"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Kaži poman_jšano"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Posodobi prosto/zasedeno"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Samodeno izberi"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Potrebni ljudje"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Čas pričetka sestanka:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Čas zaključka sestanka:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6511,128 +7016,55 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Odpiram naloge v %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Napaka ob '%s':\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Naloži _slike"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Odpiram naloge v %s"
+
+#: calendar/gui/e-tasks.c:962
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Naloge"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Posodobi vsakih"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ni sestankovov"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Naloži _slike"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Odpiram '%s'"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Odhodna"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Nastavitve koledarja in nalog"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucijin veznik koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolucijin veznik Koledarja"
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Koledar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Naloga"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -6972,10 +7404,6 @@ msgstr "Izbran mesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izbrano leto (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Naloga"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -7006,7 +7434,7 @@ msgid "Contacts: "
 msgstr "Stiki: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -7035,7 +7463,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Brez nalog"
 msgstr[1] "Brez nalog"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7056,35 +7484,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Viri novic"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ustvari nov posel"
@@ -8776,69 +9198,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Uskljajujem mape"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Napaka ob razčlenjanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Napaka ob izvajanju filtra: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Ne morem odpreti mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Dobivam sporočilo %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ne morem dobiti sporočila"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nauspeh ob sporočilu %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Uskljajujem mapo"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Dobivam sporočilo %d od %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Neuspeh pri sporočilu %d od %d"
@@ -8862,44 +9284,6 @@ msgstr "Neveljavni argumenti"
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Prestavljam sporočila"
-
-#: camel/camel-folder.c:1416
-#, fuzzy
-msgid "Copying messages"
-msgstr "Kopiram sporočila v %s"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Opozorilo"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Prenašam %d sporočil"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8945,7 +9329,45 @@ msgstr "(match-all) zahteva enojen booleanov rezultat"
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Prestavljam sporočila"
+
+#: camel/camel-folder.c:1416
+#, fuzzy
+msgid "Copying messages"
+msgstr "Kopiram sporočila v %s"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Opozorilo"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Prenašam %d sporočil"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8953,44 +9375,44 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 #, 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:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8998,70 +9420,90 @@ msgid ""
 "%s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisem mogel izvršiti %s: %s\n"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, 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:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Šifrirano sporočilo"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
+
+#: 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 "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisem se mogel zakleniti '%s'"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9084,26 +9526,6 @@ msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
-
-#: 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 "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisem se mogel zakleniti '%s'"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9351,7 +9773,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -9436,57 +9858,57 @@ msgstr "Avtentifikacija POP pred SMTP z uporabo ne-pop vira"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabniškega imena"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Napaka ob poizvedbi imena: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 #, fuzzy
 msgid "Resolving address"
 msgstr "Razvozlujem: %s"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Poizvedba po gostitelju ni uspela: %s: gostitelj ni bil najden"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Poizvedba po gostitelju ni uspela: %s: vzrok ni znan"
@@ -9563,7 +9985,7 @@ msgstr "ID _certifikata:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
@@ -9659,7 +10081,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Vključi v seznamu na_ključnih podpisov"
 
 #: camel/camel-smime-context.c:651
@@ -9674,49 +10096,48 @@ msgstr "Ukaz IMAP ni uspel: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Nisem mogel najti certifikata za \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nisem mogel najti skupnega algoritma."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Iz sporočila ustvari _pravilo"
+msgid "Cannot create CMS Message"
+msgstr "Ne morem dobiti sporočila"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ne morem dobiti sporočila"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ne morem pripeti datoteke %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ne morem pripeti datoteke %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ne morem dobiti sporočila"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9763,7 +10184,8 @@ msgstr "Ne morem dobiti mape: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
@@ -9772,8 +10194,8 @@ msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 msgid "Trash"
 msgstr "Smeti"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "junij"
@@ -9905,7 +10327,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9918,11 +10340,11 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "SLABO"
 
@@ -9944,7 +10366,7 @@ msgstr ""
 "Ga želite vseeno sprejeti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9959,35 +10381,35 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
@@ -10012,7 +10434,7 @@ msgstr "Preveri za nova sporočila v vseh mapah"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
@@ -10033,8 +10455,8 @@ msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
@@ -10067,8 +10489,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10087,321 +10509,28 @@ msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom.
 msgid "Checklist"
 msgstr "Goste meglice"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Nepričakovan odgovor strežnika IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mape"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Kaži le naročene mape"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Imenski prostor"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Strežnik SMTP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "storitev %s za %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nisem se mogel povezati z %s (vrata %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezava prekinjena"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Ne morem se povezati s strežnikom POP.\n"
-"Ni podpore za zahtevan avtentifikacijski mehanizm."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sProsim vpišite geslo SMTP za %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime mape ne more vsebovati znaka return"
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "_Podjetje:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Ne morem dobiti mape: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Prekliči naročnino na mapo \"%s\""
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Nepričakovan odgovor strežnika IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Brez nalog"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10468,7 +10597,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10543,6 +10672,27 @@ msgstr "Nisem se mogel povezati s strežnikom LDAP."
 msgid "Command:"
 msgstr "_Podjetje:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Mape"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Kaži le naročene mape"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Imenski prostor"
+
 #: 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"
@@ -10565,43 +10715,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Strežnik SMTP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "storitev %s za %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nisem se mogel povezati z %s (vrata %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezava prekinjena"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Razširitev SSL/TLS ni podprta"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10612,30 +10811,280 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime mape ne more vsebovati znaka return"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana napaka: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Ne morem se povezati s strežnikom POP.\n"
+"Ni podpore za zahtevan avtentifikacijski mehanizm."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sProsim vpišite geslo SMTP za %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "_Podjetje:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Prekliči naročnino na mapo \"%s\""
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Brez nalog"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10802,18 +11251,26 @@ msgstr "Nisem mogel odpreti povzetka: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne morem dodati sporočila k povzetku: razlog neznan"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Dodajanje sporočila v mailidr preklicano"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10829,48 +11286,48 @@ msgstr ""
 "Ne morem dobiti sporočila: %s iz mape %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ni imenik vrste maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisem mogel zbrisati mape `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11462,20 +11919,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisem se mogel povezati s strežnikom POP %s v varnem načinu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisem se mogel povezati s strežnikom POP na %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11484,28 +11946,28 @@ msgstr ""
 "Ne morem se povezati s strežnikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, fuzzy, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Prijava SASL `%s' ni uspela: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, fuzzy, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sProsimo vpišite geslo POP za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11514,7 +11976,16 @@ msgstr ""
 "Nisem se mogel povezati s strežnikom POP.\n"
 "Napaka ob pošiljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nisem se mogel povezati s strežnikom POP.\n"
+"Napaka ob pošiljanju gesla: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
@@ -11731,98 +12202,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Dostava pošte s SMTP preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Ne morem poslati sporočila: naslov pošiljatelja ni naveden."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Pošiljam sporočilo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne morem poslati sporočila: ni naslovnikov."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne morem poslati sporočila: eden ali več neveljavnih naslovnikov"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Pozdrav SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Avtentifikacija SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Napak ob ustvarjanju avtentifikacijskega predmeta SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Strežnik je sporočil slab odgovor avtentifikacije.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 "Zahtevek MAIL FROM je prekoračil časovno omejitev: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Napaka v ogovoru na RCPT TO: %s: pošta ni bila poslana"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> ni uspel"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
@@ -11830,28 +12301,28 @@ msgstr "Napaka v ogovoru na DATA: %s: pošta ni bila poslana"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Ukaz IMAP ni uspel: %s"
@@ -11916,99 +12387,6 @@ msgstr "Vrsta MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ne morem dobiti sporočila"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Od urejevalnika nisem uspel dobiti sporočila"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Neimenovano sporočilo)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Odpri datoteko"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2097
-#, fuzzy
-msgid "Signature:"
-msgstr "Podpisi"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Sestavi novo sporočilo"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Nisem mogel aktivirati gradnika za izbiro naslova."
-
-#: composer/e-msg-composer.c:3175
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Ne morem aktivirati komponente urejevalnika HTML."
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Ne morem aktivirati komponente urejevalnika HTML."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -12094,17 +12472,91 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Attach file(s)"
 msgstr "Priloži datoteko"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne morem dobiti sporočila"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Neimenovano sporočilo)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Odpri datoteko"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpisi"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sestavi novo sporočilo"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Priloži sporočilo iz mape \"%s\""
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Priloži datoteko k sporočilu"
+msgstr[1] "Priloži datoteko k sporočilu"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Priloži datoteko k sporočilu"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12122,54 +12574,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Naslednje _neprebrano sporočilo"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Želite shraniti spremembe"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ne odstrani"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Odstrani"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Napaka ob shranjevanju bližnjic."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Opozorilo: Spremenjeno sporočilo"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12177,60 +12643,74 @@ msgid ""
 msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Zavrzi to sporočilo"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Shrani sporočilo kot..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nisem mogel ustvariti povzetka"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Nastaviti morate sovjo identiteto\n"
 "preden lahko skladate pošto."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
+msgstr "Nisem mogel ustvariti okna skladatelja."
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Nisem mogel aktivirati gradnika za izbiro naslova."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12530,11 +13010,6 @@ msgstr "%a %d %b %Y"
 msgid "Select a time to compare against"
 msgstr "Izberi čas s katerim naj se primerja"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Pravila filtriranja"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12565,20 +13040,8 @@ msgstr "Navedite ime datoteke:"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Odstranjujem mapo %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-#, fuzzy
-msgid "You must specify a folder."
-msgstr "vMapi morate dati ime."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12586,164 +13049,38 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Dodelitev"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Filtru morate dati ime."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "vMapi morate dati ime."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Strežnik ni bil izbran"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 #, fuzzy
 msgid "Choose a file"
 msgstr "Odpri datoteko"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "končano "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Izberi mapo"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Pravila filtriranja"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Viri vMap"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Primerjaj z"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: filter/filter.glade.h:6
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
-"ki ga navedete tu."
-
-#: filter/filter.glade.h:8
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom\n"
-"relativnim glede na čas zagona filtra;\n"
-".na primer \"teden dni nazaj\"."
-
-#: filter/filter.glade.h:10
-#, fuzzy
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
-"ki ga navedete tu."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "čas, relatievn trenutnemu"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "nazaj"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "mesecev"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr " sekund"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "le izbrane mape"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "trenutni čas"
-
-#: filter/filter.glade.h:22
-#, fuzzy
-msgid "the time you specify"
-msgstr "čas, ki ga navedete"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "z vsemi aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "z vsemi krajevnimi mapami"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "let"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Pomembno"
 
@@ -12815,6 +13152,76 @@ msgstr "dohodna"
 msgid "outgoing"
 msgstr "odhodna"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Pravila filtriranja"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Primerjaj z"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: filter/filter.glade.h:4
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:6
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom\n"
+"relativnim glede na čas zagona filtra;\n"
+".na primer \"teden dni nazaj\"."
+
+#: filter/filter.glade.h:8
+#, fuzzy
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"ki ga navedete tu."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "čas, relatievn trenutnemu"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "nazaj"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "mesecev"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr " sekund"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "trenutni čas"
+
+#: filter/filter.glade.h:19
+#, fuzzy
+msgid "the time you specify"
+msgstr "čas, ki ga navedete"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "let"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -12828,61 +13235,79 @@ msgstr "Uredi pravilo"
 msgid "Rule name"
 msgstr "Ime pravila: "
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Točke pravil"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Točke"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Nastavitve koledarja"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Telo vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Telo ne vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Telo ali zadeva vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Sporočilo vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolucija "
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Prejemniki vsebujejo"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Pošiljatelj vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Zadeva vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Zadeva ne vsebuje"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Virtualne mape"
+msgid "Evolution Mail preferences control"
+msgstr "Evolucijin veznik Koledarja"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Dodaj"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pošta"
 
-#: filter/vfolder-rule.c:573
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 #, fuzzy
-msgid "VFolder source"
-msgstr "Viri vMap"
+msgid "Mail Accounts"
+msgstr "Poštni račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Nastavitve"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Pošta"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12920,51 +13345,319 @@ msgstr "_Podpisi"
 msgid "Signature(s)"
 msgstr "Podpisi"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Posredovano sporočilo"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Pravila filtriranja"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Izberi mapo"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Dodeli točke"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Dodeli barvo"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Dodeli točke"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Priloge"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Pisk"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "vsebuje"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiraj v mapo"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Sprejeto dne"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Poslano dne"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Zbrisano"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ne vsebuje"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "se ne konča z"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ne obstaja"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "se ne začne z"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "ne obstaja"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Osnutek"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "se konča z"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "obstaja"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "obstaja"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Izraz"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Navezava"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "je po"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "je pred"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označeno"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "je večje"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "je manjše"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "ni"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "ni označeno"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "junij"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+#, fuzzy
+msgid "Label"
+msgstr "oznaka9"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Dopisni seznam"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Jedro sporočila"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Glava sporočila"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Sporočilo je bilo poslano"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Sporočilo %s ni bilo najdeno."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Prestavi v mapo"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Izhod iz programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Predvajaj zvok"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Beri"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Prejemnik"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Regularni izraz"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Odgovorjeno na"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+#, fuzzy
+msgid "returns greater than"
+msgstr "je večje"
+
+#: mail/em-filter-i18n.h:52
 #, 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):"
+msgid "returns less than"
+msgstr "je manjše"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Poženi program:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Točke"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Pošiljatelj"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Nastavi stanje"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Izvorni račun"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Določena glava"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "se začne z"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Prenehaj z obdelavo"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Zadeva"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Nastavi stanje"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "končano "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Lastnosti računa"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Lastnosti"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "Ime mape:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "_Pošlji sporočilo"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "_Pošlji sporočilo"
+msgstr[1] "_Pošlji sporočilo"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Naslednje _neprebrano sporočilo"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Naslednje _neprebrano sporočilo"
+msgstr[1] "Naslednje _neprebrano sporočilo"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12975,423 +13668,442 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Create New Folder"
 msgstr "Ustvari _novo mapo..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Ustvari pravilo"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Ime mape:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "vMape"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Nalagam..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Izbiram sporočila v mapi \"%s\""
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Prestavi"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Prekliči opravilo"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiraj"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Preimenuj mapo"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Po_gled"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Odpri v novem oknu"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopiraj..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Prestavi..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Nova mapa"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "P_reimenuj"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Lastnosti..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "vMape"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Nalagam..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pošta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-#, fuzzy
-msgid "Label"
-msgstr "oznaka9"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Pravila filtriranja"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite tu za dodajanje opravila"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Ustreza:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odgovori-na:"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Določena"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Za"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Seznam podpisov"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc:"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Zadeva"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Seznam podpisov"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
+#: mail/em-format-html-display.c:644
 #, fuzzy
-msgid "Newsgroups"
-msgstr "Viri novic"
+msgid "Valid signature, cannot verify sender"
+msgstr "Uredi vsebino podpisa v urejevalniku"
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "priloga %s"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+msgid "Unencrypted"
+msgstr "šifriranje"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
-
-#: mail/em-format.c:1298
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodprta shema"
+msgid "Encrypted, weak"
+msgstr "Šifrirano sporočilo"
 
-#: mail/em-format.c:1306
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "Encrypted"
+msgstr "šifriranje"
 
-#: mail/em-format.c:1306
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "Encrypted, strong"
+msgstr "Šifrirano sporočilo"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Prenašam sporočilo %s"
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Določena"
+msgid "_View Certificate"
+msgstr "ID _certifikata:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Seznam podpisov"
+msgid "This certificate is not viewable"
+msgstr "To sporočilo trenutno ni na voljo"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Seznam podpisov"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html.c:562
+#: mail/em-format-html-display.c:1012
 #, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Uredi vsebino podpisa v urejevalniku"
+msgid "Overdue:"
+msgstr "Naloge s prekoračenim rokom:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "šifriranje"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:1085
 #, fuzzy
-msgid "Encrypted, weak"
-msgstr "Šifrirano sporočilo"
+msgid "_View Inline"
+msgstr "Poglej vsebino"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "šifriranje"
+msgid "_Hide"
+msgstr "Skrij"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stran %d od %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Prenašam sporočilo %s"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:562
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Šifrirano sporočilo"
+msgid "Valid signature but cannot verify sender"
+msgstr "Uredi vsebino podpisa v urejevalniku"
 
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
@@ -13427,9 +14139,35 @@ msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 msgid "Formatting message"
 msgstr "Prestavljam sporočila"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odgovori-na:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Za"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
@@ -13444,110 +14182,48 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Ustreza:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
 #, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+msgid "Newsgroups"
+msgstr "Viri novic"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "priloga %s"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Valid signature, cannot verify sender"
-msgstr "Uredi vsebino podpisa v urejevalniku"
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "ID _certifikata:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "To sporočilo trenutno ni na voljo"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-#, fuzzy
-msgid "Overdue:"
-msgstr "Naloge s prekoračenim rokom:"
+#: mail/em-format.c:1279
+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-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Nepodprta shema"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Poglej vsebino"
+msgid "Error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Skrij"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Stran %d od %d"
+msgid "Unknown error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13665,7 +14341,7 @@ msgstr "Pošlji _sporočilo na seznam..."
 msgid "_Add to Addressbook"
 msgstr "Dodaj adresar"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
@@ -13678,7 +14354,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Naročen"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Mapa"
 
@@ -13715,11 +14391,25 @@ msgid "Add address"
 msgstr "_Naslov:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Odpri sporočilo iz \"%s\""
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Virtualne mape"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "Viri vMap"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14215,72 +14905,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Uvozi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Nastavitve koledarja"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolucija "
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Nastavitev Evolucijine pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Nastavitev Evolucijine pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolucijin veznik Koledarja"
+msgid "Evolution Pine importer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Poštni račun"
+msgid "Evolution mbox importer"
+msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Nastavitve"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Pošta"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14342,38 +14997,6 @@ msgstr "Uvažam"
 msgid "Importing mailbox"
 msgstr "Uvažam datoteke"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14523,81 +15146,87 @@ msgstr "%s poštnih seznamov"
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d izbranih"
+msgid_plural "%d deleted"
+msgstr[0] "%d izbranih"
+msgstr[1] "%d izbranih"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d neposlanih"
+msgid_plural "%d junk"
+msgstr[0] "%d neposlanih"
+msgstr[1] "%d neposlanih"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Osnutki"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Osnutki"
+msgstr[1] "Osnutki"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d poslanih"
+msgid_plural "%d sent"
+msgstr[0] "%d poslanih"
+msgstr[1] "%d poslanih"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d neposlanih"
+msgid_plural "%d unsent"
+msgstr[0] "%d neposlanih"
+msgstr[1] "%d neposlanih"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "skupaj %d"
+msgid_plural "%d total"
+msgstr[0] "skupaj %d"
+msgstr[1] "skupaj %d"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr " (XXX neprebran)"
+msgid_plural ", %d unread"
+msgstr[0] " (XXX neprebran)"
+msgstr[1] " (XXX neprebran)"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sestavi novo sporočilo"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nova vMapa"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Uredi filtre"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Ustvari nov koledar"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Preverjam storitev"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s strežnikom..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteta"
@@ -14666,16 +15295,23 @@ msgstr ""
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Preverjam storitev"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Predogled"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14958,7 +15594,7 @@ msgstr "Ne morem dobiti sporočila"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Opravljeno"
 
@@ -15339,6 +15975,123 @@ msgstr " barvo"
 msgid "description"
 msgstr "opis"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Viri vMap"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Sprejeto"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "C_ompleted"
+msgstr "končano"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Razlikuj velike in male črke"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Poišči v sporočilu"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Poišči"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+#, fuzzy
+msgid "Flag to Follow Up"
+msgstr "FIXME: _Zastavica za nadaljevanje..."
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Uredi naročnine"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Zbrisano"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "Strežniki"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Podatki o računu"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Poštni račun"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Rok do"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Flag:"
+msgstr "Označeno"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Naroči se"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Prekliči naročnino"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "le izbrane mape"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "z vsemi aktivnimi oddaljenimi mapami"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "z vsemi krajevnimi in aktivnimi oddaljenimi mapami"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "z vsemi krajevnimi mapami"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15545,14 +16298,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15657,8 +16402,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne morem prestaviti mape: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15708,8 +16454,9 @@ msgstr "Nisem mogel preimenovati mape: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "in ena druga vizitka."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15738,8 +16485,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ne zbriši"
+msgstr "O_dbriši"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15804,8 +16552,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Nisem mogel zbrisati mape:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15849,13 +16600,45 @@ msgstr ""
 "    '%s'\n"
 "in so bile posodobljene."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Odstranjujem mapo %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+#, fuzzy
+msgid "You must specify a folder."
+msgstr "vMapi morate dati ime."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "vMapi morate dati ime."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Strežnik ni bil izbran"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15863,16 +16646,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prepiši datoteko?"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Pošlji"
@@ -16032,7 +16815,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16041,46 +16824,21 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Razlikuj velike in male črke"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Poišči v sporočilu"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Poišči"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Podatki o računu"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Preklicujem..."
@@ -16117,24 +16875,24 @@ msgstr "Posodabljam..."
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
@@ -16194,15 +16952,15 @@ msgstr "Posodabljam vmape za uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
@@ -16266,7 +17024,7 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -16327,10 +17085,6 @@ msgstr "Posreduj naprej"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Beri"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -16344,54 +17098,52 @@ msgstr "Odgovori vsem"
 msgid "Review"
 msgstr "Predogled"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-#, fuzzy
-msgid "Flag to Follow Up"
-msgstr "FIXME: _Zastavica za nadaljevanje..."
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Telo vsebuje"
 
-#: mail/message-tags.glade.h:2
-#, fuzzy
-msgid "C_ompleted"
-msgstr "končano"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Telo ne vsebuje"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Telo ali zadeva vsebuje"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Rok do"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Sporočilo vsebuje"
 
-#: mail/message-tags.glade.h:7
-#, fuzzy
-msgid "_Flag:"
-msgstr "Označeno"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Prejemniki vsebujejo"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Uredi naročnine"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Pošiljatelj vsebuje"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Zbrisano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Zadeva vsebuje"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Zadeva ne vsebuje"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "Strežniki"
+msgid "Evolution Shell"
+msgstr "Evolucijina lupina."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Naroči se"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolucija"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Prekliči naročnino"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolucijin veznik opravil"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16460,31 +17212,19 @@ msgstr ""
 msgid "mail"
 msgstr "E-pošta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Neznana napaka"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Neveljavni argumenti"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ne morem se registrirati pri OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktivne povezave"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Podatkovna zbirka nastavitev ni bila najdena"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "Aktivne povezave"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Generična napaka"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreže"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16671,29 +17411,6 @@ msgstr "Ime mape ne more vsebovati znaka return"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' in '..' sta rezervirana za imena map."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pošta za %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
@@ -16712,122 +17429,93 @@ msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Skupina"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Nov"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Nova _naloga"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Preizkus"
-
-#: shell/evolution-test-component.c:142
-#, fuzzy
-msgid "Create a new test item"
-msgstr "Ustvari nov posel"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktivne povezave"
+msgid "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/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Active Connections"
-msgstr "Aktivne povezave"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreže"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "C_alendar:"
-msgstr "Koledar"
+msgid "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/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Stiki: "
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-#, fuzzy
-msgid "_Mail:"
-msgstr "_Pošta"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Tasks:"
-msgstr "Naloge"
+msgid "Uknown system error."
+msgstr "Neznana napaka"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "Vrsta mape:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Neveljavni argumenti"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-#, fuzzy
-msgid "Open Other User's Folder"
-msgstr "Ustvari _novo mapo..."
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-#, fuzzy
-msgid "_Account:"
-msgstr "Račun"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-#, fuzzy
-msgid "_Folder Name:"
-msgstr "Ime mape:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Generična napaka"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-#, fuzzy
-msgid "_User:"
-msgstr "_Uporabniško ime:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Nov"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolucijin druid za nastavitev"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvažam datoteke"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Časovni pas "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
@@ -16842,7 +17530,7 @@ msgstr ""
 "\n"
 "Prosim, za nadaljevanje kliknite gumb \"Naprej\". "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
@@ -16854,20 +17542,20 @@ msgstr ""
 "nastavitev Evolucije. \n"
 "Kliknite gumb \"Končaj\" za shranitev vaših nastavitev. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolucijina lupina."
+msgid "New Test"
+msgstr "Nova _naloga"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolucija"
+msgid "_Test"
+msgstr "Preizkus"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolucijin veznik opravil"
+msgid "Create a new test item"
+msgstr "Ustvari nov posel"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16933,7 +17621,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16965,7 +17653,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16974,42 +17662,42 @@ msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/main.c:496
+#: shell/main.c:461
 #, fuzzy
 msgid "Start Evolution activating the specified component"
 msgstr "Evolucijina komponenta za povzetke."
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:503
+#: shell/main.c:468
 #, fuzzy
 msgid "Forcibly shut down all evolution components"
 msgstr "Tovarna komponent Evolucije zaznamkov."
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17084,6 +17772,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17349,6 +18059,12 @@ msgstr "ID _certifikata:"
 msgid "_Edit CA Trust"
 msgstr "Uredi nalogo"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID vizitke že obstaja"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17581,12 +18297,6 @@ msgstr "Zadeva je %s"
 msgid "Certificate Signature Value"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID vizitke že obstaja"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17733,8 +18443,8 @@ msgstr "Poglej trenutni stik"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Dejanja"
@@ -18235,16 +18945,6 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Zapri to okno"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zapri"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18660,6 +19360,16 @@ msgstr "_Orodja"
 msgid "_Undelete"
 msgstr "O_dbriši"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zapri to okno"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Zapri"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18743,10 +19453,6 @@ msgstr "Shrani trenutno datoteko pod drugim imenom"
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporočilo v izbrano mapo"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Pošlji"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19347,7 +20053,7 @@ msgid "Evolution Query"
 msgstr "Alarm Evolucije"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19515,15 +20221,271 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
 #, fuzzy
-#~ msgid "Failed to connect to LDAP server"
-#~ msgstr "Nisem se mogel povezati s strežnikom LDAP."
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Ime seznama::"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Urejevalnik stikov"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Shrani kot vVizitko"
 
 #, fuzzy
-#~ msgid "Failed to authenticate with LDAP server"
+#~ msgid "Groupwise"
+#~ msgstr "Skupina"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nisem mogel pognati programa wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Koledar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Možnosti zvočnega alarma"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "možnosti alrama sporočil"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Možnosti alarma pošte"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Možnosti alarma programa"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Neznane možnosti alarma"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Ponovitev alarma"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Prikaz _sporočila"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "Jedro sporočila"
+
+#~ msgid "Play sound:"
+#~ msgstr "Predvajaj zvok:"
+
+#~ msgid "Run program:"
+#~ msgstr "Poženi program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "S temi argumenti:"
+
+#~ msgid "Basics"
+#~ msgstr "Osnove"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datum/ura:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Opomnilnik"
+
+#~ msgid "_Options..."
+#~ msgstr "_Možnosti..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresar..."
+
+#~ msgid "Reminder"
+#~ msgstr "Opomnilnik"
+
+#~ msgid "B_usy"
+#~ msgstr "_Zaseden"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "zaupno"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Datum/ura:"
+
+#~ msgid "F_ree"
+#~ msgstr "P_rost"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vatno"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Javno"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Vsi udeleženi"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Pošiljatelja dodaj v _adresar"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Izjeme"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Predogled:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravilo ponovitev"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Poljubna ponovitev"
+
+#~ msgid "_Modify"
+#~ msgstr "_Spremeni"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Brez ponovitve"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Enostavna ponovitev"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% končano"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "v teku"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Zaupno"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "_Mapa:"
+
+#, fuzzy
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "Konec: <b>"
+
+#, fuzzy
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "končano "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Nič</i>"
+
+#, fuzzy
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Napaka ob prenašanju podatkov za"
+
+#, fuzzy
+#~ msgid "Object could not be found\n"
+#~ msgstr "Predmeta ni bilo mogoče poslati!\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Pošiljatelja dodaj v _adresar"
+
+#~ msgid "_Options"
+#~ msgstr "_Možnosti"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Čas pričetka sestanka:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Čas zaključka sestanka:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
 #~ msgstr ""
-#~ "Strežniku IMAP se nisem mogel avtentificirati.\n"
-#~ "%s\n"
-#~ "\n"
+#~ "Napaka ob '%s':\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nisem mogel najti certifikata za \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Iz sporočila ustvari _pravilo"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nisem mogel ustvariti okna skladatelja:\n"
+#~ "Ne morem aktivirati komponente urejevalnika HTML."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Točke pravil"
+
+#, 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):"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Ime mape:"
+
+#~ msgid "_Rename"
+#~ msgstr "P_reimenuj"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Lastnosti..."
+
+#, fuzzy
+#~ msgid "C_alendar:"
+#~ msgstr "Koledar"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Stiki: "
+
+#, fuzzy
+#~ msgid "_Mail:"
+#~ msgstr "_Pošta"
+
+#, fuzzy
+#~ msgid "_Tasks:"
+#~ msgstr "Naloge"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Vrsta mape:"
+
+#, fuzzy
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Ustvari _novo mapo..."
+
+#, fuzzy
+#~ msgid "_Folder Name:"
+#~ msgstr "Ime mape:"
+
+#, fuzzy
+#~ msgid "_User:"
+#~ msgstr "_Uporabniško ime:"
+
+#, fuzzy
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nisem se mogel povezati s strežnikom LDAP."
 
 #, fuzzy
 #~ msgid "Could not perform query on Root DSE"
@@ -19536,10 +20498,6 @@ msgstr "%s (%d%% končano)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
-
-#, fuzzy
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "_Preveri za podprte vrste  "
 
@@ -19617,9 +20575,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Webcam:"
 #~ msgstr "Stran"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Urejevalnik kategorij ni na voljo."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19660,51 +20615,18 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Source URL:"
 #~ msgstr "URI vira POP"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
-
 #~ msgid "Are you sure you want to cancel and delete this task?"
 #~ msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Ste prepričani, da želite zbrisati ta neimenovan dnevniški vpis?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Ste prepričani, da želite zbrisati %d sestankov?"
-#~ msgstr[1] "Ste prepričani, da želite zbrisati %d sestankov?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Ste prepričani, da želite zbrisati %d opravil?"
-#~ msgstr[1] "Ste prepričani, da želite zbrisati %d opravil?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
-#~ msgstr[1] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Povabi ostale..."
 
@@ -19741,10 +20663,6 @@ msgstr "%s (%d%% končano)"
 #~ "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nisem mogel dobiti seznama skupin s strežnika."
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Napaka ob samodejnem shranjevanju sporočila: %s\n"
@@ -19768,181 +20686,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Neznan odgovor strežnika: %s"
 
-#, fuzzy
-#~ msgid "Adjust Score"
-#~ msgstr "Dodeli točke"
-
-#~ msgid "Assign Color"
-#~ msgstr "Dodeli barvo"
-
-#~ msgid "Assign Score"
-#~ msgstr "Dodeli točke"
-
-#~ msgid "Attachments"
-#~ msgstr "Priloge"
-
-#~ msgid "Beep"
-#~ msgstr "Pisk"
-
-#~ msgid "contains"
-#~ msgstr "vsebuje"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiraj v mapo"
-
-#~ msgid "Date received"
-#~ msgstr "Sprejeto dne"
-
-#~ msgid "Date sent"
-#~ msgstr "Poslano dne"
-
-#~ msgid "Deleted"
-#~ msgstr "Zbrisano"
-
-#~ msgid "does not contain"
-#~ msgstr "ne vsebuje"
-
-#~ msgid "does not end with"
-#~ msgstr "se ne konča z"
-
-#~ msgid "does not exist"
-#~ msgstr "ne obstaja"
-
-#, fuzzy
-#~ msgid "does not return"
-#~ msgstr "ne obstaja"
-
-#~ msgid "does not sound like"
-#~ msgstr "ne zveni kot"
-
-#~ msgid "does not start with"
-#~ msgstr "se ne začne z"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "ne obstaja"
-
-#~ msgid "Draft"
-#~ msgstr "Osnutek"
-
-#~ msgid "ends with"
-#~ msgstr "se konča z"
-
-#~ msgid "Exist"
-#~ msgstr "obstaja"
-
-#~ msgid "exists"
-#~ msgstr "obstaja"
-
-#~ msgid "Expression"
-#~ msgstr "Izraz"
-
-#~ msgid "Follow Up"
-#~ msgstr "Navezava"
-
-#~ msgid "is"
-#~ msgstr "je"
-
-#~ msgid "is after"
-#~ msgstr "je po"
-
-#~ msgid "is before"
-#~ msgstr "je pred"
-
-#~ msgid "is Flagged"
-#~ msgstr "je označeno"
-
-#~ msgid "is greater than"
-#~ msgstr "je večje"
-
-#~ msgid "is less than"
-#~ msgstr "je manjše"
-
-#~ msgid "is not"
-#~ msgstr "ni"
-
-#~ msgid "is not Flagged"
-#~ msgstr "ni označeno"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "junij"
-
-#~ msgid "Mailing list"
-#~ msgstr "Dopisni seznam"
-
-#~ msgid "Message Body"
-#~ msgstr "Jedro sporočila"
-
-#~ msgid "Message Header"
-#~ msgstr "Glava sporočila"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Sporočilo je bilo poslano"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Sporočilo %s ni bilo najdeno."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Prestavi v mapo"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Izhod iz programa"
-
-#~ msgid "Play Sound"
-#~ msgstr "Predvajaj zvok"
-
-#~ msgid "Recipients"
-#~ msgstr "Prejemnik"
-
-#~ msgid "Regex Match"
-#~ msgstr "Regularni izraz"
-
-#~ msgid "Replied to"
-#~ msgstr "Odgovorjeno na"
-
-#, fuzzy
-#~ msgid "returns greater than"
-#~ msgstr "je večje"
-
-#, fuzzy
-#~ msgid "returns less than"
-#~ msgstr "je manjše"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Poženi program:"
-
-#~ msgid "Sender"
-#~ msgstr "Pošiljatelj"
-
-#~ msgid "Set Status"
-#~ msgstr "Nastavi stanje"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Velikost (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "zveni kot"
-
-#~ msgid "Source Account"
-#~ msgstr "Izvorni račun"
-
-#~ msgid "Specific header"
-#~ msgstr "Določena glava"
-
-#~ msgid "starts with"
-#~ msgstr "se začne z"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Prenehaj z obdelavo"
-
-#, fuzzy
-#~ msgid "Unset Status"
-#~ msgstr "Nastavi stanje"
-
 #~ msgid "Working"
 #~ msgstr "Delam"
 
@@ -20159,10 +20902,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "_Poišči"
 
 #, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Skupina"
-
-#, fuzzy
 #~ msgid "Step 3: Connecting to Server"
 #~ msgstr "Vzpostavljam povezavo s strežnikom..."
 
@@ -20586,9 +21325,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "component"
 #~ msgstr "Sestanek"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmi"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Zemljepisna lega"
 
@@ -21182,10 +21918,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Nisem mogel ustvariti imenika %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Izberi stike iz adresarja"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "_Rojstni dan:"
 
@@ -21231,22 +21963,10 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Podatki o kodledarju"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Podatki o kodledarju"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Uvrstitev"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Datum in ura"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Opis:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "_Povzetek:"
 
@@ -21677,9 +22397,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Dobivam rezultate iskanja LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Napaka ob iskanju"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Skladišče, ki ni na mreži"
@@ -21820,10 +22537,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Evolucijin adresarjev veznik"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolucijin veznik Koledarja"
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Evolucijin adresarjev veznik"
 
@@ -21928,9 +22641,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Use Score"
 #~ msgstr "Točke"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kazalec se ni mogel naložiti\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Mapa, ki vsebuje podatke o stikih"
 
@@ -24056,9 +24766,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "View the selected folder"
 #~ msgstr "Poglej izbrane mape"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopiraj..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Vrstica map"
 
@@ -24069,9 +24776,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Pojdi v _mapo..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Prestavi..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Nova mapa"
 
@@ -24079,9 +24783,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Prestavi v mapo"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Preimenuj..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Vrstica z bližnjicami"
 
@@ -24089,9 +24790,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Shortcut..."
 #~ msgstr "_Bližnjica"
 
-#~ msgid "Information"
-#~ msgstr "Podatki"
-
 #~ msgid "Error"
 #~ msgstr "Napaka"
 
@@ -24181,9 +24879,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Ustvari _novo mapo..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Stiki..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Tovarna uvozov datotek LDIF v Evolucijo."
 
@@ -24320,9 +25015,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Show contacts matching the following criteria:"
 #~ msgstr "Kaži stike, ki ustrezajo naslednjim kriterijem:"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "_Stiki..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Vrste telefonov"
 
@@ -24420,9 +25112,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Meeting ends: <b>"
 #~ msgstr "Čas zaključka sestanka: <b>"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Podatki o zasedenosti se končajo: <b>"
-
 #~ msgid "Task Completed: <b>"
 #~ msgstr "Opravilo končano: <b>"
 
@@ -24659,9 +25348,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Open %s with the default GNOME web browser"
 #~ msgstr "Odpri %s s privzetim GNOMEovim brskalnikom"
 
-#~ msgid "Send an email to %s"
-#~ msgstr "Pošlji e-pošto %s"
-
 #~ msgid "Run %s"
 #~ msgstr "Poženi %s"
 
@@ -24733,9 +25419,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Update now"
 #~ msgstr "Posodobi zdaj"
 
-#~ msgid "Update every "
-#~ msgstr "Posodobi vsakih"
-
 #~ msgid "year"
 #~ msgstr "leto"
 
@@ -24988,12 +25671,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "%s may not be reconfigured because it is not a local folder"
 #~ msgstr "%s se ne da nasatviti, saj ni krajevna mapa"
 
-#~ msgid "Moving"
-#~ msgstr "Prestavljam"
-
-#~ msgid "Copying"
-#~ msgstr "Kopiram"
-
 #~ msgid "Executing shell command: %s"
 #~ msgstr "Izvajam ukaz lupine: %s"
 
@@ -25207,9 +25884,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Send _Later"
 #~ msgstr "Pošilji _kaseneje"
 
-#~ msgid "Send _later"
-#~ msgstr "Pošlji _kasneje"
-
 #~ msgid "Configure the task view's settings"
 #~ msgstr "Nastavi pogled nalog"
 
@@ -25498,9 +26172,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Nisem mogel odpreti mape: seznam sporočil je bil nepopoln."
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Nisem uspel prenesti sporočila s strežnika POP %s: %s"
-
 #~ msgid ""
 #~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
 #~ "it."
@@ -25853,9 +26524,6 @@ msgstr "%s (%d%% končano)"
 #~ "prenašanje pošte iz nekaterih spletnih nuditeljev pošte in zaprtih "
 #~ "sistemov e-pošte."
 
-#~ msgid "Could not create composer window."
-#~ msgstr "Nisem mogel ustvariti okna skladatelja."
-
 #~ msgid "%Y/%m/%d"
 #~ msgstr "%d/%m/%Y"
 
@@ -25946,9 +26614,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Show work week"
 #~ msgstr "Kaži en delovni teden"
 
-#~ msgid "Close this appointment"
-#~ msgstr "Zapri ta sestanek"
-
 #~ msgid "Print S_etup"
 #~ msgstr "Nastavitev t_iskanja"
 
@@ -26253,9 +26918,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Customi_ze Toolbars..."
 #~ msgstr "_Prilagodi orodne vrstice..."
 
-#~ msgid "Customize toolbars"
-#~ msgstr "Prliagodi orodne vrstice"
-
 #~ msgid "Save in _folder... (FIXME)"
 #~ msgstr "Shrani v _mapo... (FIXME)"
 
@@ -26919,9 +27581,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_VFolder on Subject"
 #~ msgstr "vMapa glede na _Zadevo"
 
-#~ msgid "Customi_ze..."
-#~ msgstr "_Prilagodi..."
-
 #~ msgid "Show the _Folder Bar"
 #~ msgstr "Kaži vrstico z _mapami"
 
@@ -27159,9 +27818,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Audio"
 #~ msgstr "_Zvok"
 
-#~ msgid "_Program"
-#~ msgstr "_Program"
-
 #~ msgid "event-editor-dialog"
 #~ msgstr "dialog-urejevalec-dogodkov"
 
@@ -27474,9 +28130,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Attaching messages from folder \"%s\""
 #~ msgstr "Prilagam sporočilo iz mape \"%s\""
 
-#~ msgid "Attach messages from \"%s\""
-#~ msgstr "Priloži sporočilo iz mape \"%s\""
-
 #~ msgid "Forwarding messages \"%s\""
 #~ msgstr "Posredujem sporočilo \"%s\""
 
diff --git a/po/sr.po b/po/sr.po
index 751104e1e2..b665046375 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-26 17:35+0100\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -25,14 +25,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "адресар еволуције"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "заглавље контакта: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "визиткарта еволуције"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "текући директоријум адресара"
@@ -56,34 +48,252 @@ msgstr " карте"
 msgid " card"
 msgstr " карта"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "заглавље контакта: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "визиткарта еволуције"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Курсор није могао да буде учитан\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Неуспешна пријава на LDAP сервер"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Сервер је одговорио неподржаним базама за претрагу"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Овај сервер не подржава податке LDAPv3 шеме"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Нисам могао да преузмем чланак %s са NNTP сервера."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Сервер није одговорио са исправним подацима шеме"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Нисам могао да учитам адресар"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Уређивач категорија није доступан."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Сачувај у адресару"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Грешка код учитавања предефинисаног адресара."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Грешка током претраге"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Желите ли да сачувате промене?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Одбаци"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "и још %d контакт."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Не могу да рашчланим садржај поруке"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Грешка код додавања контакта"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Прегледник адреса Еволуција адресара"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за синхронизовање:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Нисам могао да учитам адресар"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Нисам могао да прочитам програмски блок адреса пилота"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонимно приступам LDAP серверу"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Нисам могао да се пријавим.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Самодопуњавање"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sУнеси лозинку за %s (корисник %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Сертификати"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Подесите овде самодопуњавање"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Еволуција адресар"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Искачући прозор за адресе Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Прегледник адреса Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Прегледник Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Део Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Управљање S/MIME сертификатима из Еволуције"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Управљање подешавањем директоријума из Еволуције"
+
+# bug: s/manager/manage/
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Овде управљајте вашим S/MIME сертификатима"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -116,7 +326,7 @@ msgstr "Нови контакт"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Контакти:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -140,15 +350,15 @@ msgid "Migrating `%s':"
 msgstr "Преносим „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "На овом рачунару"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -157,19 +367,19 @@ msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "На LDAP серверима"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Подешавање самодопуњавања"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,7 +391,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -193,7 +403,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -205,7 +415,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -217,36 +427,45 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Обриши"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Особине..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонимно приступам LDAP серверу"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Нисам могао да се пријавим.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sУнеси лозинку за %s (корисник %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -267,62 +486,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Адреса за директоријум последње коришћен у прозорчету за избор имена"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Самодопуњавање"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Сертификати"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Подесите овде самодопуњавање"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Еволуција адресар"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Искачући прозор за адресе Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Прегледник адреса Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Прегледник Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Део Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Управљање S/MIME сертификатима из Еволуције"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Управљање подешавањем директоријума из Еволуције"
-
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Овде управљајте вашим S/MIME сертификатима"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -330,7 +493,7 @@ msgstr "Овде управљајте вашим S/MIME сертификатим
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -339,8 +502,7 @@ msgstr "Овде управљајте вашим S/MIME сертификатим
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -366,6 +528,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Идентификација"
@@ -414,13 +577,11 @@ msgid "Anonymously"
 msgstr "Анонимно"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основно"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детаљи"
 
@@ -681,33 +842,26 @@ msgstr "карте"
 
 # bug: plural-forms
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минута"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "Уклони све"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Уклони све"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Погледај листу контакт листу"
@@ -722,7 +876,7 @@ msgid "Send HTML Mail?"
 msgstr "Пошаљи HTML поруку?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Додај у контакте"
 
@@ -730,15 +884,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Изаберите контакте из адресара"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -760,6 +921,11 @@ msgstr "_Категорија:"
 msgid "_Find"
 msgstr "_Нађи"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Прона_ђи"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -806,9 +972,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Радна недеља</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "АИМ"
 
@@ -833,7 +998,6 @@ msgid "Birthday:"
 msgstr "Рођенда_н"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Календар:"
 
@@ -848,15 +1012,15 @@ msgid "Company:"
 msgstr "Наредба:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Уредник контаката"
 
@@ -965,8 +1129,8 @@ msgstr "_Веб страница:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -988,44 +1152,28 @@ msgid "_File under:"
 msgstr "Назив датотеке:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Јесте ли сигурни да хоћете\n"
-"да обришете ове контакте?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Јесте ли сигурни да хоћете\n"
-"да обришете овај контакт?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Адреса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Може се мењати"
 
@@ -1998,132 +2146,124 @@ msgstr "Замбија"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "АОЛ брза порука"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Џабер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Јаху"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "МСН"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Јаху гласник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "Групвајз"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Услуга"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Место"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Корисничко име"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Кућа"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Друго"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Јаху"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "МСН"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Групвајз"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Изворни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Одредишни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Промењен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Овај контакт припада овим категоријама"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Молим изаберите од следећих опција"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Датум повраћаја није добар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Неисправна сврха"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Одбаци"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "АОЛ брза порука"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Јаху гласник"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Услуга"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Место"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Корисничко име"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
@@ -2141,6 +2281,22 @@ msgstr "_Пуно име:"
 msgid "E-_mail:"
 msgstr "Е-_пошта:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Јесте ли сигурни да хоћете\n"
+"да обришете ове контакте?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Јесте ли сигурни да хоћете\n"
+"да обришете овај контакт?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адреса _2:"
@@ -2263,48 +2419,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Изаберите садржај из адресара"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Чланови"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Уклони одабране предмете са листе прилога"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Одабрано"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Сакриј адресе када шаљеш пошту на ову листу"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Име _листе:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Укуцајте електронску адресу или превуците контакт у доњу листу:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "уредник-контакт-листе"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "прозорче1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Књига"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Да ли је нова листа"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Обавезно присуство"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Уредник контакт листе"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Сачувај листу као VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Промењен контакт:"
@@ -2343,422 +2520,11 @@ msgstr ""
 "у овом директоријуму. Желите ли свеједно да додате?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(мапа)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "мапа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Испиши чланове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Е-пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Организација"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Положај"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Групвајз"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Видео конференције"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "посао"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "Беб"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Блогче"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мобилни телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "лично"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Напомена"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Улога на послу"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Е-пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Лична страница"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Успех"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Архива није на мрежи"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Адресар не постоји"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Нова контакт листа"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Забрањен приступ"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Контакт није пронађен"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "ИБ контакта већ постоји"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Протокол није подржан"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Поништено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не могу да отворим извор"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Пријава неуспела"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Пријава обавезна"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS није доступан"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Нема такве поруке"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Друга грешка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Нисмо успели да отворимо овај адресар. Проверите да путања постоји и да "
-"имате права приступа."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
-"адресу, или је LDAP сервер недоступан."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Ова верзија Еволуције нема подршку за LDAP у себи. Уколико желите да "
-"користите LDAP у Еволуцији морате да изградите програм из изворног кода у "
-"СУВ-у (CVS) пошто преузмете OpenLDAP са следеће адресе."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
-"адресу или је сервер недоступан."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Више карти одговара упиту који је или сервер тако  \n"
-"подешен вратио или Еволуција тако подешена да покаже.\n"
-"Молим да прецизније формулишете упит или повећате лимит\n"
-"броја резултата у подешавањима адресара за сервер директоријума."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Време за извршавање овог упита је преко лимита сервера или лимита\n"
-"који сте подесили за овај адресар. Молим да прецизније формулишете\n"
-"упит или повећате временски лимит у подешавањима адресара\n"
-"за сервер директоријума."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Основни процес овог адресара није могао да обради упит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Основни процес овог адресара је одбио да обради овај упит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Овај упит није успешно завршен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Грешка код додавања листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Грешка код додавања контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Грешка код измене листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Грешка при измени контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Грешка код уклањања листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Грешка код уклањања контакта"
-
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 контаката ће отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате све ове контакте?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s већ постоји\n"
-"Желите ли да препишете новим уносом?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Препиши"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "листа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Премести контакт у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Умножи контакт у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Премести контакте у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Умножи контакте у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Изаберите одредишни адресар."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Вишеструке VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard за %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(празно)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Основна Е-пошта"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Одабери акцију"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Унеси нови контакт \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Додај адресу постојећим контактима \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Претражујем адресар..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Промени податке о контакту"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Споји електронске адресе"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "и још %d контакт."
-msgstr[1] "и још %d контакта."
-msgstr[2] "и још %d контаката."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Прикажи целу визит карту"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Прикажи сажету визит карту"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Сачувај у адресару"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Нема контакта"
@@ -2773,9 +2539,9 @@ msgstr[2] "%d контаката"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Упит"
 
@@ -2791,130 +2557,130 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорија је"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Напредно..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Адресар"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Сачувај као VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Нов контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Нова листа контаката..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Иди у директоријум..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Увези..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Тражим контакте..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Извори адресара..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Подешавања пилота"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Проследи контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Пошаљи контакту поруку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Штампај"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Штампај коверат"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Умножи у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Пребаци у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Исеци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Умножи"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Убаци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Тренутан поглед"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Било која категорија"
@@ -2948,6 +2714,8 @@ msgid "Car Phone"
 msgstr "Телефон у колима"
 
 #: 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:3
 msgid "Categories"
 msgstr "Категорије"
 
@@ -2955,6 +2723,21 @@ msgstr "Категорије"
 msgid "Company Phone"
 msgstr "Телефон фирме"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Е-пошта"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Е-пошта 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Е-пошта 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Презиме"
@@ -2991,14 +2774,29 @@ msgstr "Дневник"
 msgid "Manager"
 msgstr "Управник"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мобилни телефон"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Надимак"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Напомена"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Канцеларија"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Организација"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Други факс"
@@ -3050,29 +2848,21 @@ msgstr "Јединица"
 msgid "Web Site"
 msgstr "Интернет адреса"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Висина"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Има фокус"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Одабрано"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Има курсор"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поље"
@@ -3089,7 +2879,11 @@ msgstr "Модел текста"
 msgid "Max field name length"
 msgstr "Највећа дужина имена поља"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ширина колоне"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3103,7 +2897,7 @@ msgstr ""
 "\n"
 "Кликните два пута да направите нови контакт."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3113,13 +2907,392 @@ msgstr ""
 "\n"
 "Нема шта да се покаже у овом погледу."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина колоне"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Одабрано"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Има курсор"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(мапа)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "мапа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Испиши чланове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Е-пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Положај"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Видео конференције"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "посао"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "Беб"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Блогче"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "лично"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Улога на послу"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Лична страница"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Успех"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Архива није на мрежи"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Адресар не постоји"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Нова контакт листа"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Забрањен приступ"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Контакт није пронађен"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "ИБ контакта већ постоји"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Протокол није подржан"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Поништено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не могу да отворим извор"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Пријава неуспела"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Пријава обавезна"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS није доступан"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Нема такве поруке"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Друга грешка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Нисмо успели да отворимо овај адресар. Проверите да путања постоји и да "
+"имате права приступа."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
+"адресу, или је LDAP сервер недоступан."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ова верзија Еволуције нема подршку за LDAP у себи. Уколико желите да "
+"користите LDAP у Еволуцији морате да изградите програм из изворног кода у "
+"СУВ-у (CVS) пошто преузмете OpenLDAP са следеће адресе."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
+"адресу или је сервер недоступан."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Више карти одговара упиту који је или сервер тако  \n"
+"подешен вратио или Еволуција тако подешена да покаже.\n"
+"Молим да прецизније формулишете упит или повећате лимит\n"
+"броја резултата у подешавањима адресара за сервер директоријума."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Време за извршавање овог упита је преко лимита сервера или лимита\n"
+"који сте подесили за овај адресар. Молим да прецизније формулишете\n"
+"упит или повећате временски лимит у подешавањима адресара\n"
+"за сервер директоријума."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Основни процес овог адресара није могао да обради упит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Основни процес овог адресара је одбио да обради овај упит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Овај упит није успешно завршен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Грешка код додавања листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Грешка код додавања контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Грешка код измене листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Грешка при измени контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Грешка код уклањања листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Грешка код уклањања контакта"
+
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 контаката ће отворити и %d нових прозора.\n"
+"Да ли стварно желите да погледате све ове контакте?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s већ постоји\n"
+"Желите ли да препишете новим уносом?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Препиши"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "листа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Премести контакт у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Умножи контакт у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Премести контакте у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Умножи контакте у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Изаберите одредишни адресар."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Вишеструке VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard за %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(празно)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Основна Е-пошта"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Одабери акцију"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Унеси нови контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Додај адресу постојећим контактима \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Претражујем адресар..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Промени податке о контакту"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Споји електронске адресе"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "и још %d контакт."
+msgstr[1] "и још %d контакта."
+msgstr[2] "и још %d контаката."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Прикажи целу визит карту"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Прикажи сажету визит карту"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сачувај у адресару"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3163,6 +3336,11 @@ msgstr "Еволуција VCard увозник"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Штампај коверту"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Штампај контакте"
@@ -3172,11 +3350,6 @@ msgstr "Штампај контакте"
 msgid "Print contact"
 msgstr "Штампај контакт"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Штампај коверту"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 п. Тахома"
@@ -3361,6 +3534,22 @@ msgstr "Проба штампе контакта"
 msgid "This should test the contact print code"
 msgstr "Ово испробава код за штампу контаката"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Не могу да отворим датотеку"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Нисам могао да учитам адресар"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не могу да отворим адресар"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
@@ -3419,22 +3608,6 @@ msgstr "У обичном режиму, не сме се дати опција �
 msgid "Impossible internal error."
 msgstr "Немогућа унутрашња грешка."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Не могу да отворим датотеку"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Нисам могао да учитам адресар"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Не могу да отворим адресар"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Грешка код учитавања предефинисаног адресара."
@@ -3451,39 +3624,362 @@ msgstr "Име датотеке није дато."
 msgid "Unnamed List"
 msgstr "Листа без имена"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не бриши"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Пошаљи коме:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Сигурно желите да поништите и обришете овај састанак?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Сигурно желите да избришете %d задужење"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Сигурно желите да поништите и обришете овај унос у дневник?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Сигурно желите да избришете %d унос у дневник?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Сигурно желите да избришете %d заказани састанак?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Сигурно желите да обришете задужење `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Сигурно желите да избришете унос у дневник `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Сигурно желите да обришете задужење `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Сигурно желите да избришете унос у дневник `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Заказани састанак"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Желите ли да сачувате промене?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Унели сте измене. Да их заборавим и освежим променама уредник?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Занемари промене"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Сачувај поруку..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Пошаљи"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Основни процес локалних датотека Еволуције календара"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Унесите лозинку"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Подели вишедневне догађаје:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Нисам могао да покренем вомбат сервер"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Нисам могао да покренем вомбат"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Нисам могао да прочитам програмски блок Календара"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Предефинисан приоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Нисам могао да прочитам пилотов ToDo програмски блок"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календар и задаци"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Подесите вашу временску зону, календар и листу задатака овде "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Еволуција календар и задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Контрола подешавања Еволуција календара"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Прегледник заказаних порука Еволуција календара"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задужења"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Покрећем:"
@@ -3583,10 +4079,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Нисам успео да покренем Бонобо"
@@ -3727,9 +4219,29 @@ msgstr "Да ли да приказујем време у 24ч облику ум
 msgid "Whether to show week numbers in date navigator"
 msgstr "Да ли да приказује бројеве недеља у избирачу датума"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Сажетак садржи"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Опис садржи"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Коментар садржи"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Путања садржи"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Нерасподељено"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3751,8 +4263,8 @@ msgid "Purge events older than"
 msgstr "Обриши догађаје старије од"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "дана"
 
@@ -3763,7 +4275,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3812,62 +4324,52 @@ msgstr "Не могу да отворим календар „%s“ ради п�
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Календари"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Нови заказани састанак"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "Заказани _састанак"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Закажи састанак"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Сачини нови захтев за састанак"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Цело_дневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Сачини нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "К_алендар"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Направи нови календар"
 
@@ -3897,26 +4399,6 @@ msgstr "Недељни преглед"
 msgid "Month View"
 msgstr "Месечни преглед"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Сажетак садржи"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Опис садржи"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Коментар садржи"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Путања садржи"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Нерасподељено"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Грешка код отварања календара"
@@ -3934,225 +4416,134 @@ msgstr "Забрањен приступ календару"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Опције за звучни аларм"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Опције за текстуални аларм"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Опције за аларм преко Е-поште"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Опције за програм аларма"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Непознате опције за аларм"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Понављање аларма"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Порука за приказ:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Порука за слање"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Пусти звук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Понови аларм"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Покрени програм:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Пошаљи коме:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Са овим аргументима:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "прозорче1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Звук аларма</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "покажи још на сваких"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Опис</b>"
 
-# bug: plural-forms
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "сати"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Подсетници</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Дејство/покрени"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Аларми"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Додај"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Састави поруку"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Основе"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Датум/Време:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "По_руке"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Пусти звук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Подсетници"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Покрени програм"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Пошаљи коме:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Пошаљи електронску поруку"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Закључак:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Налог:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Опције..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Покрени програм"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Понови аларм"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Пошаљи"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "након"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "пре"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "дан(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "крај заказаног састанка"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "покажи још на сваких"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "сат(а)"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "сати"
+
+# bug: plural-forms
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "минут(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "почетак заказаног састанка"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Морате навести путању са које да преузмем календар"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Путања извора „%s“ није исправног облика."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Путања извора „%s“е представља вебкал извор."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Извор имена „%s“ већ постоји у изабраној групи"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Група „%s“ је удаљена. Морате навести путању са које да преузмем календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Додај нови календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Група списка задужења"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Боје"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Изаберите боју"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Додај нови календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Додај групу..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Освежи"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Дејство/покрени"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_Адреса:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Додај"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "недеље"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Аларми"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4267,7 +4658,7 @@ msgid "Free/Busy Publishing"
 msgstr "_Објава стања слободан/заузет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Петак"
@@ -4281,7 +4672,7 @@ msgid "Minutes"
 msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понедељак"
@@ -4291,7 +4682,7 @@ msgid "S_un"
 msgstr "Н_ед"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
@@ -4305,7 +4696,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Покажи _бројеве недеља у навигатору за датуме"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Недеља"
@@ -4319,7 +4710,7 @@ msgid "T_hu"
 msgstr "У_то"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвртак"
@@ -4333,7 +4724,7 @@ msgid "Time format:"
 msgstr "Формат за време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Уторак"
@@ -4343,7 +4734,7 @@ msgid "W_eek starts:"
 msgstr "Почетак н_едеље:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Среда"
@@ -4376,7 +4767,8 @@ msgstr "_Скупи недеље у месечни приказ"
 msgid "_Day begins:"
 msgstr "Почетак _дана:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4426,6 +4818,80 @@ msgstr "_Сре"
 msgid "before every appointment"
 msgstr "пре сваког заказаног састанка"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Морате навести путању са које да преузмем календар"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Путања извора „%s“ није исправног облика."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Путања извора „%s“е представља вебкал извор."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Извор имена „%s“ већ постоји у изабраној групи"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Група „%s“ је удаљена. Морате навести путању са које да преузмем календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Додај нови календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Група списка задужења"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Боје"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Изаберите боју"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Додај нови календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Додај групу..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Освежи"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_Адреса:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "недеље"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
@@ -4470,81 +4936,75 @@ msgstr "%s Унели сте измене. Да их заборавим и ос�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Нисте унели измене, да освежим променама уредник?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Грешка при провери: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " за "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Завршено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Завршено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (До "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "До "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Нисам могао да освежим променама објекат"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Измени заказани састанак"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказани састанак - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Задужење - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Унос у дневник - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Нема сажетка"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Сачувај као..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Измене учињене на овом предмету могу бити занемарене ако буде освежен "
 "променама"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Не могу да користим текућу верзију!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Грешка при провери: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " за "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Завршено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Завршено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (До "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "До "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Не могу да отворим извор"
@@ -4606,8 +5066,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Унос није могао бити обрисан услед грешке"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Адресар..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Контакти"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4617,160 +5078,224 @@ msgstr "Делегирај за:"
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Заказани састанак"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Подсетник"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Информација"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Састанак"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Догађај без почетног датума"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Догађај без крајњег датума"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Почетни датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Крајњи датум је погрешан"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Почетно време је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Крајње време је погрешно"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Не могу да отворим календар „%s“."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "пре сваког заказаног састанка"
+msgstr[1] "пре сваког заказаног састанка"
+msgstr[2] "пре сваког заказаног састанка"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "крај заказаног састанка"
+msgstr[1] "крај заказаног састанка"
+msgstr[2] "крај заказаног састанка"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "пре сваког заказаног састанка"
+msgstr[1] "пре сваког заказаног састанка"
+msgstr[2] "пре сваког заказаног састанка"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Ц_елодневни догађај"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "пре сваког заказаног састанка"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "З_узет"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "пре сваког заказаног састанка"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ка_тегорије..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "пре сваког заказаног састанка"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Списак задужења</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Класификација"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Датум и време</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "По_верљиво"
+msgid "A_ll day event"
+msgstr "Ц_елодневни догађај"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Датум и време"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Сачувај подешени преглед..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Слободно"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ка_тегорије..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Место:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Календар:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Лич_но"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Класификација"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Ја_вно"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Поверљиво"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Прикажи време као"
+msgid "L_ocation:"
+msgstr "_Место:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Лично"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Јавно"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Прикажи време као"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Саж_етак:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Аларми"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Опис:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Крајње време:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Почетно време:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ништа"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Изабрани организатор више нема налог."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Захтева организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Најмање један присутни је потребан."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Делегирај за..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Обриши"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Уклони"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4809,35 +5334,45 @@ msgid "Member"
 msgstr "Члан"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стање"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Додај прису_тног"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Узбуне</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Додај пошиљаоца у адреса_р"
+msgid "<b>Organizer</b>"
+msgstr "<b>Онда</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Промени организатора"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Контакти"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Промени организатора"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Организатор:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4905,149 +5440,143 @@ msgstr "Ова и будућа појава"
 msgid "All Instances"
 msgstr "Све појаве"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Овај заказани састанак садржи повратне податке које Еволуција не може "
 "изменити."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Датум повраћаја није добар"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "првој"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "другој"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "трећој"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "четвртој"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "последњој"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Други датум"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "дан"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "појаве"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Датум/време"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Опис</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Приказ</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Повраћај"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Сваки"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Изузеци"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Изглед"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Правило за понављање"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Посебно понављање"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Измени"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Без понављања"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Једноставно понављање"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Измени састанак"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "за"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "увек"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "месец(и)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "до"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "недеља(е)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "година(е)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Изаберите одредиште %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Одредишни директоријум:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Списак задужења"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Фонтови поруке</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _готово"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Упозорења</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Готово"
 
@@ -5059,8 +5588,8 @@ msgstr "Висок"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "У току"
@@ -5072,22 +5601,22 @@ msgid "Low"
 msgstr "Низак"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Обичан"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Није покренут"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Напредак"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Проценат завршеног: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5110,36 +5639,42 @@ msgstr "_Статус:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Задужење"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Задатак"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не могу да отворим задужења у „%s“."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Пов_ерљиво"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Опције</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Брисање поште</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Опис:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Директоријум:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Датум п_очетка:"
@@ -5148,52 +5683,58 @@ msgstr "Датум п_очетка:"
 msgid "_Due date:"
 msgstr "Датум _рока:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Лична идентификација за HTTP сервер."
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Група:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Изабрани календари за објављивање"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Опције календара</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Свакодневно"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Учесталост објављивања"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Уређивање стања слободан/заузет"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Путања објављивања стања слободан/заузет"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Путања објављивања стања слободан/заузет"
+msgid "Free/Busy Editor"
+msgstr "Уређивање стања слободан/заузет"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Пријавно име:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Свакодневно"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Лозинка:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Пошта:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Учесталост објављивања"
+#, fuzzy
+msgid "_Password:"
+msgstr "Лозинка:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Запамти лозинку"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "Адреса (URL):"
+#, fuzzy
+msgid "_Username:"
+msgstr "Корисничко_име"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Корисник објављује"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Недељно"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5280,7 +5821,7 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
@@ -5289,6 +5830,11 @@ msgstr "Кликните да отворите %s"
 msgid "Untitled"
 msgstr "Без имена"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Закључак:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5300,7 +5846,7 @@ msgstr "Датум завршетка:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Стање:"
 
@@ -5313,20 +5859,93 @@ msgstr "Важност:"
 msgid "Web Page:"
 msgstr "_Веб страница:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Јавно"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Крајњи датум"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Лично"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Почетни датум"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Поверљиво"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Извештај"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Слободан"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Заузет"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ј"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "И"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географско место мора бити унето у облику: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Не"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Непознато"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Повратно"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Додељено"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5372,95 +5991,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Слободан"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заузет"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Бришем изабране објекте"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Уносим промене у објекте"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отвори"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Отвори _веб страницу"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Штам_пај..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Исеци"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Копирај"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Умет_ни"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Додели задужење"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Проследи као iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Обележи као завршено"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Обележи изабрана задужења као завршена"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Обриши"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Обриши изабрана задужења"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Сачувај као..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Притисни за ново задужење"
 
@@ -5469,176 +6094,107 @@ msgstr "Притисни за ново задужење"
 msgid "% Complete"
 msgstr "% Готово"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Завршено"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Датум рока"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Почетни датум"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Извештај"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Разврстана задужења"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Померам поруке"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Копирам поруке"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Нов заказан _састанак..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Ново задужење"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Изабери _нит"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Изабери..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Објави слободан/заузет информацију"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ирај у календар..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Прене_си у календар..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Иди на _данас"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Иди на датум..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Подешавања..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Крајњи датум"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Почетни датум"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Непознато"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Повратно"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Додељено"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Да"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ј"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "И"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географско место мора бити унето у облику: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5662,36 +6218,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутни размаци"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутни размаци"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5767,37 +6323,35 @@ msgid ", ending on "
 msgstr ", завршавајући се "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Почетак:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Крај:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Стање"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Завршетак:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>До:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "До "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar информација"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar грешка"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Непозната особа"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5805,305 +6359,285 @@ msgstr ""
 "<br> Молим проверите следећу информацију, и потом одаберите акцију из доњег "
 "менија."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ништа</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Место:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Одбијено"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Изабери акцију:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Ажурирај"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ОК"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Прихвати"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Одбиј"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободан/заузет информацију"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Ажурирај стање странке"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Пошаљи најновију информацију"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Одустани"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> је објавио информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Информација о састанку"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> тражи Ваше присуство на састанку."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Предлог за састанак"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жели да дода постојећем састанку"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Промена састанка"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добије најновију информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Захтев за новим подацима о састанку"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> је одговорио на захтев о састанку."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Одговор за састанак"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> је отказо састанак."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Отказивање састанка"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> је послао неразумљиву поруку."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Лоша порука о састанку"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> је објавио информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> тражи %s за обављање задужења."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> тражи да Ви извршите задужење."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Предлог за задужење"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b жели да дода на постојеће задужење."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Ажурирање задужења"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Захтев за променама задужења"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> је одговорио на додељено задужење."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Одговор на задужење"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> је отказао задужење."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Отказивање задужења"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Лоша порука о задужењу"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> је објавио слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Слободан/заузет информација"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> тражи Вашу слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Слободан/заузет захтев"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> је одговорио на слободан/заузет захтев."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Слободан/заузет одговор"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободан/заузет порука"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Порука изгледа да није исправно сачињена"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Порука садржи само неподржане захтеве."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прилог не садржи исправну поруку за календар"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема делове календара који се могу прегледати"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Ажурирање завршено\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Стање присутног не може бити ажурирано јер унос више не постоји"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат је неисправан и не може бити ажуриран\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао тренутно присутан. Да га додам у присутне?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање присутног није могло бити ажурирано због неисправног стања!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Настала је грешка у CORBA систему\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Објекат није могао бити пронађен\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Немате праве дозволе за ажурирање календара\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Ажурирано стање присутног\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Стање присутног није могло бити ажурирано!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Стање присутног не може бити ажурирано јер унос више не постоји"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Уклањање завршено"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Унос послат!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Унос није могао бити послат!\n"
 
@@ -6132,6 +6666,10 @@ msgstr "Учитавам календар"
 msgid "Loading calendar..."
 msgstr "Учитавам календар..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Порука сервера:"
@@ -6148,11 +6686,6 @@ msgstr "почетни-датум"
 msgid "Chair Persons"
 msgstr "Председништво"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Обавезно присуство"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Слободно присуство"
@@ -6220,6 +6753,28 @@ msgstr "Делегирано"
 msgid "In Process"
 msgstr "У току"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ван канцеларије"
@@ -6228,98 +6783,64 @@ msgstr "Ван канцеларије"
 msgid "No Information"
 msgstr "Без информације"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Додај пошиљаоца у адреса_р"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Опције"
+msgid "O_ptions"
+msgstr "Опције"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Покажи _само радне сате"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Покажи _умањено"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Ажурирај слободан/заузет"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Сам бира"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Све особе и сви извори"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Све особе и један извор"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Обавезне особе"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Обавезне особе и _један извор"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "_Почетно време састанка:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "_Крајње време састанка:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Унесите лозинку за „%s“"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6328,116 +6849,51 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Учитавам задужења"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварам задужења у %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Грешка при отварању %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Учитавам задужења"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Испуњавам задужења..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Бришем изабране објекте..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Избацујем"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задужења"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Уносим промене у објекте"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавам заказане састанке са %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавам задужења са %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Брише"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Календар и задаци"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Подесите вашу временску зону, календар и листу задатака овде "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Еволуција календар и задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Контрола подешавања Еволуција календара"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Прегледник заказаних порука Еволуција календара"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Календари"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задужења"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6785,10 +7241,6 @@ msgstr "Изабран месец (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Изабрана година (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Задужење"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6819,7 +7271,7 @@ msgid "Contacts: "
 msgstr "Конаткти: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Штампај приказ"
 
@@ -6848,7 +7300,7 @@ msgstr[0] "%d карата"
 msgstr[1] "%d карата"
 msgstr[2] "%d карата"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6872,35 +7324,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за додавање задужења"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Ново задужење"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Задужење"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Унеси ново задужење"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Дискусионе групе"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Група списка задужења"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Унеси ново задужење"
@@ -8578,69 +9024,69 @@ msgstr "Припремам директоријум '%s' за рад без мр
 msgid "You must be working online to complete this operation"
 msgstr "Морате да будете на мрежи да би завршили ову операцију"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Неисправан низ порука примљен од %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Синхронизујем директоријуме"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка код читања филтера: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка код примене филтера: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Нисам могао да отворим директоријум за смештање реда"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Нисам могао да прођем кроз директоријум са редом"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Примам поруку %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Не могу да отворим поруку"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка код поруке %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Синхронизујем директоријум"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Примам поруку %d од %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка код поруке %d од %d"
@@ -8662,42 +9108,6 @@ msgstr "Неипсравни аргументи за (корисничка-оз�
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка код примене филтера за претрагу: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподржана операција: прикључена порука: за %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподржана операција: претрага по изразу: за %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподржана операција: претрага по uid-у: за %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Померам поруке"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Копирам поруке"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Измена стања ђубрета"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Филтрирам нове поруке"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8743,7 +9153,43 @@ msgstr "(одговара-све) захтева само један логич�
 msgid "Performing query on unknown header: %s"
 msgstr "Извршавам претрагу на непознато заглавље: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподржана операција: прикључена порука: за %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподржана операција: претрага по изразу: за %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Неподржана операција: претрага по uid-у: за %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Померам поруке"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копирам поруке"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Измена стања ђубрета"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Филтрирам нове поруке"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8754,15 +9200,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Нисам могао да прочитам gpg userid подсетник."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Нисам могао да прочитам захтев за gpg лозинком"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8771,28 +9217,28 @@ msgstr ""
 "Потребна вам је лозинка за откључавање кључа\n"
 "корисника: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Поништено."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Нисам могао да откључам тајни кључ: дате су 3 погрешне лозинке."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочекиван одговор од GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Нисам могао да шифрирам: нису означени исправни примаоци. "
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8803,62 +9249,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Нисам могао да применим GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Нисам могао да образујем податке за потписивање: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Нисам могао да извршим gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Нисам могао да извршим gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ово је део поруке са дигиталним потписом"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Не могу да проверим потпис поруке: неисправан облик поруке"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не могу да проверим потпис поруке: нисам могао да направим temp датотеку: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Нисам могао да образујем податке за шифровање: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ово је дигитално шифрован део поруке"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Шифрован садржај"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Не могу да рашчланим садржај поруке"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не могу да направим везу ка помоћнику закључавања: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не могу да поделим помоћника закључавања: %s"
+
+#: 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': грешка у протоколу са помоћником закључавања"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Нисам могао да закључам '%s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8881,27 +9348,6 @@ msgstr "Нисам могао да закључам користећи fcntl(2):
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Нисам могао да закључам користећи flock(2): %s "
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не могу да направим везу ка помоћнику закључавања: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не могу да поделим помоћника закључавања: %s"
-
-#: 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': грешка у протоколу са помоћником закључавања"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Нисам могао да закључам '%s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9152,7 +9598,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Лош одговор на пријаву од сервера."
 
@@ -9235,55 +9681,55 @@ msgstr "POP пре SMTP auth коришћењем извора који није
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Неуспела компилација регуларног израза: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s тражи део са корисничким именом'"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s тражи део са именом домаћина"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s тражи део са путањом"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Налазим: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Грешка код претраге за именом: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Неуспело налажење домаћина: не може да образује нит: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Неуспело налажење домаћина: %s: домаћин није пронађен"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Неуспело налажење домаћина: %s: непознат разлог"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Налазим адресу"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Неуспело налажење домаћина: домаћин није пронађен"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Неуспело налажење домаћина: непознат разлог"
 
@@ -9359,7 +9805,7 @@ msgstr "Сертификат за ши_фровање:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Нисам могао да направим S/MIME контекст за дешифрирање."
@@ -9450,7 +9896,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Исправан потпис"
 
 #: camel/camel-smime-context.c:651
@@ -9465,49 +9911,48 @@ msgstr "Неуспела DATA команда"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Нисам могао да нађем сертификат за \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Нисам могао да нађем општи bulk алгоритам."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "На_прави правило од поруке"
+msgid "Cannot create CMS Message"
+msgstr "Не могу да отворим поруку"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Не могу да отворим поруку"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Не могу да приложим датотеку %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Не могу да приложим датотеку %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Не могу да отворим поруку"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Нисам могао да направим S/MIME контекст за дешифрирање."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9554,7 +9999,8 @@ msgstr "Не могу да направим директоријум „%s“: �
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем директоријум: %s: неисправна операција"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не могу да променим име  директоријуму: %s: неисправна операција"
@@ -9563,8 +10009,8 @@ msgstr "Не могу да променим име  директоријуму:
 msgid "Trash"
 msgstr "Смеће"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ђубре"
 
@@ -9684,7 +10130,7 @@ msgstr "Употреба кључа не подржава потпис серт�
 msgid "Error in application verification"
 msgstr "Грешка код провере програма"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9697,11 +10143,11 @@ msgstr ""
 "Ознака:       %s\n"
 "Потпис:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ДОБАР"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "ЛОШ"
 
@@ -9725,7 +10171,7 @@ msgstr ""
 "Желите ли свеједно да прихватите?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9740,7 +10186,7 @@ msgstr ""
 "\n"
 "Желите ли да прихватите?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9749,7 +10195,7 @@ msgstr ""
 "Проблем са сертификатом: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9758,7 +10204,7 @@ msgstr ""
 "Лош домен сертификата: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9767,7 +10213,7 @@ msgstr ""
 "Истекао сертификат: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9776,7 +10222,7 @@ msgstr ""
 "Истекла листа признатих сертификата: %s\n"
 "Издавач: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Нисам могао да обрадим URL `%s"
@@ -9800,7 +10246,7 @@ msgstr "Не могу да копирам или преместим поруке
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не могу да обришем директоријум: %s: нема таквог директоријума"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не могу да променим име  директоријуму: %s: нема таквог директоријума"
@@ -9819,8 +10265,8 @@ msgid "Checking for new mail"
 msgstr "Проверавам за нове поруке"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Провери за нове поруке у свим директоријумима"
 
@@ -9850,8 +10296,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "За приступ Новел Групвајз серверима"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9870,319 +10316,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Попис"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неочекиван одговор од IMAP сервера %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Не могу да изаберем директоријум „%s“: неисправно име сандучета"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Веза са ИМАП сервером %s је неочекивано прекинута: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Примих одговор BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не могу да преузмем директоријум „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не могу да преузмем директоријум „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Не могу да добијем поруку: %s из директоријума %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Не могу да добијем поруку: %s из директоријума %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Не могу додати поруку у mh директоријум: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не могу да добијем поруку: %s из директоријума %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не могу да добијем поруку: %s из директоријума %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Директоријуми"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Покажи само одабране директоријуме"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Премости формат имена директоријума које даје сервер"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Формат имена"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "За читање и смештање поште на IMAP сервере."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP сервер %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP сервис за %s на %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL није доступан"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Повезивање поништено"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Нисам могао да се повежем на IMAP сервер %s у безбедном режиму: сервер не "
-"подржава STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Нисам могао да се повежем на IMAP сервер %s у сигурносном моду: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Непозната грешка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Нисам могао да се пријавим на ИМАП сервер %s помоћу механизма пријаве „%s“"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sУнесите ИМАП лозинку корисника „%s“ на рачунару %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не могу да преузмем директоријум „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Име директоријума \"%s\" није исправно јер садржи карактер \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Не могу да направим директоријум „%s“: неисправно име сандучета"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не могу да направим директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Не могу да обришем директоријум „%s“: нарочити директоријум"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Не могу да обришем директоријум „%s“: неисправно име сандучета"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Наредба:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-"Не могу да се претплатим на директоријум „%s“: неисправно име сандучета"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не могу да се претплатим на директоријум „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Не могу да се одјавим са директоријума „%s“: неисправно име сандучета"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не могу да се одјавим са директоријума „%s“: лоша наредба"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неочекивани елемент у одговору ИМАП сервера %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Нема података"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Веза са ИМАП сервером %s је неочекивано прекинута: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Операција обустављена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Веза са сервером је неочекивано искључена: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Непозната грешка"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10251,7 +10406,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10323,6 +10478,27 @@ msgstr "Користи произвољну наредбу за повезива
 msgid "Command:"
 msgstr "Наредба:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Директоријуми"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Покажи само одабране директоријуме"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Премости формат имена директоријума које даје сервер"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Формат имена"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Примени филтере на нове поруке у INBOX-у овог сервера"
@@ -10343,43 +10519,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на IMAP сервере."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP сервер %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP сервис за %s на %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL није доступан"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Повезивање поништено"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Нисам могао да се повежем на IMAP сервер %s у сигурносном моду: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS екстензија није подржана."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL преговори нису успели"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Нисам могао да се повежем помоћу наредбе %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не подржава тражени тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Нема подршке за тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМолим унесите IMAP лозинку за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Нисте унели лозинку."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10390,30 +10615,278 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Нема таквог директоријума %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Име директоријума \"%s\" није исправно јер садржи карактер \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Главни директоријум не може садржати директоријуме у себи"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Непознати главни директоријум: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Нисам могао да се пријавим на POP сервер %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неочекиван одговор од IMAP сервера %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Неочекиван одговор од IMAP сервера: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не могу да изаберем директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Веза са ИМАП сервером %s је неочекивано прекинута: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Примих одговор BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не могу да преузмем директоријум „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не могу да преузмем директоријум „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Не могу да добијем поруку: %s из директоријума %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Не могу да добијем поруку: %s из директоријума %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Не могу додати поруку у mh директоријум: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не могу да добијем поруку: %s из директоријума %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не могу да добијем поруку: %s из директоријума %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "За читање и смештање поште на IMAP сервере."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Нисам могао да се повежем на IMAP сервер %s у безбедном режиму: сервер не "
+"подржава STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Нисам могао да се пријавим на ИМАП сервер %s помоћу механизма пријаве „%s“"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sУнесите ИМАП лозинку корисника „%s“ на рачунару %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не могу да преузмем директоријум „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не могу да направим директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не могу да направим директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не могу да обришем директоријум „%s“: нарочити директоријум"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не могу да обришем директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Не могу да обришем директоријум „%s“: нарочити директоријум"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Не могу да направим директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Не могу да направим директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Наредба:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Не могу да се претплатим на директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не могу да се претплатим на директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не могу да се одјавим са директоријума „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не могу да се одјавим са директоријума „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неочекивани елемент у одговору ИМАП сервера %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Нема података"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Веза са ИМАП сервером %s је неочекивано прекинута: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10584,18 +11057,26 @@ msgstr "Нисам могао да сачувам сажетак: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не могу да додам поруку у сажетак: непознат разлог"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Сандуче"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Прододата Maildir порука понишетна"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не могу да додам поруку у maildir директоријум: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10611,48 +11092,48 @@ msgstr ""
 "Не могу да добијем поруку: %s из директоријума %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Неисправан садржај поруке"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Не могу да преузмем директоријум „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Не могу да преузмем директоријум „%s“: директоријум не постоји."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Не могу да направим директоријум „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Не могу да преузмем директоријум „%s“: директоријум није maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Нисам могао да обришем директоријум `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "није maildir директоријум"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11246,20 +11727,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Нисам могао да се повежем на POP сервер %s (порт %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Нисам могао да се пријавим на POP сервер %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Нисам могао да се повежем на POP сервер %s у сигурносном моду: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Нисам могао да се повежем на POP сервер %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11268,28 +11754,28 @@ msgstr ""
 "Нисам могао да се повежем на POP сервер %s: Тражени механизам пријаве није "
 "подржан."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' пријава неуспела на POP сервер %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не могу да се пријавим на POP сервер %s: грешка код SASL протокола"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Нисам могао да се пријавим на POP сервер %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sУнесите лозинку за корисника „%s“ на рачунару %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11298,7 +11784,16 @@ msgstr ""
 "Нисам могао да се повежем на POP сервер %s.\n"
 "Грешка код слања лозинке: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Нисам могао да се повежем на POP сервер %s.\n"
+"Грешка код слања лозинке: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нема таквог директоријума `%s'."
@@ -11510,93 +12005,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP достава поште преко %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Не могу да пошаљем поруку: услуга није повезана."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Не могу да пошаљем поруку: адреса пошиљаоца није исправна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Слање припремљених порука"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Не могу да пошаљем поруку: нису одређени примаоци."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Не могу да пошаљем поруку: један или више неисправних прималаца"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP поздрав"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Неуспела HELO команда: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Неуспела HELO команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP пријава"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Грешка код превљења објекта SASL пријаве."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Неуспела AUTH команда: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Неуспела AUTH команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Лош одговор на пријаву од сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Неуспела MAIL FROM команда: %s: порука није послата"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Неуспела MAIL FROM команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Неуспела RCPT TO команда: %s: порука није послата"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> неуспело"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Неуспела DATA команда: %s: порука није послата"
@@ -11604,26 +12099,26 @@ msgstr "Неуспела DATA команда: %s: порука није посл
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Неуспела DATA команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Неуспела RSET команда: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Неуспела RSET команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Неуспела QUIT команда: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Неуспела QUIT команда"
 
@@ -11686,105 +12181,6 @@ msgstr "МИМЕ тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предложи аутоматско отварање прилога"
 
-# bug: set for from account? probably 'for "from" account'
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Не могу да потпишем одлазећу поруку: није постављен сертификат за "
-"потписивање на овом налогу"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Не могу да шифрујем одлазећу поруку: није постављен сертификат за шифровање "
-"на овом налогу"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не могу да отворим датотеку"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Не могу да повратим поруку из уредника"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Неименована порука"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Отвори датотеку"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Аутогенерисан"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Потпис:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> датотека прикачена"
-msgstr[1] "<b>%d</b> датотеке прикачене"
-msgstr[2] "<b>%d</b> датотека прикачено"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Сакриј _траку прилога (овде превуците прилоге)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Прикажи _траку прилога (овде превуците прилоге)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Састави поруку"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да покренем контролу бирања адреса."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да активирам компоненту HTML уредника.\n"
-"Молим проверите да имате одговарајуће верзије\n"
-"gtkhtml и libgtkhtml на систему.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да активирам компоненту HTML уредника."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Уредник садржи у тексту поруке не садржи текст, и не може бити мењан.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Одредиште"
@@ -11865,17 +12261,97 @@ msgstr "Притисните овде да изаберете директори
 msgid "Attach file(s)"
 msgstr "Приложи датотеке"
 
+# bug: set for from account? probably 'for "from" account'
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Не могу да потпишем одлазећу поруку: није постављен сертификат за "
+"потписивање на овом налогу"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Не могу да шифрујем одлазећу поруку: није постављен сертификат за шифровање "
+"на овом налогу"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не могу да отворим датотеку"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не могу да повратим поруку из уредника"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Неименована порука"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Отвори датотеку"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Аутогенерисан"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Потпис:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> датотека прикачена"
+msgstr[1] "<b>%d</b> датотеке прикачене"
+msgstr[2] "<b>%d</b> датотека прикачено"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Сакриј _траку прилога (овде превуците прилоге)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Прикажи _траку прилога (овде превуците прилоге)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Састави поруку"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Прослеђена порука - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Приложи оригиналну поруку"
+msgstr[1] "Приложи оригиналну поруку"
+msgstr[2] "Приложи оригиналну поруку"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Уредник садржи у тексту поруке не садржи текст, и не може бити мењан.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Додај датотеку поруци"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11893,54 +12369,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Нисам могао да направим везу: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Непрочитаних порука"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Желите ли да сачувате промене?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Не уклањај"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Уклони"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Нисам могао да сачувам потпис: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Грешка код чувања пречица."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Упозорење: измењена порука"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11948,57 +12438,74 @@ msgid ""
 msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Занемари промене"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Сачувај поруку..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Нисам могао да направим везу: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Нисам могао да сачувам потпис: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Морате да подесите налог пре састављања поруке."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Нисам могао да направим везу: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Нисам могао да направим прозор за састављање:\n"
+"Не могу да покренем контролу бирања адреса."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Нисам могао да направим прозор за састављање:\n"
+"Не могу да активирам компоненту HTML уредника.\n"
+"Молим проверите да имате одговарајуће верзије\n"
+"gtkhtml и libgtkhtml на систему.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Пакет програма Еволуција"
@@ -12305,11 +12812,6 @@ msgstr "%d.%b.%Y."
 msgid "Select a time to compare against"
 msgstr "Изаберите име за поређење"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "<b>Пр_авила филтера</b>"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12338,19 +12840,8 @@ msgstr "Морате дати име датотеци."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Датотека '%s' не постоји или није регуларна датотека."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Премештам директоријум %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Морате одредити директоријум."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12358,156 +12849,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Задатак"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Морате дати име овом филтеру."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Морате именовати овај vfolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Није изабран сервер"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Изабери датотеку"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Онда</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Одаберите директоријум"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Пр_авила филтера</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder извори</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Упореди са"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Долазећи"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"временом у поноћ датог датума."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"временом када се филтрирање десило."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"тренутним временом када се филтрирање десило."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "време у односу на тренутно време"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "пре"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "месеци"
-
-# bug: plural-forms
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "секунде"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "само одређени директоријуми"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "тренутно време"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "време које сте одредили"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "са свим активним мрежним директоријумима"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "са свим локалним и активним мрежним директоријумима"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "са свим локалним директоријумима"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "године"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важно"
 
@@ -12575,6 +12947,71 @@ msgstr "долазећи"
 msgid "outgoing"
 msgstr "одлазећи"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Пр_авила филтера</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Упореди са"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Долазећи"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"временом у поноћ датог датума."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"временом када се филтрирање десило."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"тренутним временом када се филтрирање десило."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "време у односу на тренутно време"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "пре"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "месеци"
+
+# bug: plural-forms
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "секунде"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "тренутно време"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "време које сте одредили"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "године"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Додај правило"
@@ -12587,60 +13024,71 @@ msgstr "Измени правило"
 msgid "Rule name"
 msgstr "Име правила"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Правила резултата"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Резултат"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Поставке састављача"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Тело садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Тело не садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тело или наслов садрже"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Подесите ваше налоге за пошту овде"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Порука садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Еволуција пошта"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Примаоци садрже"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Контрола подешавања Еволуција налога за пошту"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Пошиљалац садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Компонента Еволуција поште"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Наслов садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Састављач Еволуција поште"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Наслов не садржи"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Контрола подешавања Еволуција састављача"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "<b>Виртуелни _директоријуми</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Контрола особина Еволуција поште"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Додај"
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Пошта"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder извор"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Особине поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Пошта:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12673,45 +13121,308 @@ msgstr "_Додај потпис"
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "У %a, %d. %m. %Y у %H:%M %%+05d, %%s написа:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Пр_авила филтера</b>"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Одаберите директоријум"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Прерачунај"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Додели боју"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Додели боју"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Прилози"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Звоно"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "садржи"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Копирај у директоријум"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Датум примања"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Датум слања"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Обрисано"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "не садржи"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "не завршава се са"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "не постоји"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "не враћа"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "не звучи као"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "не почиње са"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Не постоји"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Припрема"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "завршава се са"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Постоји"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "постоји"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Израз"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Следи"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "је"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "је после"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "је пре"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "је означен"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "је већи од"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "је мањи од"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "није"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "није означен"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Провера ђубрета"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Етикета"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Дописна листа"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Тело поруке"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Заглавље поруке"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Порука је ђубре"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Порука није ђубре"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Премести у директоријум"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Кроз цев до програма"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Пусти звук"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Читај"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Примаоци"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Рег. израз претрага"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Одговорено на"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "повраћаји"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "више повраћаја од"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "мање повраћаја од"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Покрени програм"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Резултат"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Пошиљалац"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Додели статус"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Величина (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "звучи као"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Изворни налог"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Одређено заглавље"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "почиње са"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Прекини са обрадом"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Наслов"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Недодељен статус"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Онда</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Направи _Виртуелни директоријум из претраге..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Особине директоријума"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Особине"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Име директоријума"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Укупно порука"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Укупно порука"
+msgstr[1] "Укупно порука"
+msgstr[2] "Укупно порука"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Непрочитаних порука"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Непрочитаних порука"
+msgstr[1] "Непрочитаних порука"
+msgstr[2] "Непрочитаних порука"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12721,450 +13432,282 @@ msgstr "<протисните овде да изаберете директор�
 msgid "Create New Folder"
 msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Наведите где да направим директоријум:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Име директоријума:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolder-и"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "НЕПОКЛОПЉЕН"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Учитавам..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештам директоријум %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавам директоријум %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруке у смештај на највишем нивоу"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копирај у директоријум"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Премести у директоријум"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Откажи задужење"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Умножи"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Правим директоријум „%s“"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Преименуј директоријум"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "П_реглед"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Копирај..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Премести..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Нови директоријум..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Преимену_ј"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Особине..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolder-и"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "НЕПОКЛОПЉЕН"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Сандуче"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Учитавам..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Преименуј..."
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Пошта"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Особине"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Штампај"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Одговори _Свима"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Пр_ати..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Означ_и завршене"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Означи као неважно"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Прене_си у директоријум..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копирај у директоријум..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Етикета"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Додај пошиљаоца у адреса_р"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "При_мени филтере"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "Ф_илтрирај ђубре"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder на _Наслов"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder на П_ошиљаоца"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder на _Примаоце"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder на дописну _листу"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Филтрирај према насло_ву"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Филтрирај према п_ошиљаоцу"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Филтрирај према п_римаоцу"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Филтрирај према _дописној листи"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Подразумевани"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Штампај поруку"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Умножи адресу везе"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Од"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Одговор-за"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Коме"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc (копија)"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc (невидљива копија)"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Наслов"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Датум"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Дискусионе групе"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s прилог"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не могу да обрадим С/МИМЕ поруку: непозната грешка"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Неподржана врста шифровања за multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Неподржан облик потписа"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Грешка при провери потписа"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Непозната грешка при провери потписа"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Преузимам „%s“"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Непотписана"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Исправан потпис"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Неисправан потпис"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Исправан потпис, не могу да проверим пошиљаоца"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Нешифровано"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Шифрована, слабо"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Шифрована"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Шифрована, добро"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Лоше сложен спољни део."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Показивач на FTP адресу (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "показивач на локалну датотеку (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Показивач на мрежни податак (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Показивач на напознати спољни податак (\"%s\" типа)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Обликујем поруку"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Пошиљалац"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13172,14 +13715,22 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Поклапања: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Непотписана"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ова порука није потписана. Нема гаранција да је пошиљалац поруке исправан."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Исправан потпис"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13187,7 +13738,11 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно онај за кога се издаје."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Неисправан потпис"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13195,11 +13750,11 @@ msgstr ""
 "Потпис ове поруке није могао бити проверен, можда је измењена приликом "
 "преноса."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Исправан потпис, не могу да проверим пошиљаоца"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13207,7 +13762,11 @@ msgstr ""
 "Порука је потписана исправним потписом, али пошиљалац поруке није могао бити "
 "проверен."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Нешифровано"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13216,7 +13775,11 @@ msgstr ""
 "Ова порука није шифрована.  Њен садржај је могуће видети приликом преноса "
 "преко Интернета."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Шифрована, слабо"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13225,7 +13788,11 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом. Тешко је, али не и немогуће, "
 "да неко са стране види садржај ове поруке у догледно време."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Шифрована"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13233,7 +13800,11 @@ msgstr ""
 "Ова порука је шифрована. Тешко је могуће да неко са стране види садржај ове "
 "поруке."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Шифрована, добро"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13242,39 +13813,162 @@ msgstr ""
 "Ова порука је шифрована, и то добрим алгоритмом. Веома тешко је могуће да "
 "неко са стране види садржај ове поруке у догледном времену."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "По_гледај сертификат"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Овај сертификат се не може прегледати"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Прекорачено:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "до %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "По_гледај унутар"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страна %d од %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Преузимам „%s“"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Исправан потпис, не могу да проверим пошиљаоца"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Лоше сложен спољни део."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Показивач на FTP адресу (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "показивач на локалну датотеку (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Показивач на мрежни податак (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Показивач на напознати спољни податак (\"%s\" типа)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Обликујем поруку"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Од"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Одговор-за"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Коме"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc (копија)"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc (невидљива копија)"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Пошиљалац"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Датум"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Дискусионе групе"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s прилог"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не могу да обрадим С/МИМЕ поруку: непозната грешка"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Неподржана врста шифровања за multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Неподржан облик потписа"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Грешка при провери потписа"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Непозната грешка при провери потписа"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Убица-спама (уграђен)"
@@ -13387,7 +14081,7 @@ msgstr "Пошаљи _поруку..."
 msgid "_Add to Addressbook"
 msgstr "Додај у _адресар"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
@@ -13400,7 +14094,7 @@ msgstr "Овај смештај не подржава претплате, или
 msgid "Subscribed"
 msgstr "Претплати се"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Директоријум"
 
@@ -13434,11 +14128,24 @@ msgid "Add address"
 msgstr "Додај адресу"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке од %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Виртуелни _директоријуми</b>"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Додај"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder извор"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Самопрепознавање веза"
@@ -13924,63 +14631,33 @@ msgstr "порт за покретање корисниковог spamd-а"
 msgid "spamd port"
 msgstr "порт spamd-а"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Поставке састављача"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Подесите ваше налоге за пошту овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Еволуција пошта"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Контрола подешавања Еволуција налога за пошту"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Компонента Еволуција поште"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Еволуција Elm увозник"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Састављач Еволуција поште"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Еволуција Netscape пошта увозник"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Контрола подешавања Еволуција састављача"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Еволуција Outlook Express 4 увозник"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Контрола особина Еволуција поште"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Еволуција Pine увозник"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Поштански налози"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Еволуција mbox увозник"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Особине поште"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MБокс (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Пошта:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14038,34 +14715,6 @@ msgstr "Увозим „%s“"
 msgid "Importing mailbox"
 msgstr "Увозим поштанско сандуче"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Еволуција Elm увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Еволуција Netscape пошта увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Еволуција Outlook Express 4 увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Еволуција Pine увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Еволуција mbox увозник"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MБокс (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14230,77 +14879,90 @@ msgstr "%s дописна листа"
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d изабраних"
+msgid_plural "%d deleted"
+msgstr[0] "%d изабраних"
+msgstr[1] "%d изабраних"
+msgstr[2] "%d изабраних"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d непослатих"
+msgid_plural "%d junk"
+msgstr[0] "%d непослатих"
+msgstr[1] "%d непослатих"
+msgstr[2] "%d непослатих"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Припрема"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Припрема"
+msgstr[1] "Припрема"
+msgstr[2] "Припрема"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d послатих"
+msgid_plural "%d sent"
+msgstr[0] "%d послатих"
+msgstr[1] "%d послатих"
+msgstr[2] "%d послатих"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d непослатих"
+msgid_plural "%d unsent"
+msgstr[0] "%d непослатих"
+msgstr[1] "%d непослатих"
+msgstr[2] "%d непослатих"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d укупно"
+msgid_plural "%d total"
+msgstr[0] "%d укупно"
+msgstr[1] "%d укупно"
+msgstr[2] "%d укупно"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d непослатих"
+msgid_plural ", %d unread"
+msgstr[0] "%d непослатих"
+msgstr[1] "%d непослатих"
+msgstr[2] "%d непослатих"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Нови директоријум са поштом"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Директоријум са поштом"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Направи нови директоријум са поштом"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "проверавам сервис"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Повезујем се на сервер..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Личност"
@@ -14361,14 +15023,22 @@ msgstr ""
 "Еволуција налог за пошту. Молим унесите доле име за овај налог. Ово име ће "
 "бити коришћено само за потребе приказивања на екрану."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "проверавам сервис"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Повезујем се на сервер..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Провери подржане врсте "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Приказ</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL није подржан у овој верзији еволуције</b>"
@@ -14622,7 +15292,7 @@ msgstr "Не цитирај оригиналну поруку"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанцима (за компатибилност са Outlook-ом)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
@@ -14960,6 +15630,117 @@ msgstr "боја"
 msgid "description"
 msgstr "опис"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder извори</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Дигитални потпис</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Шифровање</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Прихваћено"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "Г_отово"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Осетљиво на велика и мала слова"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Пронађи у поруци"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Нађи:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Означи за праћење"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Претплате на директоријуме"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Сагласност кључа"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ништа није изабрано"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "С_ервер:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Безбедносни подаци"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Поруке које сте изабрали за праћење су доле излистане.\n"
+"Молим одаберите акцију за слеђење из \"Ознака\" менија."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Списак налога"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Рок:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Ознака:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Претп_лати се"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Одјави претплату"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "само одређени директоријуми"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "са свим активним мрежним директоријумима"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "са свим локалним и активним мрежним директоријумима"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "са свим локалним директоријумима"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15167,14 +15948,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15279,8 +16052,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Не могу да преместим директоријум: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15332,8 +16106,9 @@ msgstr "Не могу да отворим извор"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "и још %d контакт."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15362,8 +16137,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Не бриши"
+msgstr "_Поврати"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15427,8 +16203,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Не могу да обришем директоријум:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15470,13 +16249,44 @@ msgstr ""
 "    '%s'\n"
 "Потом су освежени."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Премештам директоријум %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Морате одредити директоријум."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Морате именовати овај vfolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Није изабран сервер"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15484,16 +16294,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Препиши"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Пошаљи"
@@ -15658,7 +16468,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Чувам прилог"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15667,45 +16477,21 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидам везу са %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поново се повезујем на %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Осетљиво на велика и мала слова"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Пронађи у поруци"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Нађи:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Дигитални потпис</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Шифровање</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Безбедносни подаци"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Поништавам..."
@@ -15741,24 +16527,24 @@ msgstr "Освежавам..."
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Корисник је поништио операцију."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -15813,15 +16599,15 @@ msgstr "Освежавам вдиректоријуме за адресу: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Освежавам вдиректоријуме за адресу: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders-и"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Измени VFolder-е"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Нови VFolder"
 
@@ -15885,7 +16671,7 @@ msgstr "%d. %b, %k:%M "
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Правим листу порука"
 
@@ -15941,10 +16727,6 @@ msgstr "Проследи"
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Читај"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Одговори"
@@ -15957,49 +16739,49 @@ msgstr "Одговори свима"
 msgid "Review"
 msgstr "Прочитај"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Означи за праћење"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тело садржи"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "Г_отово"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тело не садржи"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Поруке које сте изабрали за праћење су доле излистане.\n"
-"Молим одаберите акцију за слеђење из \"Ознака\" менија."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тело или наслов садрже"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Рок:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Порука садржи"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Ознака:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Примаоци садрже"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Претплате на директоријуме"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Пошиљалац садржи"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ништа није изабрано"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Наслов садржи"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "С_ервер:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Наслов не садржи"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Претп_лати се"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Еволуција конзола"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Одјави претплату"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Проба Еволуције"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Пробни део Еволуције"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16067,31 +16849,18 @@ msgstr "Да ли да прескочи прозорче са упозорење
 msgid "mail"
 msgstr "пошта"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Непозната грешка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Неисправни аргументи"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Не могу да се региструје на OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Активне везе"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "База са подешавањима није нађена"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Активне везе"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Општа грешка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Изаберите OK да прекинете везу"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16277,30 +17046,6 @@ msgstr "Име директоријума не може да садржи зна
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ и „..“ су резервисана имена директоријума."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
-"мреже."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
-"мрежи."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Пошта за %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Изгледа да GNOME Pilot алати нису инсталирани на овај систем."
@@ -16318,110 +17063,94 @@ msgstr "Bug buddy није инсталиран."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може да се покрене."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Групвајз"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_На мрежи"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Није на мрежи"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Ради без мреже"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Кућица"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Ново"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Нова проба"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Проба"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Направи нову пробну ставку"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
+"мреже."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Активне везе"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Активне везе"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
+"мрежи."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Изаберите OK да прекинете везу"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Пошта за %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "К_алендар"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Конаткти: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Пошта:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "За_дужења:"
+msgid "Uknown system error."
+msgstr "Непозната грешка"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Врста директоријума:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Неисправни аргументи"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Отвори директоријум другог корисника"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Не могу да се региструје на OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Налог:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "База са подешавањима није нађена"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Име директоријума:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Општа грешка"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Корисник:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Ново"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помоћник Еволуција подешавања"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Увоз датотека"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Временска зона"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16435,7 +17164,7 @@ msgstr ""
 "\n"
 "Молим притисните дугме \"Напред\" да наставите. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16447,17 +17176,17 @@ msgstr ""
 "\n"
 "Притисните дугме \"Примени\" да сачувате ваша подешавања. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Еволуција конзола"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Нова проба"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Проба Еволуције"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Проба"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Пробни део Еволуције"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Направи нову пробну ставку"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16518,7 +17247,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Еволуција може да увезе податке из следећих датотека:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16553,7 +17282,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваше доприносе!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16562,39 +17291,39 @@ msgstr ""
 "Хвала\n"
 "Тим Ximian Еволуције\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Немој ми поново рећи"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Покрени Еволуцију уз наведени део"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Почни са радом без мреже"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Почни са радом на мрежи"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Силом угаси све делове еволуције"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Приморај поновни пренос података из Еволуције 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Еволуција"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16669,6 +17398,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16913,6 +17664,11 @@ msgstr "Ваши сертификати"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Сертификат већ постоји"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -17114,11 +17870,6 @@ msgstr "Јединствени ИБ субјекта"
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа сертификата"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Сертификат већ постоји"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 лозинка датотеке"
@@ -17260,8 +18011,8 @@ msgstr "Прегледај текући контакт"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Акције"
@@ -17740,16 +18491,6 @@ msgstr "_Обрни избор"
 msgid "_Threaded Message List"
 msgstr "Листа порука према _нити разговора"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Затвори овај прозор"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Затвори"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Додај _пошиљаоца у адресар"
@@ -18152,6 +18893,16 @@ msgstr "Ала_ти"
 msgid "_Undelete"
 msgstr "_Поврати"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Затвори овај прозор"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Затвори"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Приложи"
@@ -18234,10 +18985,6 @@ msgstr "Сачувај тренутну датотеку са другим им�
 msgid "Save the message in a specified folder"
 msgstr "Сачувај поруку у наведеном директоријуму"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Пошаљи"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18807,7 +19554,7 @@ msgid "Evolution Query"
 msgstr "Еволуција сажетак"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18966,27 +19713,264 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Лична идентификација за HTTP сервер."
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Изабрани календари за објављивање"
+
+#~ msgid "Login name:"
+#~ msgstr "Пријавно име:"
+
+#~ msgid "URL:"
+#~ msgstr "Адреса (URL):"
+
+#~ msgid "User Publishes"
+#~ msgstr "Корисник објављује"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "уредник-контакт-листе"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Сачувај листу као VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Групвајз"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Нисам могао да покренем вомбат"
+
+#~ msgid "C_alendar"
+#~ msgstr "К_алендар"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Опције за звучни аларм"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Опције за текстуални аларм"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Опције за аларм преко Е-поште"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Опције за програм аларма"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Непознате опције за аларм"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Понављање аларма"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Порука за приказ:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Порука за слање"
+
+#~ msgid "Play sound:"
+#~ msgstr "Пусти звук:"
+
+#~ msgid "Run program:"
+#~ msgstr "Покрени програм:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Са овим аргументима:"
+
+#~ msgid "Basics"
+#~ msgstr "Основе"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Датум/Време:"
+
+#~ msgid "Reminders"
+#~ msgstr "Подсетници"
+
+#~ msgid "_Options..."
+#~ msgstr "_Опције..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Адресар..."
+
+#~ msgid "Reminder"
+#~ msgstr "Подсетник"
+
+#~ msgid "B_usy"
+#~ msgstr "З_узет"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "По_верљиво"
+
+#~ msgid "Date & Time"
+#~ msgstr "Датум и време"
+
+#~ msgid "F_ree"
+#~ msgstr "_Слободно"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Лич_но"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Ја_вно"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Додај прису_тног"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Додај пошиљаоца у адреса_р"
+
+#~ msgid "Exceptions"
+#~ msgstr "Изузеци"
+
+#~ msgid "Preview"
+#~ msgstr "Изглед"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило за понављање"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Посебно понављање"
+
+#~ msgid "_Modify"
+#~ msgstr "_Измени"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Без понављања"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Једноставно понављање"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _готово"
+
+#~ msgid "Progress"
+#~ msgstr "Напредак"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Пов_ерљиво"
+
+#~ msgid "Folder:"
+#~ msgstr "Директоријум:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Почетак:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Крај:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Завршетак:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>До:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ништа</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Настала је грешка у CORBA систему\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Објекат није могао бити пронађен\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Немате праве дозволе за ажурирање календара\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Стање присутног није могло бити ажурирано!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Додај пошиљаоца у адреса_р"
+
+#~ msgid "_Options"
+#~ msgstr "_Опције"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "_Почетно време састанка:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "_Крајње време састанка:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при отварању %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Нисам могао да нађем сертификат за \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "На_прави правило од поруке"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Нисам могао да направим S/MIME контекст за дешифрирање."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Нисам могао да направим прозор за састављање:\n"
+#~ "Не могу да активирам компоненту HTML уредника."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Правила резултата"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "У %a, %d. %m. %Y у %H:%M %%+05d, %%s написа:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Име директоријума"
+
+#~ msgid "_Rename"
+#~ msgstr "Преимену_ј"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Особине..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Кућица"
+
+#~ msgid "C_alendar:"
+#~ msgstr "К_алендар"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Конаткти: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Пошта:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "За_дужења:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Врста директоријума:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Отвори директоријум другог корисника"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Име директоријума:"
+
+#~ msgid "_User:"
+#~ msgstr "_Корисник:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Неуспешно повезивање са LDAP сервером"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Неуспешна пријава на LDAP сервер"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Нисам могао да обавим упит на Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Сервер је одговорио неподржаним базама за претрагу"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Овај сервер не подржава податке LDAPv3 шеме"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Грешка у читању података шеме"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Сервер није одговорио са исправним подацима шеме"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " П_окажи подржане базе "
 
@@ -19058,9 +20042,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Webcam:"
 #~ msgstr "Веб страница:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Уређивач категорија није доступан."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19111,9 +20092,6 @@ msgstr "%s (%d%% завршено)"
 #~ "Обрисани догађај је састанак, желите ли да пошаљете поруку за његово "
 #~ "отказивање?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Сигурно желите да поништите и обришете овај састанак?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19131,45 +20109,15 @@ msgstr "%s (%d%% завршено)"
 #~ "Обрисани унос у дневник је објављен, желите ли да пошаљете поруку за "
 #~ "његово отказивање?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Сигурно желите да поништите и обришете овај унос у дневник?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Сигурно желите да обришете задужење `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Сигурно желите да обришете ово неименовано задужење?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Сигурно желите да избришете унос у дневник `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Сигурно желите да избришете ован неименовани унос у дневник?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Сигурно желите да избришете %d заказани састанак?"
-#~ msgstr[1] "Сигурно желите да избришете %d заказана састанка?"
-#~ msgstr[2] "Сигурно желите да избришете %d заказаних састанака?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Сигурно желите да избришете %d задужење"
-#~ msgstr[1] "Сигурно желите да избришете %d задужења"
-#~ msgstr[2] "Сигурно желите да избришете %d задужења"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Сигурно желите да избришете %d унос у дневник?"
-#~ msgstr[1] "Сигурно желите да избришете %d уноса у дневник?"
-#~ msgstr[2] "Сигурно желите да избришете %d уноса у дневник?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Позови друге..."
 
@@ -19217,9 +20165,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "Учење ђубрета и не-ђубрета од порука"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Нисам могао да преузмем чланак %s са NNTP сервера."
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Сервер не дозвољава слање чланака"
 
@@ -19252,174 +20197,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Непознат одговор сервера: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Прерачунај"
-
-#~ msgid "Assign Color"
-#~ msgstr "Додели боју"
-
-#~ msgid "Assign Score"
-#~ msgstr "Додели боју"
-
-#~ msgid "Attachments"
-#~ msgstr "Прилози"
-
-#~ msgid "Beep"
-#~ msgstr "Звоно"
-
-#~ msgid "contains"
-#~ msgstr "садржи"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Копирај у директоријум"
-
-#~ msgid "Date received"
-#~ msgstr "Датум примања"
-
-#~ msgid "Date sent"
-#~ msgstr "Датум слања"
-
-#~ msgid "Deleted"
-#~ msgstr "Обрисано"
-
-#~ msgid "does not contain"
-#~ msgstr "не садржи"
-
-#~ msgid "does not end with"
-#~ msgstr "не завршава се са"
-
-#~ msgid "does not exist"
-#~ msgstr "не постоји"
-
-#~ msgid "does not return"
-#~ msgstr "не враћа"
-
-#~ msgid "does not sound like"
-#~ msgstr "не звучи као"
-
-#~ msgid "does not start with"
-#~ msgstr "не почиње са"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Не постоји"
-
-#~ msgid "Draft"
-#~ msgstr "Припрема"
-
-#~ msgid "ends with"
-#~ msgstr "завршава се са"
-
-#~ msgid "Exist"
-#~ msgstr "Постоји"
-
-#~ msgid "exists"
-#~ msgstr "постоји"
-
-#~ msgid "Expression"
-#~ msgstr "Израз"
-
-#~ msgid "Follow Up"
-#~ msgstr "Следи"
-
-#~ msgid "is"
-#~ msgstr "је"
-
-#~ msgid "is after"
-#~ msgstr "је после"
-
-#~ msgid "is before"
-#~ msgstr "је пре"
-
-#~ msgid "is Flagged"
-#~ msgstr "је означен"
-
-#~ msgid "is greater than"
-#~ msgstr "је већи од"
-
-#~ msgid "is less than"
-#~ msgstr "је мањи од"
-
-#~ msgid "is not"
-#~ msgstr "није"
-
-#~ msgid "is not Flagged"
-#~ msgstr "није означен"
-
-#~ msgid "Junk Test"
-#~ msgstr "Провера ђубрета"
-
-#~ msgid "Mailing list"
-#~ msgstr "Дописна листа"
-
-#~ msgid "Message Body"
-#~ msgstr "Тело поруке"
-
-#~ msgid "Message Header"
-#~ msgstr "Заглавље поруке"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Порука је ђубре"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Порука није ђубре"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Премести у директоријум"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Кроз цев до програма"
-
-#~ msgid "Play Sound"
-#~ msgstr "Пусти звук"
-
-#~ msgid "Recipients"
-#~ msgstr "Примаоци"
-
-#~ msgid "Regex Match"
-#~ msgstr "Рег. израз претрага"
-
-#~ msgid "Replied to"
-#~ msgstr "Одговорено на"
-
-#~ msgid "returns"
-#~ msgstr "повраћаји"
-
-#~ msgid "returns greater than"
-#~ msgstr "више повраћаја од"
-
-#~ msgid "returns less than"
-#~ msgstr "мање повраћаја од"
-
-#~ msgid "Run Program"
-#~ msgstr "Покрени програм"
-
-#~ msgid "Sender"
-#~ msgstr "Пошиљалац"
-
-#~ msgid "Set Status"
-#~ msgstr "Додели статус"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Величина (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "звучи као"
-
-#~ msgid "Source Account"
-#~ msgstr "Изворни налог"
-
-#~ msgid "Specific header"
-#~ msgstr "Одређено заглавље"
-
-#~ msgid "starts with"
-#~ msgstr "почиње са"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Прекини са обрадом"
-
-#~ msgid "Unset Status"
-#~ msgstr "Недодељен статус"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "Провери пристиг_лу пошту"
 
@@ -19658,9 +20435,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Finished"
 #~ msgstr "Готово"
 
-#~ msgid "Group:"
-#~ msgstr "Група:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20203,9 +20977,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "component"
 #~ msgstr "део"
 
-#~ msgid "Alarms"
-#~ msgstr "Аларми"
-
 #~ msgid "Geographical position"
 #~ msgstr "Географски положај"
 
@@ -20769,9 +21540,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Еволуција сада излази..."
 
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Изаберите садржај из адресара"
-
 #~ msgid ""
 #~ "The task backend for\n"
 #~ "%s\n"
@@ -20816,18 +21584,9 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Дејство аларма</b>"
 
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Звук аларма</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Класификација</b>"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Датум и време</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Опис</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>_Сажетак</b>"
 
@@ -21244,9 +22003,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Примам резултате претраге са LDAP сервера"
 
-#~ msgid "Error performing search"
-#~ msgstr "Грешка током претраге"
-
 #~ msgid "Repository is offline"
 #~ msgstr "Архива није на мрежи"
 
@@ -21379,9 +22135,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Основни процес локалног /LDAP Еволуција адресара"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Основни процес локалних датотека Еволуције календара"
-
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Основни процес локалног /LDAP Еволуција адресара"
 
@@ -21481,9 +22234,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Use Score"
 #~ msgstr "Користи резултат"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Курсор није могао да буде учитан\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Директоријум са подацима о контактима"
 
@@ -22062,9 +22812,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "View the selected folder"
 #~ msgstr "Прегледај изабрани директоријум"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Копирај..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Линија директоријума"
 
@@ -22074,18 +22821,12 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Иди у директоријум..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Премести..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Нови директоријум"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Уклони директоријум другог корисника"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Преименуј..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Трака са пречицама"
 
@@ -22098,9 +22839,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Make this Occurrence _Movable"
 #~ msgstr "Нека ова појава буде _покретна"
 
-#~ msgid "Information"
-#~ msgstr "Информација"
-
 #~ msgid "Error"
 #~ msgstr "Грешка"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 2f7b4820ea..bdaac3cd35 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-03-26 17:35+0100\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -25,14 +25,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "adresar evolucije"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "zaglavlje kontakta: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "vizitkarta evolucije"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "tekući direktorijum adresara"
@@ -56,34 +48,252 @@ msgstr " karte"
 msgid " card"
 msgstr " karta"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "zaglavlje kontakta: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "vizitkarta evolucije"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Kursor nije mogao da bude učitan\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Neuspešna prijava na LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Server je odgovorio nepodržanim bazama za pretragu"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Server nije odgovorio sa ispravnim podacima šeme"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Nisam mogao da učitam adresar"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Uređivač kategorija nije dostupan."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Sačuvaj u adresaru"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Greška kod učitavanja predefinisanog adresara."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Greška tokom pretrage"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Želite li da sačuvate promene?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "i još %d kontakt."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Ne mogu da raščlanim sadržaj poruke"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Greška kod dodavanja kontakta"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Preglednik adresa Evolucija adresara"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Nisam mogao da učitam adresar"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Nisam mogao da se prijavim.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Samodopunjavanje"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesi lozinku za %s (korisnik %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikati"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Podesite ovde samodopunjavanje"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolucija adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+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:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Deo Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
+
+# bug: s/manager/manage/
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -116,7 +326,7 @@ msgstr "Novi kontakt"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontakti:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -140,15 +350,15 @@ msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na ovom računaru"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -157,19 +367,19 @@ msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Podešavanje samodopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -181,7 +391,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -193,7 +403,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -205,7 +415,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -217,36 +427,45 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Osobine..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupam LDAP serveru"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Nisam mogao da se prijavim.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesi lozinku za %s (korisnik %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -267,62 +486,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa za direktorijum poslednje korišćen u prozorčetu za izbor imena"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikati"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Podesite ovde samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolucija adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-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:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Deo Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
-
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-#, fuzzy
-msgid "Manage your S/MIME certificates here"
-msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -330,7 +493,7 @@ msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -339,8 +502,7 @@ msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -366,6 +528,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Identifikacija"
@@ -414,13 +577,11 @@ msgid "Anonymously"
 msgstr "Anonimno"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
@@ -681,33 +842,26 @@ msgstr "karte"
 
 # bug: plural-forms
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Izaberite kontakte iz adresara"
+#: 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:208
+msgid "Remove All"
+msgstr "Ukloni sve"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ukloni"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ukloni sve"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Pogledaj listu kontakt listu"
@@ -722,7 +876,7 @@ msgid "Send HTML Mail?"
 msgstr "Pošalji HTML poruku?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Dodaj u kontakte"
 
@@ -730,15 +884,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Izvor"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Izaberite kontakte iz adresara"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -760,6 +921,11 @@ msgstr "_Kategorija:"
 msgid "_Find"
 msgstr "_Nađi"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Prona_đi"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -806,9 +972,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Radna nedelja</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -833,7 +998,6 @@ msgid "Birthday:"
 msgstr "Rođenda_n"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -848,15 +1012,15 @@ msgid "Company:"
 msgstr "Naredba:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Urednik kontakata"
 
@@ -965,8 +1129,8 @@ msgstr "_Veb stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -988,44 +1152,28 @@ msgid "_File under:"
 msgstr "Naziv datoteke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ove kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ovaj kontakt?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Može se menjati"
 
@@ -1998,132 +2146,124 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL brza poruka"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Jahu"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Jahu glasnik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "Grupvajz"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usluga"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Mesto"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Korisničko ime"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Kuća"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Drugo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Jahu"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "Grupvajz"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Promenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada ovim kategorijama"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Datum povraćaja nije dobar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Neispravna svrha"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL brza poruka"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Jahu glasnik"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usluga"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Mesto"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
@@ -2141,6 +2281,22 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2263,48 +2419,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Izaberite sadržaj iz adresara"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Članovi"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Ukloni odabrane predmete sa liste priloga"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Odabrano"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Sakrij adrese kada šalješ poštu na ovu listu"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Ime _liste:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "urednik-kontakt-liste"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "prozorče1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Da li je nova lista"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Obavezno prisustvo"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Sačuvaj listu kao VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Promenjen kontakt:"
@@ -2343,422 +2520,11 @@ msgstr ""
 "u ovom direktorijumu. Želite li svejedno da dodate?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Ispiši članove"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Organizacija"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Položaj"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr "Grupvajz"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Video konferencije"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "Beb"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blogče"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "lično"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Napomena"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Uloga na poslu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Lična stranica"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Uspeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nova kontakt lista"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Kontakt nije pronađen"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "IB kontakta već postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ne mogu da otvorim izvor"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Prijava neuspela"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Prijava obavezna"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS nije dostupan"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Nema takve poruke"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Druga greška"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
-"imate prava pristupa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
-"adresu, ili je LDAP server nedostupan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Ova verzija Evolucije nema podršku za LDAP u sebi. Ukoliko želite da "
-"koristite LDAP u Evoluciji morate da izgradite program iz izvornog koda u "
-"SUV-u (CVS) pošto preuzmete OpenLDAP sa sledeće adrese."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
-"adresu ili je server nedostupan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Više karti odgovara upitu koji je ili server tako  \n"
-"podešen vratio ili Evolucija tako podešena da pokaže.\n"
-"Molim da preciznije formulišete upit ili povećate limit\n"
-"broja rezultata u podešavanjima adresara za server direktorijuma."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
-"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
-"upit ili povećate vremenski limit u podešavanjima adresara\n"
-"za server direktorijuma."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspešno završen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Greška kod dodavanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Greška kod dodavanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Greška kod izmene liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Greška pri izmeni kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Greška kod uklanjanja kontakta"
-
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Otvaranje %d kontakata će otvoriti i %d novih prozora.\n"
-"Da li stvarno želite da pogledate sve ove kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s već postoji\n"
-"Želite li da prepišete novim unosom?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Prepiši"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Izaberite odredišni adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(prazno)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Osnovna E-pošta"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "E-pošta 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "E-pošta 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promeni podatke o kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "i još %d kontakt."
-msgstr[1] "i još %d kontakta."
-msgstr[2] "i još %d kontakata."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Prikaži celu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži sažetu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sačuvaj u adresaru"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakta"
@@ -2773,9 +2539,9 @@ msgstr[2] "%d kontakata"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Upit"
 
@@ -2791,130 +2557,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sačuvaj kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Nov kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Idi u direktorijum..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosledi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Štampaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Štampaj koverat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Umnoži u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Prebaci u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iseci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Umnoži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ubaci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Trenutan pogled"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2948,6 +2714,8 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategorije"
 
@@ -2955,6 +2723,21 @@ msgstr "Kategorije"
 msgid "Company Phone"
 msgstr "Telefon firme"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "E-pošta 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "E-pošta 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Prezime"
@@ -2991,14 +2774,29 @@ msgstr "Dnevnik"
 msgid "Manager"
 msgstr "Upravnik"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Napomena"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelarija"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizacija"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -3050,29 +2848,21 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Internet adresa"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Ima fokus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Ima kursor"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
@@ -3089,7 +2879,11 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina kolone"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3103,7 +2897,7 @@ msgstr ""
 "\n"
 "Kliknite dva puta da napravite novi kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3113,13 +2907,392 @@ msgstr ""
 "\n"
 "Nema šta da se pokaže u ovom pogledu."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina kolone"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Ima kursor"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Ispiši članove"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Položaj"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Video konferencije"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "posao"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "Beb"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blogče"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "lično"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Uloga na poslu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Lična stranica"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Uspeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nova kontakt lista"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "IB kontakta već postoji"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu da otvorim izvor"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Prijava neuspela"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Prijava obavezna"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS nije dostupan"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Druga greška"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
+"imate prava pristupa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
+"adresu, ili je LDAP server nedostupan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Ova verzija Evolucije nema podršku za LDAP u sebi. Ukoliko želite da "
+"koristite LDAP u Evoluciji morate da izgradite program iz izvornog koda u "
+"SUV-u (CVS) pošto preuzmete OpenLDAP sa sledeće adrese."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
+"adresu ili je server nedostupan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Više karti odgovara upitu koji je ili server tako  \n"
+"podešen vratio ili Evolucija tako podešena da pokaže.\n"
+"Molim da preciznije formulišete upit ili povećate limit\n"
+"broja rezultata u podešavanjima adresara za server direktorijuma."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
+"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
+"upit ili povećate vremenski limit u podešavanjima adresara\n"
+"za server direktorijuma."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Ovaj upit nije uspešno završen."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Greška kod dodavanja liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Greška kod dodavanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Greška kod izmene liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Greška pri izmeni kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Greška kod uklanjanja liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Greška kod uklanjanja kontakta"
+
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Otvaranje %d kontakata će otvoriti i %d novih prozora.\n"
+"Da li stvarno želite da pogledate sve ove kontakte?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li da prepišete novim unosom?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Izaberite odredišni adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(prazno)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Osnovna E-pošta"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Odaberi akciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Promeni podatke o kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "i još %d kontakt."
+msgstr[1] "i još %d kontakta."
+msgstr[2] "i još %d kontakata."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Prikaži celu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži sažetu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sačuvaj u adresaru"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3163,6 +3336,11 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Štampaj kovertu"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Štampaj kontakte"
@@ -3172,11 +3350,6 @@ msgstr "Štampaj kontakte"
 msgid "Print contact"
 msgstr "Štampaj kontakt"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Štampaj kovertu"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 p. Tahoma"
@@ -3361,6 +3534,22 @@ msgstr "Proba štampe kontakta"
 msgid "This should test the contact print code"
 msgstr "Ovo isprobava kod za štampu kontakata"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nisam mogao da učitam adresar"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ne mogu da otvorim adresar"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
@@ -3419,22 +3608,6 @@ msgstr "U običnom režimu, ne sme se dati opcija za veličinu."
 msgid "Impossible internal error."
 msgstr "Nemoguća unutrašnja greška."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Nisam mogao da učitam adresar"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ne mogu da otvorim adresar"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja predefinisanog adresara."
@@ -3451,39 +3624,362 @@ msgstr "Ime datoteke nije dato."
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ne briši"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Pošalji kome:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Sigurno želite da izbrišete %d zaduženje"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Sigurno želite da izbrišete %d unos u dnevnik?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Sigurno želite da izbrišete %d zakazani sastanak?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Sigurno želite da obrišete zaduženje `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Sigurno želite da obrišete zaduženje `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Zakazani sastanak"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Želite li da sačuvate promene?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Zanemari promene"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Sačuvaj poruku..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Pošalji"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Osnovni proces lokalnih datoteka Evolucije kalendara"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Podeli višednevne događaje:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Nisam mogao da pokrenem vombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Nisam mogao da pokrenem vombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisam mogao da pročitam programski blok Kalendara"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Predefinisan prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao da pročitam pilotov ToDo programski blok"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucija kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolucija kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Deo Evolucije za kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Deo Evolucije za zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Pokrećem:"
@@ -3583,10 +4079,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Nisam uspeo da pokrenem Bonobo"
@@ -3727,9 +4219,29 @@ msgstr "Da li da prikazujem vreme u 24č obliku umesto am/pm"
 msgid "Whether to show week numbers in date navigator"
 msgstr "Da li da prikazuje brojeve nedelja u izbiraču datuma"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Putanja sadrži"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Neraspodeljeno"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3751,8 +4263,8 @@ msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "dana"
 
@@ -3763,7 +4275,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3812,62 +4324,52 @@ msgstr "Ne mogu da otvorim kalendar „%s“ radi pravljenja događaja i sastana
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "Zakazani _sastanak"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Sačini novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Celo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Sačini novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "K_alendar"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Kalendar"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
@@ -3897,26 +4399,6 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Putanja sadrži"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Neraspodeljeno"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
@@ -3934,225 +4416,134 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Opcije za zvučni alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Opcije za tekstualni alarm"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Opcije za alarm preko E-pošte"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Opcije za program alarma"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Nepoznate opcije za alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Ponavljanje alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Poruka za prikaz:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Poruka za slanje"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Pusti zvuk:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Ponovi alarm"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Pokreni program:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Pošalji kome:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Sa ovim argumentima:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "prozorče1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Zvuk alarma</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "pokaži još na svakih"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Opis</b>"
 
-# bug: plural-forms
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "sati"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Podsetnici</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Dejstvo/pokreni"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Dodaj"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Sastavi poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Osnove"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Datum/Vreme:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Po_ruke"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Podsetnici"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Pošalji kome:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Pošalji elektronsku poruku"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Zaključak:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Nalog:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Opcije..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Pokreni program"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Ponovi alarm"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Pošalji"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "nakon"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "pre"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "dan(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kraj zakazanog sastanka"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "pokaži još na svakih"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "sat(a)"
 
 # bug: plural-forms
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "sati"
+
+# bug: plural-forms
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minut(a)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Morate navesti putanju sa koje da preuzmem kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Putanja izvora „%s“ nije ispravnog oblika."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Putanja izvora „%s“e predstavlja vebkal izvor."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Izvor imena „%s“ već postoji u izabranoj grupi"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa spiska zaduženja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Boje"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Izaberite boju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Dodaj grupu..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Osveži"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Dejstvo/pokreni"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_Adresa:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedelje"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4267,7 +4658,7 @@ msgid "Free/Busy Publishing"
 msgstr "_Objava stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Petak"
@@ -4281,7 +4672,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Ponedeljak"
@@ -4291,7 +4682,7 @@ msgid "S_un"
 msgstr "N_ed"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Subota"
@@ -4305,7 +4696,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedelja"
@@ -4319,7 +4710,7 @@ msgid "T_hu"
 msgstr "U_to"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Četvrtak"
@@ -4333,7 +4724,7 @@ msgid "Time format:"
 msgstr "Format za vreme:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorak"
@@ -4343,7 +4734,7 @@ msgid "W_eek starts:"
 msgstr "Početak n_edelje:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Sreda"
@@ -4376,7 +4767,8 @@ msgstr "_Skupi nedelje u mesečni prikaz"
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4426,6 +4818,80 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Morate navesti putanju sa koje da preuzmem kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Putanja izvora „%s“ nije ispravnog oblika."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Putanja izvora „%s“e predstavlja vebkal izvor."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Izvor imena „%s“ već postoji u izabranoj grupi"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa spiska zaduženja"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Boje"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Izaberite boju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Dodaj grupu..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Osveži"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_Adresa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "nedelje"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
@@ -4470,81 +4936,75 @@ msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Greška pri proveri: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " za "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Do "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim promenama objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Izmeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Sačuvaj kao..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim tekuću verziju!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Greška pri proveri: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " za "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Do "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
@@ -4606,8 +5066,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Unos nije mogao biti obrisan usled greške"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adresar..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontakti"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4617,160 +5078,224 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Podsetnik"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informacija"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "Događaj bez početnog datuma"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "Događaj bez krajnjeg datuma"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Krajnji datum je pogrešan"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Početno vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Krajnje vreme je pogrešno"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ne mogu da otvorim kalendar „%s“."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "pre svakog zakazanog sastanka"
+msgstr[1] "pre svakog zakazanog sastanka"
+msgstr[2] "pre svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "kraj zakazanog sastanka"
+msgstr[1] "kraj zakazanog sastanka"
+msgstr[2] "kraj zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "pre svakog zakazanog sastanka"
+msgstr[1] "pre svakog zakazanog sastanka"
+msgstr[2] "pre svakog zakazanog sastanka"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "C_elodnevni događaj"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "pre svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Z_uzet"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "pre svakog zakazanog sastanka"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegorije..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "pre svakog zakazanog sastanka"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Spisak zaduženja</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Klasifikacija"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Datum i vreme</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Po_verljivo"
+msgid "A_ll day event"
+msgstr "C_elodnevni događaj"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Datum i vreme"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Sačuvaj podešeni pregled..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Slobodno"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegorije..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "_Mesto:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Kalendar:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Lič_no"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Klasifikacija"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "Ja_vno"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Poverljivo"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Prikaži vreme kao"
+msgid "L_ocation:"
+msgstr "_Mesto:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Lično"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Javno"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Prikaži vreme kao"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Saž_etak:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmi"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Opis:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Krajnje vreme:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Početno vreme:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Ništa"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator više nema nalog."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Zahteva organizator."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Obriši"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Ukloni"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4809,35 +5334,45 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Dodaj prisu_tnog"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Uzbune</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Dodaj pošiljaoca u adresa_r"
+msgid "<b>Organizer</b>"
+msgstr "<b>Onda</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Promeni organizatora"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizator:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontakti"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Promeni organizatora"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizator:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4905,149 +5440,143 @@ msgstr "Ova i buduća pojava"
 msgid "All Instances"
 msgstr "Sve pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ovaj zakazani sastanak sadrži povratne podatke koje Evolucija ne može "
 "izmeniti."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Datum povraćaja nije dobar"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "prvoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "drugoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "trećoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "četvrtoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "poslednjoj"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Drugi datum"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "na"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "pojave"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "<b>Opis</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Prikaz</b>"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Povraćaj"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Svaki"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Izuzeci"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Izgled"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Pravilo za ponavljanje"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Posebno ponavljanje"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Izmeni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Bez ponavljanja"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Jednostavno ponavljanje"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Izmeni sastanak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "za"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "uvek"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "mesec(i)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "do"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "nedelja(e)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Izaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Odredišni direktorijum:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">Fontovi poruke</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _gotovo"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Upozorenja</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Gotovo"
 
@@ -5059,8 +5588,8 @@ msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "U toku"
@@ -5072,22 +5601,22 @@ msgid "Low"
 msgstr "Nizak"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Običan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Nije pokrenut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Napredak"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Procenat završenog: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5110,36 +5639,42 @@ msgstr "_Status:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zaduženje"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Pov_erljivo"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">Opcije</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Brisanje pošte</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Direktorijum:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Datum p_očetka:"
@@ -5148,52 +5683,58 @@ msgstr "Datum p_očetka:"
 msgid "_Due date:"
 msgstr "Datum _roka:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Lična identifikacija za HTTP server."
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Grupa:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Izabrani kalendari za objavljivanje"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Opcije kalendara</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Svakodnevno"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "Učestalost objavljivanja"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "Uređivanje stanja slobodan/zauzet"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Putanja objavljivanja stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Putanja objavljivanja stanja slobodan/zauzet"
+msgid "Free/Busy Editor"
+msgstr "Uređivanje stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Prijavno ime:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Svakodnevno"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Lozinka:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Pošta:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Učestalost objavljivanja"
+#, fuzzy
+msgid "_Password:"
+msgstr "Lozinka:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Zapamti lozinku"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "Adresa (URL):"
+#, fuzzy
+msgid "_Username:"
+msgstr "Korisničko_ime"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "Korisnik objavljuje"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Nedeljno"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5280,7 +5821,7 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
@@ -5289,6 +5830,11 @@ msgstr "Kliknite da otvorite %s"
 msgid "Untitled"
 msgstr "Bez imena"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Zaključak:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5300,7 +5846,7 @@ msgstr "Datum završetka:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5313,20 +5859,93 @@ msgstr "Važnost:"
 msgid "Web Page:"
 msgstr "_Veb stranica:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Javno"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Krajnji datum"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Lično"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Početni datum"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Poverljivo"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Izveštaj"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Slobodan"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Zauzet"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Geografsko mesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Da"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ne"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Povratno"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Dodeljeno"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5372,95 +5991,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Slobodan"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zauzet"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Otvori _veb stranicu"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Štam_paj..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: 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-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Umet_ni"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Dodeli zaduženje"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Prosledi kao iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Obeleži kao završeno"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Obeleži izabrana zaduženja kao završena"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Obriši"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Obriši izabrana zaduženja"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Sačuvaj kao..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Pritisni za novo zaduženje"
 
@@ -5469,176 +6094,107 @@ msgstr "Pritisni za novo zaduženje"
 msgid "% Complete"
 msgstr "% Gotovo"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Završeno"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Datum roka"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Prioritet"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Početni datum"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Izveštaj"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Razvrstana zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Pomeram poruke"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopiram poruke"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Izaberi..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "Prene_si u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Podešavanja..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Krajnji datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Početni datum"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Povratno"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Dodeljeno"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Da"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5662,36 +6218,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+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.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutni razmaci"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5767,37 +6323,35 @@ msgid ", ending on "
 msgstr ", završavajući se "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Početak:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Kraj:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Stanje"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Završetak:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Do:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Do "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar greška"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5805,305 +6359,285 @@ msgstr ""
 "<br> Molim proverite sledeću informaciju, i potom odaberite akciju iz donjeg "
 "menija."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Ništa</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Mesto:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Izaberi akciju:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Informacija o sastanku"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Promena sastanka"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Zahtev za novim podacima o sastanku"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Otkazivanje sastanka"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Ažuriranje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zahtev za promenama zaduženja"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zaduženje."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Otkazivanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtev"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodan/zauzet poruka"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-msgid "Object could not be found\n"
-msgstr "Objekat nije mogao biti pronađen\n"
-
-#: calendar/gui/e-itip-control.c:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -6132,6 +6666,10 @@ msgstr "Učitavam kalendar"
 msgid "Loading calendar..."
 msgstr "Učitavam kalendar..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizator:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Poruka servera:"
@@ -6148,11 +6686,6 @@ msgstr "početni-datum"
 msgid "Chair Persons"
 msgstr "Predsedništvo"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Obavezno prisustvo"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
@@ -6220,6 +6753,28 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "U toku"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Van kancelarije"
@@ -6228,98 +6783,64 @@ msgstr "Van kancelarije"
 msgid "No Information"
 msgstr "Bez informacije"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Dodaj pošiljaoca u adresa_r"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Opcije"
+msgid "O_ptions"
+msgstr "Opcije"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Ažuriraj slobodan/zauzet"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Sam bira"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Sve osobe i jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Obavezne osobe"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Obavezne osobe i _jedan izvor"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "_Početno vreme sastanka:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "_Krajnje vreme sastanka:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-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.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za „%s“"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6328,116 +6849,51 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Učitavam zaduženja"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Greška pri otvaranju %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Učitavam zaduženja"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zaduženja"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Unosim promene u objekte"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam zakazane sastanke sa %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Briše"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolucija kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Deo Evolucije za kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Deo Evolucije za zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zaduženja"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6785,10 +7241,6 @@ msgstr "Izabran mesec (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Izabrana godina (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zaduženje"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6819,7 +7271,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Štampaj prikaz"
 
@@ -6848,7 +7300,7 @@ msgstr[0] "%d karata"
 msgstr[1] "%d karata"
 msgstr[2] "%d karata"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6872,35 +7324,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za dodavanje zaduženja"
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskusione grupe"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novo zaduženje"
@@ -8578,69 +9024,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Neispravan niz poruka primljen od %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Sinhronizujem direktorijume"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Greška kod čitanja filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Greška kod primene filtera: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Nisam mogao da otvorim direktorijum za smeštanje reda"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Nisam mogao da prođem kroz direktorijum sa redom"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Primam poruku %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ne mogu da otvorim poruku"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Greška kod poruke %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Sinhronizujem direktorijum"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Primam poruku %d od %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Greška kod poruke %d od %d"
@@ -8662,42 +9108,6 @@ msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primene filtera za pretragu: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Nepodržana operacija: priključena poruka: za %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Pomeram poruke"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Kopiram poruke"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Izmena stanja đubreta"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Filtriram nove poruke"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8743,7 +9153,43 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Nepodržana operacija: priključena poruka: za %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Pomeram poruke"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Kopiram poruke"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Izmena stanja đubreta"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Filtriram nove poruke"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8754,15 +9200,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao da pročitam gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao da pročitam zahtev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8771,28 +9217,28 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao da šifriram: nisu označeni ispravni primaoci. "
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8803,62 +9249,83 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao da primenim GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisam mogao da obrazujem podatke za potpisivanje: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisam mogao da izvršim gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Nisam mogao da izvršim gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisam mogao da obrazujem podatke za šifrovanje: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno šifrovan deo poruke"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Ne mogu da raščlanim sadržaj poruke"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
+
+#: 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 ""
+"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisam mogao da zaključam '%s"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8881,27 +9348,6 @@ msgstr "Nisam mogao da zaključam koristeći fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao da zaključam koristeći flock(2): %s "
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
-
-#: 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 ""
-"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisam mogao da zaključam '%s"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9152,7 +9598,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: 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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9235,55 +9681,55 @@ msgstr "POP pre SMTP auth korišćenjem izvora koji nije pop"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Neuspela kompilacija regularnog izraza: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s traži deo sa korisničkim imenom'"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s traži deo sa imenom domaćina"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s traži deo sa putanjom"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Nalazim: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Greška kod pretrage za imenom: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Neuspelo nalaženje domaćina: ne može da obrazuje nit: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Neuspelo nalaženje domaćina: %s: domaćin nije pronađen"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Neuspelo nalaženje domaćina: %s: nepoznat razlog"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Nalazim adresu"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Neuspelo nalaženje domaćina: domaćin nije pronađen"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Neuspelo nalaženje domaćina: nepoznat razlog"
 
@@ -9359,7 +9805,7 @@ msgstr "Sertifikat za ši_frovanje:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
@@ -9450,7 +9896,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Ispravan potpis"
 
 #: camel/camel-smime-context.c:651
@@ -9465,49 +9911,48 @@ msgstr "Neuspela DATA komanda"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Nisam mogao da nađem opšti bulk algoritam."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Na_pravi pravilo od poruke"
+msgid "Cannot create CMS Message"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ne mogu da priložim datoteku %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ne mogu da priložim datoteku %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ne mogu da otvorim poruku"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9554,7 +9999,8 @@ msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
@@ -9563,8 +10009,8 @@ msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
 
@@ -9684,7 +10130,7 @@ msgstr "Upotreba ključa ne podržava potpis sertifikatom"
 msgid "Error in application verification"
 msgstr "Greška kod provere programa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9697,11 +10143,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9725,7 +10171,7 @@ msgstr ""
 "Želite li svejedno da prihvatite?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9740,7 +10186,7 @@ msgstr ""
 "\n"
 "Želite li da prihvatite?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9749,7 +10195,7 @@ msgstr ""
 "Problem sa sertifikatom: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9758,7 +10204,7 @@ msgstr ""
 "Loš domen sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9767,7 +10213,7 @@ msgstr ""
 "Istekao sertifikat: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9776,7 +10222,7 @@ msgstr ""
 "Istekla lista priznatih sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao da obradim URL `%s"
@@ -9800,7 +10246,7 @@ msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
@@ -9819,8 +10265,8 @@ msgid "Checking for new mail"
 msgstr "Proveravam za nove poruke"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Proveri za nove poruke u svim direktorijumima"
 
@@ -9850,8 +10296,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristup Novel Grupvajz serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9870,319 +10316,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Popis"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Neočekivan odgovor od IMAP servera %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Primih odgovor BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ne mogu dodati poruku u mh direktorijum: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Direktorijumi"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo odabrane direktorijume"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Premosti format imena direktorijuma koje daje server"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Format imena"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Za čitanje i smeštanje pošte na IMAP servere."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Nisam mogao da se povežem na %s (port %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nije dostupan"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
-"podržava STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, fuzzy, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Naredba:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr ""
-"Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Neočekivani element u odgovoru IMAP servera %s: "
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Nema podataka"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10251,7 +10406,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10323,6 +10478,27 @@ msgstr "Koristi proizvoljnu naredbu za povezivanje sa serverom"
 msgid "Command:"
 msgstr "Naredba:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Direktorijumi"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Pokaži samo odabrane direktorijume"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Premosti format imena direktorijuma koje daje server"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Format imena"
+
 #: 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"
@@ -10343,43 +10519,92 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP server %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za %s na %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Nisam mogao da se povežem na %s (port %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL nije dostupan"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS ekstenzija nije podržana."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nisam mogao da se povežem pomoću naredbe %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP lozinku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10390,30 +10615,278 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Nisam mogao da se prijavim na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočekivan odgovor od IMAP servera %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Neočekivan odgovor od IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Primih odgovor BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne mogu dodati poruku u mh direktorijum: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Za čitanje i smeštanje pošte na IMAP servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
+"podržava STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočekivani element u odgovoru IMAP servera %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Nema podataka"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10585,18 +11058,26 @@ msgstr "Nisam mogao da sačuvam sažetak: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ne mogu da dodam poruku u sažetak: nepoznat razlog"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Sanduče"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Prododata Maildir poruka ponišetna"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu da dodam poruku u maildir direktorijum: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10612,48 +11093,48 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Ne mogu da napravim direktorijum „%s“: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum nije maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "nije maildir direktorijum"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11247,20 +11728,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Nisam mogao da se povežem na POP server %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Nisam mogao da se prijavim na POP server %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Nisam mogao da se povežem na POP server %s u sigurnosnom modu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Nisam mogao da se povežem na POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11269,28 +11755,28 @@ msgstr ""
 "Nisam mogao da se povežem na POP server %s: Traženi mehanizam prijave nije "
 "podržan."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' prijava neuspela na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ne mogu da se prijavim na POP server %s: greška kod SASL protokola"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Nisam mogao da se prijavim na POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sUnesite lozinku za korisnika „%s“ na računaru %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11299,7 +11785,16 @@ msgstr ""
 "Nisam mogao da se povežem na POP server %s.\n"
 "Greška kod slanja lozinke: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Nisam mogao da se povežem na POP server %s.\n"
+"Greška kod slanja lozinke: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nema takvog direktorijuma `%s'."
@@ -11511,93 +12006,93 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP dostava pošte preko %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 msgid "Cannot send message: service not connected."
 msgstr "Ne mogu da pošaljem poruku: usluga nije povezana."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Slanje pripremljenih poruka"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ne mogu da pošaljem poruku: nisu određeni primaoci."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ne mogu da pošaljem poruku: jedan ili više neispravnih primalaca"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP pozdrav"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Neuspela HELO komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Neuspela HELO komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP prijava"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Greška kod prevljenja objekta SASL prijave."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Neuspela AUTH komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Neuspela AUTH komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Loš odgovor na prijavu od servera.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Neuspela MAIL FROM komanda: %s: poruka nije poslata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Neuspela MAIL FROM komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Neuspela RCPT TO komanda: %s: poruka nije poslata"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> neuspelo"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Neuspela DATA komanda: %s: poruka nije poslata"
@@ -11605,26 +12100,26 @@ msgstr "Neuspela DATA komanda: %s: poruka nije poslata"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Neuspela DATA komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Neuspela RSET komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Neuspela RSET komanda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Neuspela QUIT komanda: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Neuspela QUIT komanda"
 
@@ -11687,106 +12182,6 @@ msgstr "MIME tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje priloga"
 
-# bug: set for from account? probably 'for "from" account'
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
-"potpisivanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
-"šifrovanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Autogenerisan"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> datoteka prikačena"
-msgstr[1] "<b>%d</b> datoteke prikačene"
-msgstr[2] "<b>%d</b> datoteka prikačeno"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Sastavi poruku"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da pokrenem kontrolu biranja adresa."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika.\n"
-"Molim proverite da imate odgovarajuće verzije\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
-"<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište"
@@ -11867,17 +12262,98 @@ msgstr "Pritisnite ovde da izaberete direktorijume u koje šaljete"
 msgid "Attach file(s)"
 msgstr "Priloži datoteke"
 
+# bug: set for from account? probably 'for "from" account'
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
+"potpisivanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
+"šifrovanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Autogenerisan"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> datoteka prikačena"
+msgstr[1] "<b>%d</b> datoteke prikačene"
+msgstr[2] "<b>%d</b> datoteka prikačeno"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Sastavi poruku"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Prosleđena poruka - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Priloži originalnu poruku"
+msgstr[1] "Priloži originalnu poruku"
+msgstr[2] "Priloži originalnu poruku"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
+"<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Dodaj datoteku poruci"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11895,54 +12371,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Nisam mogao da napravim vezu: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Nepročitanih poruka"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Želite li da sačuvate promene?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ne uklanjaj"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Ukloni"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Greška kod čuvanja prečica."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Upozorenje: izmenjena poruka"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11950,57 +12440,74 @@ msgid ""
 msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promene"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Sačuvaj poruku..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Nisam mogao da napravim vezu: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Nisam mogao da napravim vezu: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da pokrenem kontrolu biranja adresa."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da aktiviram komponentu HTML urednika.\n"
+"Molim proverite da imate odgovarajuće verzije\n"
+"gtkhtml i libgtkhtml na sistemu.\n"
+
 #: data/evolution.desktop.in.in.h:1
 msgid "The Ximian Evolution Groupware Suite"
 msgstr "Paket programa Evolucija"
@@ -12307,11 +12814,6 @@ msgstr "%d.%b.%Y."
 msgid "Select a time to compare against"
 msgstr "Izaberite ime za poređenje"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "<b>Pr_avila filtera</b>"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12340,19 +12842,8 @@ msgstr "Morate dati ime datoteci."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Premeštam direktorijum %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Morate odrediti direktorijum."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12360,156 +12851,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Zadatak"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Morate imenovati ovaj vfolder."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Nije izabran server"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Izaberi datoteku"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "<b>Then</b>"
-msgstr "<b>Onda</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Odaberite direktorijum"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr "    "
-
-#: filter/filter.glade.h:2
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>Pr_avila filtera</b>"
-
-#: filter/filter.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>vFolder izvori</b>"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Uporedi sa"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Dolazeći"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom u ponoć datog datuma."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom kada se filtriranje desilo."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"trenutnim vremenom kada se filtriranje desilo."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "vreme u odnosu na trenutno vreme"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "pre"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "meseci"
-
-# bug: plural-forms
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "sekunde"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "samo određeni direktorijumi"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "trenutno vreme"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "vreme koje ste odredili"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "sa svim aktivnim mrežnim direktorijumima"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "sa svim lokalnim i aktivnim mrežnim direktorijumima"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "sa svim lokalnim direktorijumima"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "godine"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Važno"
 
@@ -12577,6 +12949,71 @@ msgstr "dolazeći"
 msgid "outgoing"
 msgstr "odlazeći"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>Pr_avila filtera</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Uporedi sa"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Dolazeći"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom u ponoć datog datuma."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom kada se filtriranje desilo."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"trenutnim vremenom kada se filtriranje desilo."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "vreme u odnosu na trenutno vreme"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "pre"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "meseci"
+
+# bug: plural-forms
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "sekunde"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "trenutno vreme"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "vreme koje ste odredili"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "godine"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -12589,60 +13026,71 @@ msgstr "Izmeni pravilo"
 msgid "Rule name"
 msgstr "Ime pravila"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Pravila rezultata"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultat"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Postavke sastavljača"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Telo sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Telo ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Telo ili naslov sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovde"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Poruka sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Primaoci sadrže"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Pošiljalac sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Naslov sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Naslov ne sadrži"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "<b>Virtuelni _direktorijumi</b>"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Dodaj"
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Pošta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "VFolder izvor"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12675,45 +13123,308 @@ msgstr "_Dodaj potpis"
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "<b>Pr_avila filtera</b>"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Odaberite direktorijum"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Preračunaj"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Dodeli boju"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Dodeli boju"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Prilozi"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Zvono"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "sadrži"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiraj u direktorijum"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Datum primanja"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Datum slanja"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Obrisano"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "ne sadrži"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ne završava se sa"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ne postoji"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ne vraća"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ne zvuči kao"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ne počinje sa"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Ne postoji"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Priprema"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "završava se sa"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Postoji"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "postoji"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Izraz"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Sledi"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "je"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "je posle"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "je pre"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "je označen"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "je veći od"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "je manji od"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "nije"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "nije označen"
+
+#: mail/em-filter-i18n.h:36
+msgid "Junk Test"
+msgstr "Provera đubreta"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Dopisna lista"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Telo poruke"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Zaglavlje poruke"
+
+#: mail/em-filter-i18n.h:41
+msgid "Message is Junk"
+msgstr "Poruka je đubre"
+
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
+msgstr "Poruka nije đubre"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Premesti u direktorijum"
+
+#: mail/em-filter-i18n.h:44
+msgid "Pipe to Program"
+msgstr "Kroz cev do programa"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Pusti zvuk"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Čitaj"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Primaoci"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Reg. izraz pretraga"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Odgovoreno na"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "povraćaji"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "više povraćaja od"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "manje povraćaja od"
+
+#: mail/em-filter-i18n.h:53
+msgid "Run Program"
+msgstr "Pokreni program"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultat"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Pošiljalac"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Dodeli status"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Veličina (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "zvuči kao"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Izvorni nalog"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Određeno zaglavlje"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "počinje sa"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Prekini sa obradom"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Naslov"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Nedodeljen status"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
+msgstr "<b>Onda</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Osobine direktorijuma"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Osobine"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Ime direktorijuma"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Ukupno poruka"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Ukupno poruka"
+msgstr[1] "Ukupno poruka"
+msgstr[2] "Ukupno poruka"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Nepročitanih poruka"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Nepročitanih poruka"
+msgstr[1] "Nepročitanih poruka"
+msgstr[2] "Nepročitanih poruka"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12723,450 +13434,282 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolder-i"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "NEPOKLOPLjEN"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Učitavam..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam direktorijum %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam direktorijum %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruke u smeštaj na najvišem nivou"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u direktorijum"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Premesti u direktorijum"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Otkaži zaduženje"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Umnoži"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravim direktorijum „%s“"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "P_regled"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopiraj..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Premesti..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Preimenu_j"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Osobine..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "NEPOKLOPLjEN"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Sanduče"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Učitavam..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Preimenuj..."
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Pošta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Osobine"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Prene_si u direktorijum..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Pri_meni filtere"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "F_iltriraj đubre"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Filtriraj prema naslo_vu"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Filtriraj prema p_ošiljaocu"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Filtriraj prema p_rimaocu"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Filtriraj prema _dopisnoj listi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Podrazumevani"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "_Umnoži adresu veze"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Odgovor-za"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kome"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Naslov"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Diskusione grupe"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Nepodržan oblik potpisa"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Greška pri proveri potpisa"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri proveri potpisa"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Preuzimam „%s“"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Nepotpisana"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Ispravan potpis"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: mail/em-format-html.c:562
-#, fuzzy
-msgid "Valid signature but cannot verify sender"
-msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Nešifrovano"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr "Šifrovana, slabo"
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Šifrovana"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr "Šifrovana, dobro"
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Loše složen spoljni deo."
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:861
-#, 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:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežni podatak (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Oblikujem poruku"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Pošiljalac"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-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:1553
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13174,14 +13717,22 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Nepotpisana"
+
+#: mail/em-format-html-display.c:641
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema garancija da je pošiljalac poruke ispravan."
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Ispravan potpis"
+
+#: mail/em-format-html-display.c:642
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -13189,7 +13740,11 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno onaj za koga se izdaje."
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Neispravan potpis"
+
+#: mail/em-format-html-display.c:643
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13197,11 +13752,11 @@ msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena prilikom "
 "prenosa."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -13209,7 +13764,11 @@ msgstr ""
 "Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao "
 "biti proveren."
 
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Nešifrovano"
+
+#: mail/em-format-html-display.c:650
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13218,7 +13777,11 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti prilikom prenosa "
 "preko Interneta."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr "Šifrovana, slabo"
+
+#: mail/em-format-html-display.c:651
 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 "
@@ -13227,7 +13790,11 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće, "
 "da neko sa strane vidi sadržaj ove poruke u dogledno vreme."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Šifrovana"
+
+#: mail/em-format-html-display.c:652
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -13235,7 +13802,11 @@ msgstr ""
 "Ova poruka je šifrovana. Teško je moguće da neko sa strane vidi sadržaj ove "
 "poruke."
 
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr "Šifrovana, dobro"
+
+#: mail/em-format-html-display.c:653
 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 "
@@ -13244,39 +13815,162 @@ msgstr ""
 "Ova poruka je šifrovana, i to dobrim algoritmom. Veoma teško je moguće da "
 "neko sa strane vidi sadržaj ove poruke u doglednom vremenu."
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Po_gledaj sertifikat"
 
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat se ne može pregledati"
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
 msgid "_View Inline"
 msgstr "Po_gledaj unutar"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Preuzimam „%s“"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Loše složen spoljni deo."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP adresu (%s)"
+
+#: mail/em-format-html.c:861
+#, 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:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "pokazivač na lokalnu datoteku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na mrežni podatak (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Oblikujem poruku"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Od"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Odgovor-za"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Kome"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc (kopija)"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc (nevidljiva kopija)"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Pošiljalac"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+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:1553
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Datum"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Diskusione grupe"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s prilog"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepodržan oblik potpisa"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Greška pri proveri potpisa"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nepoznata greška pri proveri potpisa"
+
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Ubica-spama (ugrađen)"
@@ -13389,7 +14083,7 @@ msgstr "Pošalji _poruku..."
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -13402,7 +14096,7 @@ msgstr "Ovaj smeštaj ne podržava pretplate, ili nisu omogućene."
 msgid "Subscribed"
 msgstr "Pretplati se"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -13436,11 +14130,24 @@ msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "<b>Virtuelni _direktorijumi</b>"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "VFolder izvor"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "Samoprepoznavanje veza"
@@ -13926,63 +14633,33 @@ msgstr "port za pokretanje korisnikovog spamd-a"
 msgid "spamd port"
 msgstr "port spamd-a"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Postavke sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolucija Elm uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštanski nalozi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolucija mbox uvoznik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBoks (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Pošta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14040,34 +14717,6 @@ msgstr "Uvozim „%s“"
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolucija mbox uvoznik"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBoks (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14232,77 +14881,90 @@ msgstr "%s dopisna lista"
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d izabranih"
+msgid_plural "%d deleted"
+msgstr[0] "%d izabranih"
+msgstr[1] "%d izabranih"
+msgstr[2] "%d izabranih"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d neposlatih"
+msgid_plural "%d junk"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Priprema"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Priprema"
+msgstr[1] "Priprema"
+msgstr[2] "Priprema"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d poslatih"
+msgid_plural "%d sent"
+msgstr[0] "%d poslatih"
+msgstr[1] "%d poslatih"
+msgstr[2] "%d poslatih"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d neposlatih"
+msgid_plural "%d unsent"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d ukupno"
+msgid_plural "%d total"
+msgstr[0] "%d ukupno"
+msgstr[1] "%d ukupno"
+msgstr[2] "%d ukupno"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d neposlatih"
+msgid_plural ", %d unread"
+msgstr[0] "%d neposlatih"
+msgstr[1] "%d neposlatih"
+msgstr[2] "%d neposlatih"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 msgid "New Mail Folder"
 msgstr "Novi direktorijum sa poštom"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 msgid "Mail _Folder"
 msgstr "_Direktorijum sa poštom"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum sa poštom"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "proveravam servis"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Povezujem se na server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Ličnost"
@@ -14363,14 +15025,22 @@ 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:895
+msgid "Checking Service"
+msgstr "proveravam servis"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Povezujem se na server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr "    "
+
 #: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane vrste "
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Prikaz</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL nije podržan u ovoj verziji evolucije</b>"
@@ -14624,7 +15294,7 @@ msgstr "Ne citiraj originalnu poruku"
 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:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
@@ -14962,6 +15632,117 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
+msgstr "<b>vFolder izvori</b>"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Digitalni potpis</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Šifrovanje</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Prihvaćeno"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "G_otovo"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Osetljivo na velika i mala slova"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Pronađi u poruci"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Nađi:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Označi za praćenje"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Pretplate na direktorijume"
+
+#: mail/mail-dialogs.glade.h:18
+#, fuzzy
+msgid "License Agreement"
+msgstr "Saglasnost ključa"
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ništa nije izabrano"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Bezbednosni podaci"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Poruke koje ste izabrali za praćenje su dole izlistane.\n"
+"Molim odaberite akciju za sleđenje iz \"Oznaka\" menija."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Spisak naloga"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+msgid "_Due By:"
+msgstr "_Rok:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Oznaka:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Pretp_lati se"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Odjavi pretplatu"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "samo određeni direktorijumi"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "sa svim aktivnim mrežnim direktorijumima"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "sa svim lokalnim i aktivnim mrežnim direktorijumima"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "sa svim lokalnim direktorijumima"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15169,14 +15950,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15281,8 +16054,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ne mogu da premestim direktorijum: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15334,8 +16108,9 @@ msgstr "Ne mogu da otvorim izvor"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "i još %d kontakt."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15364,8 +16139,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ne briši"
+msgstr "_Povrati"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15429,8 +16205,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Ne mogu da obrišem direktorijum:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15472,13 +16251,44 @@ msgstr ""
 "    '%s'\n"
 "Potom su osveženi."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Premeštam direktorijum %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Morate odrediti direktorijum."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Morate imenovati ovaj vfolder."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nije izabran server"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15486,16 +16296,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Prepiši"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Pošalji"
@@ -15660,7 +16470,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15669,45 +16479,21 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Osetljivo na velika i mala slova"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Pronađi u poruci"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Nađi:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Digitalni potpis</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Šifrovanje</span>"
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Bezbednosni podaci"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Poništavam..."
@@ -15743,24 +16529,24 @@ msgstr "Osvežavam..."
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -15815,15 +16601,15 @@ msgstr "Osvežavam vdirektorijume za adresu: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vdirektorijume za adresu: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
@@ -15887,7 +16673,7 @@ msgstr "%d. %b, %k:%M "
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -15943,10 +16729,6 @@ msgstr "Prosledi"
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Čitaj"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -15959,49 +16741,49 @@ msgstr "Odgovori svima"
 msgid "Review"
 msgstr "Pročitaj"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Označi za praćenje"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Telo sadrži"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "G_otovo"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Telo ne sadrži"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Poruke koje ste izabrali za praćenje su dole izlistane.\n"
-"Molim odaberite akciju za sleđenje iz \"Oznaka\" menija."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Telo ili naslov sadrže"
 
-#: mail/message-tags.glade.h:6
-msgid "_Due By:"
-msgstr "_Rok:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Poruka sadrži"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Oznaka:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Primaoci sadrže"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Pretplate na direktorijume"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Pošiljalac sadrži"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ništa nije izabrano"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Naslov sadrži"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_erver:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Naslov ne sadrži"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Pretp_lati se"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Odjavi pretplatu"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Proba Evolucije"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Probni deo Evolucije"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16069,31 +16851,18 @@ msgstr "Da li da preskoči prozorče sa upozorenjem o razvoju"
 msgid "mail"
 msgstr "pošta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Nepoznata greška"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ne mogu da se registruje na OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Baza sa podešavanjima nije nađena"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Aktivne veze"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Opšta greška"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Izaberite OK da prekinete vezu"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16279,30 +17048,6 @@ msgstr "Ime direktorijuma ne može da sadrži znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ i „..“ su rezervisana imena direktorijuma."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Pošta za %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da GNOME Pilot alati nisu instalirani na ovaj sistem."
@@ -16320,110 +17065,94 @@ msgstr "Bug buddy nije instaliran."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može da se pokrene."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grupvajz"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kućica"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Novo"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr "Nova proba"
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
-msgstr "_Proba"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Napravi novu probnu stavku"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "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/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Aktivne veze"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Aktivne veze"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "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/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Izaberite OK da prekinete vezu"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "K_alendar"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Konatkti: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Pošta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "Za_duženja:"
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Vrsta direktorijuma:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Otvori direktorijum drugog korisnika"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ne mogu da se registruje na OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Nalog:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Baza sa podešavanjima nije nađena"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Ime direktorijuma:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Opšta greška"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Korisnik:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novo"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Uvoz datoteka"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Vremenska zona"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16437,7 +17166,7 @@ msgstr ""
 "\n"
 "Molim pritisnite dugme \"Napred\" da nastavite. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16449,17 +17178,17 @@ msgstr ""
 "\n"
 "Pritisnite dugme \"Primeni\" da sačuvate vaša podešavanja. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr "Nova proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Proba Evolucije"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr "_Proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Probni deo Evolucije"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Napravi novu probnu stavku"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16520,7 +17249,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može da uveze podatke iz sledećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16555,7 +17284,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:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16564,39 +17293,39 @@ msgstr ""
 "Hvala\n"
 "Tim Ximian Evolucije\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve delove evolucije"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovni prenos podataka iz Evolucije 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16671,6 +17400,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16915,6 +17666,11 @@ msgstr "Vaši sertifikati"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Sertifikat već postoji"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -17116,11 +17872,6 @@ msgstr "Jedinstveni IB subjekta"
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Sertifikat već postoji"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
@@ -17262,8 +18013,8 @@ msgstr "Pregledaj tekući kontakt"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17742,16 +18493,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:5
-msgid "Close this window"
-msgstr "Zatvori ovaj prozor"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _pošiljaoca u adresar"
@@ -18154,6 +18895,16 @@ msgstr "Ala_ti"
 msgid "_Undelete"
 msgstr "_Povrati"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Zatvori ovaj prozor"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18236,10 +18987,6 @@ msgstr "Sačuvaj trenutnu datoteku sa drugim imenom"
 msgid "Save the message in a specified folder"
 msgstr "Sačuvaj poruku u navedenom direktorijumu"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Pošalji"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18809,7 +19556,7 @@ msgid "Evolution Query"
 msgstr "Evolucija sažetak"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18968,27 +19715,264 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Lična identifikacija za HTTP server."
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Izabrani kalendari za objavljivanje"
+
+#~ msgid "Login name:"
+#~ msgstr "Prijavno ime:"
+
+#~ msgid "URL:"
+#~ msgstr "Adresa (URL):"
+
+#~ msgid "User Publishes"
+#~ msgstr "Korisnik objavljuje"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "urednik-kontakt-liste"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Sačuvaj listu kao VCard"
+
+#~ msgid "Groupwise"
+#~ msgstr "Grupvajz"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Nisam mogao da pokrenem vombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "K_alendar"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Opcije za zvučni alarm"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Opcije za tekstualni alarm"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Opcije za alarm preko E-pošte"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Opcije za program alarma"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Nepoznate opcije za alarm"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Ponavljanje alarma"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Poruka za prikaz:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Poruka za slanje"
+
+#~ msgid "Play sound:"
+#~ msgstr "Pusti zvuk:"
+
+#~ msgid "Run program:"
+#~ msgstr "Pokreni program:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Sa ovim argumentima:"
+
+#~ msgid "Basics"
+#~ msgstr "Osnove"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Datum/Vreme:"
+
+#~ msgid "Reminders"
+#~ msgstr "Podsetnici"
+
+#~ msgid "_Options..."
+#~ msgstr "_Opcije..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adresar..."
+
+#~ msgid "Reminder"
+#~ msgstr "Podsetnik"
+
+#~ msgid "B_usy"
+#~ msgstr "Z_uzet"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Po_verljivo"
+
+#~ msgid "Date & Time"
+#~ msgstr "Datum i vreme"
+
+#~ msgid "F_ree"
+#~ msgstr "_Slobodno"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Lič_no"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Ja_vno"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Dodaj prisu_tnog"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "Exceptions"
+#~ msgstr "Izuzeci"
+
+#~ msgid "Preview"
+#~ msgstr "Izgled"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Pravilo za ponavljanje"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Posebno ponavljanje"
+
+#~ msgid "_Modify"
+#~ msgstr "_Izmeni"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Bez ponavljanja"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Jednostavno ponavljanje"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _gotovo"
+
+#~ msgid "Progress"
+#~ msgstr "Napredak"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Pov_erljivo"
+
+#~ msgid "Folder:"
+#~ msgstr "Direktorijum:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Početak:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Kraj:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Završetak:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Do:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Ništa</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Nastala je greška u CORBA sistemu\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objekat nije mogao biti pronađen\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Dodaj pošiljaoca u adresa_r"
+
+#~ msgid "_Options"
+#~ msgstr "_Opcije"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "_Početno vreme sastanka:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "_Krajnje vreme sastanka:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Greška pri otvaranju %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Na_pravi pravilo od poruke"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Nisam mogao da napravim prozor za sastavljanje:\n"
+#~ "Ne mogu da aktiviram komponentu HTML urednika."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Pravila rezultata"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Ime direktorijuma"
+
+#~ msgid "_Rename"
+#~ msgstr "Preimenu_j"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Osobine..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kućica"
+
+#~ msgid "C_alendar:"
+#~ msgstr "K_alendar"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Konatkti: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Pošta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "Za_duženja:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Vrsta direktorijuma:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Otvori direktorijum drugog korisnika"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Ime direktorijuma:"
+
+#~ msgid "_User:"
+#~ msgstr "_Korisnik:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Neuspešno povezivanje sa LDAP serverom"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Neuspešna prijava na LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Nisam mogao da obavim upit na Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Greška u čitanju podataka šeme"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Server nije odgovorio sa ispravnim podacima šeme"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " P_okaži podržane baze "
 
@@ -19060,9 +20044,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Webcam:"
 #~ msgstr "Veb stranica:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Uređivač kategorija nije dostupan."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19113,9 +20094,6 @@ msgstr "%s (%d%% završeno)"
 #~ "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
 #~ "otkazivanje?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19133,45 +20111,15 @@ msgstr "%s (%d%% završeno)"
 #~ "Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
 #~ "njegovo otkazivanje?"
 
-#~ 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?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Sigurno želite da obrišete zaduženje `%s'?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Sigurno želite da obrišete ovo neimenovano zaduženje?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Sigurno želite da izbrišete ovan neimenovani unos u dnevnik?"
 
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d zakazani sastanak?"
-#~ msgstr[1] "Sigurno želite da izbrišete %d zakazana sastanka?"
-#~ msgstr[2] "Sigurno želite da izbrišete %d zakazanih sastanaka?"
-
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d zaduženje"
-#~ msgstr[1] "Sigurno želite da izbrišete %d zaduženja"
-#~ msgstr[2] "Sigurno želite da izbrišete %d zaduženja"
-
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Sigurno želite da izbrišete %d unos u dnevnik?"
-#~ msgstr[1] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-#~ msgstr[2] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Pozovi druge..."
 
@@ -19219,9 +20167,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Learning junk and/or non junk message(s)"
 #~ msgstr "Učenje đubreta i ne-đubreta od poruka"
 
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
-
 #~ msgid "Posting not allowed by news server"
 #~ msgstr "Server ne dozvoljava slanje članaka"
 
@@ -19254,174 +20199,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Nepoznat odgovor servera: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Preračunaj"
-
-#~ msgid "Assign Color"
-#~ msgstr "Dodeli boju"
-
-#~ msgid "Assign Score"
-#~ msgstr "Dodeli boju"
-
-#~ msgid "Attachments"
-#~ msgstr "Prilozi"
-
-#~ msgid "Beep"
-#~ msgstr "Zvono"
-
-#~ msgid "contains"
-#~ msgstr "sadrži"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiraj u direktorijum"
-
-#~ msgid "Date received"
-#~ msgstr "Datum primanja"
-
-#~ msgid "Date sent"
-#~ msgstr "Datum slanja"
-
-#~ msgid "Deleted"
-#~ msgstr "Obrisano"
-
-#~ msgid "does not contain"
-#~ msgstr "ne sadrži"
-
-#~ msgid "does not end with"
-#~ msgstr "ne završava se sa"
-
-#~ msgid "does not exist"
-#~ msgstr "ne postoji"
-
-#~ msgid "does not return"
-#~ msgstr "ne vraća"
-
-#~ msgid "does not sound like"
-#~ msgstr "ne zvuči kao"
-
-#~ msgid "does not start with"
-#~ msgstr "ne počinje sa"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ne postoji"
-
-#~ msgid "Draft"
-#~ msgstr "Priprema"
-
-#~ msgid "ends with"
-#~ msgstr "završava se sa"
-
-#~ msgid "Exist"
-#~ msgstr "Postoji"
-
-#~ msgid "exists"
-#~ msgstr "postoji"
-
-#~ msgid "Expression"
-#~ msgstr "Izraz"
-
-#~ msgid "Follow Up"
-#~ msgstr "Sledi"
-
-#~ msgid "is"
-#~ msgstr "je"
-
-#~ msgid "is after"
-#~ msgstr "je posle"
-
-#~ msgid "is before"
-#~ msgstr "je pre"
-
-#~ msgid "is Flagged"
-#~ msgstr "je označen"
-
-#~ msgid "is greater than"
-#~ msgstr "je veći od"
-
-#~ msgid "is less than"
-#~ msgstr "je manji od"
-
-#~ msgid "is not"
-#~ msgstr "nije"
-
-#~ msgid "is not Flagged"
-#~ msgstr "nije označen"
-
-#~ msgid "Junk Test"
-#~ msgstr "Provera đubreta"
-
-#~ msgid "Mailing list"
-#~ msgstr "Dopisna lista"
-
-#~ msgid "Message Body"
-#~ msgstr "Telo poruke"
-
-#~ msgid "Message Header"
-#~ msgstr "Zaglavlje poruke"
-
-#~ msgid "Message is Junk"
-#~ msgstr "Poruka je đubre"
-
-#~ msgid "Message is not Junk"
-#~ msgstr "Poruka nije đubre"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Premesti u direktorijum"
-
-#~ msgid "Pipe to Program"
-#~ msgstr "Kroz cev do programa"
-
-#~ msgid "Play Sound"
-#~ msgstr "Pusti zvuk"
-
-#~ msgid "Recipients"
-#~ msgstr "Primaoci"
-
-#~ msgid "Regex Match"
-#~ msgstr "Reg. izraz pretraga"
-
-#~ msgid "Replied to"
-#~ msgstr "Odgovoreno na"
-
-#~ msgid "returns"
-#~ msgstr "povraćaji"
-
-#~ msgid "returns greater than"
-#~ msgstr "više povraćaja od"
-
-#~ msgid "returns less than"
-#~ msgstr "manje povraćaja od"
-
-#~ msgid "Run Program"
-#~ msgstr "Pokreni program"
-
-#~ msgid "Sender"
-#~ msgstr "Pošiljalac"
-
-#~ msgid "Set Status"
-#~ msgstr "Dodeli status"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Veličina (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "zvuči kao"
-
-#~ msgid "Source Account"
-#~ msgstr "Izvorni nalog"
-
-#~ msgid "Specific header"
-#~ msgstr "Određeno zaglavlje"
-
-#~ msgid "starts with"
-#~ msgstr "počinje sa"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Prekini sa obradom"
-
-#~ msgid "Unset Status"
-#~ msgstr "Nedodeljen status"
-
 #~ msgid "Check _Incoming Mail"
 #~ msgstr "Proveri pristig_lu poštu"
 
@@ -19660,9 +20437,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Finished"
 #~ msgstr "Gotovo"
 
-#~ msgid "Group:"
-#~ msgstr "Grupa:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20207,9 +20981,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "component"
 #~ msgstr "deo"
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmi"
-
 #~ msgid "Geographical position"
 #~ msgstr "Geografski položaj"
 
@@ -20773,9 +21544,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Evolution is now exiting ..."
 #~ msgstr "Evolucija sada izlazi..."
 
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Izaberite sadržaj iz adresara"
-
 #~ msgid ""
 #~ "The task backend for\n"
 #~ "%s\n"
@@ -20820,18 +21588,9 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Dejstvo alarma</b>"
 
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "<b>Zvuk alarma</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "<b>Datum i vreme</b>"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Opis</b>"
-
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>_Sažetak</b>"
 
@@ -21248,9 +22007,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Primam rezultate pretrage sa LDAP servera"
 
-#~ msgid "Error performing search"
-#~ msgstr "Greška tokom pretrage"
-
 #~ msgid "Repository is offline"
 #~ msgstr "Arhiva nije na mreži"
 
@@ -21383,9 +22139,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Osnovni proces lokalnog /LDAP Evolucija adresara"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Osnovni proces lokalnih datoteka Evolucije kalendara"
-
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Osnovni proces lokalnog /LDAP Evolucija adresara"
 
@@ -21485,9 +22238,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Use Score"
 #~ msgstr "Koristi rezultat"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Kursor nije mogao da bude učitan\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Direktorijum sa podacima o kontaktima"
 
@@ -22066,9 +22816,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "View the selected folder"
 #~ msgstr "Pregledaj izabrani direktorijum"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopiraj..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Linija direktorijuma"
 
@@ -22078,18 +22825,12 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Idi u direktorijum..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Premesti..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Novi direktorijum"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Ukloni direktorijum drugog korisnika"
 
-#~ msgid "_Rename..."
-#~ msgstr "_Preimenuj..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Traka sa prečicama"
 
@@ -22102,9 +22843,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Make this Occurrence _Movable"
 #~ msgstr "Neka ova pojava bude _pokretna"
 
-#~ msgid "Information"
-#~ msgstr "Informacija"
-
 #~ msgid "Error"
 #~ msgstr "Greška"
 
diff --git a/po/tr.po b/po/tr.po
index 8db90c00f5..e36001adb9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-01-24 00:49-0500\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -20,16 +20,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Adres Defteri"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Bağlantılar: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution e-posta programı."
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -55,34 +45,255 @@ msgstr "kart"
 msgid " card"
 msgstr "1 kart"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Bağlantılar: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution e-posta programı."
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "İmleç yüklenemedi\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Sunucudan grup listesi alınamadı."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Adres defteri yüklenemedi"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategori düzenleyici bulunamadı."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Adres Defterine kaydet"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Öntanımlı adres defteri yüklenemedi."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Arama yaparken bir hata oluştu"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Sil"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "ve diğer 1 kart."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Bağlantı eklenirken hata oluştu"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Adres Defteri adres görüntüleyici"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Öntanımlı Eşzamanlama Adresi:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Adres defteri yüklenemedi"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadı"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Kimlik denetimi yapılamadı.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Otomatik Tamamlama"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s için parolayı girin (kullanıcı: %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikalar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Posta hesaplarını buradan yapılandırın"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Adres Defteri"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adres defteri menüsü mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adres Defteri adres görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adres Defteri kart görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Adres Defteri bileşeni"
+
+#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -115,7 +326,7 @@ msgstr "Yeni Bağlantı"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Bağlantılar:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -139,15 +350,15 @@ msgid "Migrating `%s':"
 msgstr "'%s' geçiş yapılıyor:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Bu Bilgisayarda"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -156,21 +367,21 @@ msgid "Personal"
 msgstr "Kişisel"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Otomatik Tamamlama"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -178,58 +389,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Bağlantılar"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Kimlik denetimi yapılamadı.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s için parolayı girin (kullanıcı: %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -249,63 +469,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Otomatik Tamamlama"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Bağlantılar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Sertifikalar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Posta hesaplarını buradan yapılandırın"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution Adres Defteri"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adres defteri menüsü mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Adres Defteri adres görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Adres Defteri kart görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Adres Defteri bileşeni"
-
-#: 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "E-posta özet bileşen mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -313,7 +476,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -322,8 +485,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -349,6 +511,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Kimlik Denetimi"
@@ -398,13 +561,11 @@ msgid "Anonymously"
 msgstr "Anonim"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Temel"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Ayrıntılar"
 
@@ -644,34 +805,26 @@ msgid "cards"
 msgstr "kart"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "dakika"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Adres Defterinden Bağlantıları Seç"
+#: 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:208
+msgid "Remove All"
+msgstr "Tümünü Sil"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Sil"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Tümünü Sil"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Bağlantı Listesini Görüntüle"
@@ -686,7 +839,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML Posta Gönderilsin mi?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Bağlantılara Ekle"
 
@@ -694,15 +847,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Kaynak"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Adres Defterinden Bağlantıları Seç"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -729,6 +890,11 @@ msgstr "_Kategori:"
 msgid "_Find"
 msgstr "Bul"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Ara"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -775,9 +941,8 @@ msgid "<b>Work</b>"
 msgstr "Çalışma Haftası"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -802,7 +967,6 @@ msgid "Birthday:"
 msgstr "_Doğum günü:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "_Takvim:"
@@ -818,15 +982,15 @@ msgid "Company:"
 msgstr "Şirket"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Bağlantı"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Bağlantı Düzenleyici"
 
@@ -936,8 +1100,8 @@ msgstr "Web Sayfası:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -961,44 +1125,28 @@ msgid "_File under:"
 msgstr "Dosya adı:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "S_unucu:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Gerçekten bu bağlantları\n"
-"silmek istiyor musunuz?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Gerçekten bu bağlantıyı\n"
-"silmek istiyor musunuz?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Addres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Düzenlenebilir"
 
@@ -1977,138 +2125,130 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "İ_letiyi Gönder"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Grup"
+msgid "Service"
+msgstr "Servis hazır"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Konum: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Kullanıcı adı:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Diğer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Grup"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Kaynak Kitabı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Bu Yeni Bir Bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Düzenlenebilir Alanlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Değiştirildi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Lütfen aşağıdaki seçeneklerden birisini seçiniz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Tekrarlama tarihi geçersiz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Sil"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "İ_letiyi Gönder"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Servis hazır"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Konum: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Kullanıcı adı:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Bağlantıyı Hızlı Ekle"
@@ -2126,6 +2266,22 @@ msgstr "_Tam İsim:"
 msgid "E-_mail:"
 msgstr "_E-posta:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Gerçekten bu bağlantları\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. Adres:"
@@ -2252,48 +2408,69 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Adres Defterinden Bağlantıları Seç"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Üyeler"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Seçili dosyaları ekler listesinden sil"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Seçili"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Bu listeye bir e-posta kaydedilirken adresi gizle"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Liste adı:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "bağlantı-listesi-düzenleyici"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Kitap"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Yeni Liste"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Gerekli Katılımcılar"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Bağlantı Listesi Düzenleyici"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Listeyi VCard Olarak Kaydet"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Değiştirilen Bağlantı:"
@@ -2332,436 +2509,11 @@ msgstr ""
 "Yine de eklemek istiyor musunuz?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Liste Üyeleri"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "E-posta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Kurum"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grup"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "İş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Cep Telefonu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "Kişisel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Not"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Meslek Tanımı"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "E-posta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Web sayfası"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Başarıldı"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Depo çevrimdışı"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adres defteri bulunamadı"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Yeni Bağlantı Listesi"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "İzin yok"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Bağlantı bulunamadı"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Bu kart numarası var"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Protokol desteklenmiyor"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "İptal Edildi"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "'%s' adı değiştirilemedi: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Kimlik Denetimi Başarısız."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Kimlik Denetimi İsteniyor"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS mevcut değil"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "İleti bulunmuyor"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Diğer hata"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
-"olmadığınızı ve dosyanın yerini kontrol edin."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
-"ya da LDAP sunucusu erişilemiyor olabilir."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Evolution'ın bu sürümünde LDAP desteği bulunmuyor. \n"
-"Eğer Evolution'ı LDAP desteği ile kullanmak istiyorsanız,\n"
-"programı CVS kaynaklarından alacağınız openLDAP desteği\n"
-"ile kurmalısınız:\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
-"ya da LDAP sunucusu erişilemiyor olabilir."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Bu sorgunun tamamlanmasına kadar geçen süre, bu adres defteri için\n"
-"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/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Bu arama başarısızlıkla sonuçlandı."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Liste eklenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Bağlantı eklenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Liste düzenlenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Bağlantı düzenlenirken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Listeyi silerken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Bağlantıyı silerken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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ın görüntülenmesi için %d yeni pencerenin \n"
-"açılması gerekiyor. Gerçekten tüm bu kartları \n"
-"görmek istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s dosyası mevcut\n"
-"Üzerine yazmak istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Üzerine yaz"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "kart.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "Kartı taşı:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kartı kopyala:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Kartları taşı:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kartları kopyala:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Adres Defterinden Bağlantıları Seç"
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Çoklu VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "%s için 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:199
-msgid "(none)"
-msgstr "(hiçbiri)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Bir Eylem Seçin"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Yeni bir bağlantı yarat: \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "\"%s\" bağlantısına adres ekle"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Adres Defterini Araştırılıyor..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Bağlantı Bilgisini Düzenle"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-posta Adresini Birleştir"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ve diğer 1 kart."
-msgstr[1] "ve diğer 1 kart."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "_Kapsamlı Başlıkları Göster"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Bağlantıyı VCard olarak kaydet"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Adres Defterine kaydet"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Bağlantı yok"
@@ -2775,9 +2527,9 @@ msgstr[1] "%d bağlantı"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Arama"
 
@@ -2793,134 +2545,134 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Kartlar düzenlenirken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "İsim başlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "E-posta başlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "Adres Defteri:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Yeni Bağlantı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Dizine Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Bağlantıları Ara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot Ayarları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
@@ -2954,6 +2706,8 @@ msgid "Car Phone"
 msgstr "Araç Telefonu"
 
 #: 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:3
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -2961,6 +2715,21 @@ msgstr "Kategoriler"
 msgid "Company Phone"
 msgstr "Şirket Telefonu"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "E-posta"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "2. E-posta Adresi"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "3. E-posta Adresi"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Tam İsim"
@@ -2999,14 +2768,29 @@ msgstr "Ürdün"
 msgid "Manager"
 msgstr "Yönetici"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Lakap"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Not"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofis"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Kurum"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Başka Fakslar"
@@ -3059,29 +2843,21 @@ msgstr "Birim"
 msgid "Web Site"
 msgstr "Web Sayfası"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Genişlik"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Yükseklik"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seçili"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Alan"
@@ -3098,7 +2874,11 @@ msgstr "Metin Modeli"
 msgid "Max field name length"
 msgstr "Azami alan adı uzunluğu"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sütun Genişliği"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3112,7 +2892,7 @@ msgstr ""
 "\n"
 "Buraya çift tıklayarak bir bağlantı yaratın."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3122,13 +2902,405 @@ msgstr ""
 "\n"
 "Bu bakışta gösterilecek öğe yok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sütun Genişliği"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seçili"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Liste Üyeleri"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "E-posta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "İş"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "Kişisel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Meslek Tanımı"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Web sayfası"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Başarıldı"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Depo çevrimdışı"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Adres defteri bulunamadı"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Yeni Bağlantı Listesi"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "İzin yok"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Bağlantı bulunamadı"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Bu kart numarası var"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Protokol desteklenmiyor"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "İptal Edildi"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "'%s' adı değiştirilemedi: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Kimlik Denetimi Başarısız."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Kimlik Denetimi İsteniyor"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS mevcut değil"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "İleti bulunmuyor"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Diğer hata"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
+"olmadığınızı ve dosyanın yerini kontrol edin."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
+"ya da LDAP sunucusu erişilemiyor olabilir."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Evolution'ın bu sürümünde LDAP desteği bulunmuyor. \n"
+"Eğer Evolution'ı LDAP desteği ile kullanmak istiyorsanız,\n"
+"programı CVS kaynaklarından alacağınız openLDAP desteği\n"
+"ile kurmalısınız:\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
+"ya da LDAP sunucusu erişilemiyor olabilir."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Bu sorgunun tamamlanmasına kadar geçen süre, bu adres defteri için\n"
+"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/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Bu arama başarısızlıkla sonuçlandı."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Liste eklenirken hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Bağlantı eklenirken hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Liste düzenlenirken hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Bağlantı düzenlenirken bir hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Listeyi silerken bir hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Bağlantıyı silerken bir hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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ın görüntülenmesi için %d yeni pencerenin \n"
+"açılması gerekiyor. Gerçekten tüm bu kartları \n"
+"görmek istiyor musunuz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s dosyası mevcut\n"
+"Üzerine yazmak istiyor musunuz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Üzerine yaz"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "kart.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "Kartı taşı:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kartı kopyala:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Kartları taşı:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kartları kopyala:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Adres Defterinden Bağlantıları Seç"
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Çoklu VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "%s için 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:198
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Birincil E-posta Adresi"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Bir Eylem Seçin"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir bağlantı yarat: \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "\"%s\" bağlantısına adres ekle"
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Adres Defterini Araştırılıyor..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Bağlantı Bilgisini Düzenle"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "E-posta Adresini Birleştir"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ve diğer 1 kart."
+msgstr[1] "ve diğer 1 kart."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "_Kapsamlı Başlıkları Göster"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Bağlantıyı VCard olarak kaydet"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Adres Defterine kaydet"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3172,6 +3344,11 @@ msgstr "Evolution VCard alıcısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Zarfı yazdır"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3183,11 +3360,6 @@ msgstr "Seçili bağlantıları yazdır"
 msgid "Print contact"
 msgstr "Seçili bağlantıları yazdır"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Zarfı yazdır"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bn. Tahoma"
@@ -3374,6 +3546,23 @@ msgstr "B_ağlantı Listesi"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "İleti açılamadı"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Adres defteri yüklenemedi"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Adres defterini açamadım"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3431,23 +3620,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "İç hata"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "İleti açılamadı"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Adres defteri yüklenemedi"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Adres defterini açamadım"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Öntanımlı adres defteri yüklenemedi."
@@ -3464,40 +3636,364 @@ msgstr "Dosya adı belirtilmedi."
 msgid "Unnamed List"
 msgstr "İsimsiz Liste"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Silme"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "_Sonra Gönder"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Gerçekten %d görevi silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Gerçekten %d randevuyu silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Randevu"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Değişiklikleri Sil"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Gönder"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution Takvim yerel dosya arkayüzü"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Parolayı Girin"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "wombat sunucusu başlatılamadı"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Wombat başlatılamadı"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Pilot'tan takvim uygulama bloğu okunamadı"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Öntanımlı Öncelik:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama bloğu okunamadı"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Takvim ve Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Takvim"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Takvim ve Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Takvim yapılandırma denetimi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Takvim/Görev düzenleyici"
+
+#: 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Takvim"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Başlangıç:"
@@ -3583,10 +4079,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
@@ -3735,9 +4227,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Gün gezgininde tarih numaralarını göster"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Özet içeriği"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Tanım içeriği"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Açıklama içeriği"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Tanım içeriği"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Eşleme yok"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3761,8 +4274,8 @@ msgid "Purge events older than"
 msgstr "küçük"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "gün"
 
@@ -3773,7 +4286,7 @@ msgstr "%d %B %A %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%d %b %a"
@@ -3823,66 +4336,54 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Takvim"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Yeni randevu"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Randevu"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Yeni bir randevu oluştur"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Yeni toplantı"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Yeni bir toplantı isteği oluştur"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Yeni Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir tüm gün randevusu oluştur"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "_Takvim:"
+msgid "Cale_ndar"
+msgstr "Takvim"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Yeni bir dizin yarat"
@@ -3913,27 +4414,6 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Özet içeriği"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Tanım içeriği"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Açıklama içeriği"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Tanım içeriği"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Eşleme yok"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Takvimi açarken bir hata oluştu"
@@ -3951,227 +4431,132 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Ses Alarm Seçenekleri"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "İleti Alarm Seçenekleri"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "E-posta Alarm Seçenekleri"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Program Alarm Seçenekleri"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Bilinmeyen Alarm Seçenekleri"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Alarm Tekrarı"
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Başlangıç:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Message to Display:"
-msgstr "İleti Görünümü"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Gönderilecek Mesaj"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Ses çal:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Alarmı tekrar et"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Program çalıştır:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Gönder:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Bu argümanlarla:"
+msgid "<b>Options</b>"
+msgstr "Açıklama:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "Hatırlatıcılar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Uyarılar"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "saat"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Bir ileti yaz"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Ekle"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Temel"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Tarih/Zaman:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "İ_letiler"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Bir ses çal"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Hatırlatıcı"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Bir program çalıştır"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Gönder:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Bir e-posta gönder"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Özet:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Hesap:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Program çalıştır:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Seçenekler..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Alarmı tekrar et"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "sonra"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "önce"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "gün"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "randevu sonu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "saat"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "dakika"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "randevu başlangıcı"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Bir dosya dı vermelisiniz"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Yeni Takvim Ekle"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Görev Listesi Grubu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Renkler"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Bir renk seçin"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Yeni Takvim Ekle"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Grup Ekle..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Tazele"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Ekle"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "hafta"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Uyarılar"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4289,7 +4674,7 @@ msgid "Free/Busy Publishing"
 msgstr "Boş/Meşgul İsteği"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Cuma"
@@ -4303,7 +4688,7 @@ msgid "Minutes"
 msgstr "Dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pazartesi"
@@ -4313,7 +4698,7 @@ msgid "S_un"
 msgstr "_Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Cumartesi"
@@ -4327,7 +4712,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "_Gün gezgininde tarih numaralarını göster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Pazar"
@@ -4341,7 +4726,7 @@ msgid "T_hu"
 msgstr "P_er"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Perşembe"
@@ -4355,7 +4740,7 @@ msgid "Time format:"
 msgstr "Zaman biçimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Salı"
@@ -4365,7 +4750,7 @@ msgid "W_eek starts:"
 msgstr "_Hafta başı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Çarşamba"
@@ -4399,7 +4784,8 @@ msgstr "_Ay görünümünde hafta sonlarını sıkıştır"
 msgid "_Day begins:"
 msgstr "_Gün başı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4449,6 +4835,81 @@ msgstr "Ç_ar"
 msgid "before every appointment"
 msgstr "her randevudan önce"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Bir dosya dı vermelisiniz"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Yeni Takvim Ekle"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Görev Listesi Grubu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Renkler"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Bir renk seçin"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Yeni Takvim Ekle"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Grup Ekle..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Tazele"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "hafta"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Olay silindi."
@@ -4497,81 +4958,75 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Onaylama hatası: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#, fuzzy
+msgid " (Due "
+msgstr "Tarihe göre "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Tarihe göre "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Öğe güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Farklı kaydet..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Şimdiki e-posta işlemini iptal et"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Onaylama hatası: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Tamamlanan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Tamamlanan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-#, fuzzy
-msgid " (Due "
-msgstr "Tarihe göre "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Tarihe göre "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4639,8 +5094,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Adres Defteri..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Bağlantılar..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4650,162 +5106,221 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Hatırlatıcı"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Bilgi"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Toplantı"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Bitiş tarihi yanlış"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Adres defterini açamadım"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "her randevudan önce"
+msgstr[1] "her randevudan önce"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "randevu sonu"
+msgstr[1] "randevu sonu"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "her randevudan önce"
+msgstr[1] "her randevudan önce"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "_Tüm gün olayları"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "her randevudan önce"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Meşgu_l"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "her randevudan önce"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Kategoriler..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "her randevudan önce"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Görev Listesi"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Sınıflandırma"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Tarih & Zaman"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Gizli"
+msgid "A_ll day event"
+msgstr "_Tüm gün olayları"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Tarih/Zaman"
+msgid "C_ustomize..."
+msgstr "Özel Görünümü Kaydet..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Boş"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Kategoriler..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Konum: "
+msgid "Cale_ndar:"
+msgstr "_Takvim:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Ö_zel"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Sınıflandırma"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Genel"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Gizli"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Zamanı Farklı Göster"
+#, fuzzy
+msgid "L_ocation:"
+msgstr "Konum: "
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Özel"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Genel"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Zamanı Farklı Göster"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Ö_zet:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Uyarılar"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Açıklama:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "B_itiş tarihi:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "B_aşlangıç tarihi:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Yok"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 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:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Bir düzenleyen kişi olmak zorunda."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdır."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
 msgstr "_Sil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -4846,36 +5361,45 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Katılımcı"
+msgid "<b>Attendees</b>"
+msgstr "<b>Başlangıç:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "_Göndereni Adres Defterine Ekle"
+msgid "<b>Organizer</b>"
+msgstr "<b>Son tarih:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "O_rganizatörü Değiştir"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Organizatör:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Bağlantılar..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "O_rganizatörü Değiştir"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizatör:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -4944,151 +5468,143 @@ msgstr "Bu ve Bundan Sonraki Tekrarlamalar"
 msgid "All Instances"
 msgstr "Tüm Tekrarlamalar"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Bu randevuyu Evolution düzenleyemiyor."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Tekrarlama tarihi geçersiz"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "birinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "ikinci"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "üçüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "dördüncü"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "sonuncu"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Başka Tarih"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "gün"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr " "
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "tekrarlar"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Tarih/Zaman"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Her"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "İstisnalar"
+msgid "<b>Exceptions</b>"
+msgstr "Açıklama:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Önizleme:"
+msgid "<b>Preview</b>"
+msgstr "Önizleme"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Tekrarlama Kuralı"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Özel tekrar"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Düzenle"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Tekrarlama yok"
+msgid "<b>Recurrence</b>"
+msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Sil"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Her"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Basit tekrar"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Toplantıyı düzenle"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "için"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "daima"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "ay"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "tarihe kadar"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "hafta"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "yıl"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Açıklama yok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Bu dizini sil"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "_Görev Listesi"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Tamamlanma tarihi yanlış"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Gösterilecek Mesaj:"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "_Biten %"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Gösterilecek Mesaj:"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -5100,8 +5616,8 @@ msgstr "Yüksek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "İşlemde"
@@ -5113,23 +5629,22 @@ msgid "Low"
 msgstr "Düşük"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Başlamadı"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "İşlemde"
+msgid "P_ercent complete:"
+msgstr "Biten Yüzde: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5154,36 +5669,42 @@ msgstr "_Durum:"
 msgid "_Web Page:"
 msgstr "Web Sayfası:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Görev"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Görevlendirme"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Bitiş tarihi hatalı"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Adres defterini açamadım"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "_Gizli"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Gösterilecek Mesaj:"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Gösterilecek Mesaj:"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Dizin:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5194,60 +5715,58 @@ msgstr "_Başlangıç Tarihi:"
 msgid "_Due date:"
 msgstr "_Tarihe Göre:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Sunucudan hatalı kimlik sınama yanıtı."
+msgid "_Group:"
+msgstr "Grup:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Boş/Meşgul bilgi bitişi: <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Gün"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Boş/Meşgul bilgisi"
+msgid "<b>Publishing _Location</b>"
+msgstr "Boş/Meşgul İsteği"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Boş/Meşgul İsteği"
+msgid "Free/Busy Editor"
+msgstr "Boş/Meşgul bilgisi"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Liste adı:"
+msgid "_Daily"
+msgstr "Gün"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Parola"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Parola"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Bu parolayı hatırla"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Kullanıcı adı:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Hafta"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5329,7 +5848,7 @@ msgstr "%s sunucu %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Görev eklemek için tıklayın"
@@ -5338,6 +5857,11 @@ msgstr "Görev eklemek için tıklayın"
 msgid "Untitled"
 msgstr "İsimsiz"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Özet:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5349,7 +5873,7 @@ msgstr "Son tarih:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Durum:"
 
@@ -5362,20 +5886,93 @@ msgstr "Öncelik:"
 msgid "Web Page:"
 msgstr "Web Sayfası:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Genel"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Bitiş Tarihi"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Özel"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Başlangıç Tarihi"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Gizli"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Özet"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Boş"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Meşgul"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "K"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "G"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "B"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Evet"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Hayır"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Bilinmiyor"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Tekrarlama"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Görevlendirildi"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5421,95 +6018,101 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Boş"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Meşgul"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Öğeler güncelleniyor"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Aç"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "W_eb Sayfasını Aç"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Yazdır..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Görev Ata"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "i_Calendar Olarak Yönlendir"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Seçilen Görevleri Bitmiş Olarak İşaretle"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Sil"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Seçilen Görevleri Sil"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Farklı kaydet..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Görev eklemek için tıklayın"
 
@@ -5518,181 +6121,112 @@ msgstr "Görev eklemek için tıklayın"
 msgid "% Complete"
 msgstr "Biten %"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Tamamlandı"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Tamamlanma Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Tarihe göre:"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Öncelik"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Başlangıç Tarihi"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Özet"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Taşınıyor"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Kopyalanıyor"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Yeni Toplantı"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Konumu _Seç"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Seç..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Dizine Kopyala..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Dizine Taşı..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Toplantı Tarihi Ayarla..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_iCalendar olarak Yönlendir..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ayarlar..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Bitiş Tarihi"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Başlangıç Tarihi"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Bilinmiyor"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Tekrarlama"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Görevlendirildi"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Evet"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Hayır"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "K"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "G"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "D"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "B"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5716,36 +6250,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "öö"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "ös"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dakika bölmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%d %B %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dakika bölmeleri"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "öö"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "ös"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5812,37 +6346,36 @@ msgid ", ending on "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Başlangıç:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Bitiş: </b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Durum"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Tamamlanan:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Son tarih:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Tarihe göre "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5850,305 +6383,285 @@ 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:918
-msgid "<i>None</i>"
-msgstr "<i>Hiçbiri</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Konum: "
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Geçici Olarak Kabul Edildi"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Tamam"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Geçici olarak kabul et"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Toplantı İptali"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı İletisi"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Hatalı Görev İletisi"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul İletisi"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Bu mesaj düzgün değil"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA sisteminde bir hata oluştu\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Öğe bulunamadı\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Katılımcı bilgileri güncellenemedi!\n"
+#: calendar/gui/e-itip-control.c:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
@@ -6177,6 +6690,10 @@ msgstr "Takvim Yükleniyor"
 msgid "Loading calendar..."
 msgstr "Takvim yükleniyor..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Organizatör:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Sunucu Mesajı:"
@@ -6193,11 +6710,6 @@ msgstr "başlangıç-tarihi"
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Gerekli Katılımcılar"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Seçimlik Katılımcılar"
@@ -6265,6 +6777,28 @@ msgstr ""
 msgid "In Process"
 msgstr "İşlemde"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%d %B %A, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 "%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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ofiste Değil"
@@ -6273,98 +6807,64 @@ msgstr "Ofiste Değil"
 msgid "No Information"
 msgstr "Bilgi Yok"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "_Göndereni Adres Defterine Ekle"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Seçenekler"
+msgid "O_ptions"
+msgstr "Seçenekler"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "_Sadece Çalışma Saatlerini Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "_Daha Küçük Göster"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Boş/Meşgul Olanları Güncelle"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Otomatik seç"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Tüm Kişiler ve Kaynaklar"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Tüm _Kişiler ve Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Gerekli Kişiler"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Gerekli Kişiler ve _Bir Kaynak"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Toplantı b_aşlama saati :"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Toplantı _bitiş saati:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 "%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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6373,120 +6873,53 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s tarihinde görevler açılıyor"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"'%s' hatası:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s tarihinde görevler açılıyor"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Görevler"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Öğeler güncelleniyor"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Randevu yok."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s içinde aç..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Takvim yapılandırma denetimi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Takvim/Görev düzenleyici"
-
-#: 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Takvim"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Görevler"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -6826,10 +7259,6 @@ msgstr "Seçili ay (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Seçili yıl (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Görev"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6860,7 +7289,7 @@ msgid "Contacts: "
 msgstr "Bağlantılar: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Yazdırma Önizleme"
 
@@ -6889,7 +7318,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Görev yok"
 msgstr[1] "Görev yok"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6910,35 +7339,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Görev Listesi Grubu"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Yeni bir görev oluştur"
@@ -8617,69 +9040,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Dizinler eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "%s filtresini ayrıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "%s filtresini çalıştırırken hata oldu: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Spool dizini açılamadı"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Spool dizini işlenemedi"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) iletisi alınıyor"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "İleti açılamadı"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "%d iletisinde hata"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Dizin eşzamanlı hale getiriliyor"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d ileti alınıyor"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "%d/%d iletisinde hata"
@@ -8701,43 +9124,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "İletiler taşınıyor"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "İletiler kopyalanıyor"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d ileti alınıyor"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8783,7 +9169,44 @@ 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-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "İletiler taşınıyor"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "İletiler kopyalanıyor"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d ileti alınıyor"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8794,43 +9217,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8841,62 +9264,82 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s verisi üzerinde GPG işlemi uygulanamadı: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg çalıştırılamadı: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "gpg çalıştırılamadı."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/camel-lock-client.c:113
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: 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 ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "%s kilitlenemedi"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8919,26 +9362,6 @@ msgstr "fcntl(2) kullanılırken kilitleme hatası: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullanılırken kilitleme hatası: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Boru yaratılamadı: %s"
-
-#: camel/camel-lock-client.c:113
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Boru yaratılamadı: %s"
-
-#: 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 ""
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "%s kilitlenemedi"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9180,7 +9603,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -9264,55 +9687,55 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Düzgün deyim derleme işlemi başarısız: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URL'inde kullanıcı bilgisi bulunmuyor"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URL'inde makine adı bilgisi bulunmuyor"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URL'inde dizin bilgisi bulunmuyor"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Çözümleniyor: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "İsim çözümlemesinde hata: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Makine adı çözümlemesinde hata: Bilinmeyen hata"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Makine adı çözümlemesinde hata: %s: Makine bulunamadı"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: %s: bilinmeyen hata"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Adres çözümleniyor"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Makine adı çözümlemesinde hata: Makine bulunamadı"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Makine adı çözümlemesinde hata: Bilinmeyen hata"
 
@@ -9388,7 +9811,7 @@ msgstr "_Sertifika No:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
@@ -9484,7 +9907,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Geçerli imza"
 
 #: camel/camel-smime-context.c:651
@@ -9499,48 +9922,47 @@ msgstr "IMAP komutu başarısız oldu: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "\"%s\" için sertifika bulunamadı."
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "_Bu İletiden Bir Kural Yarat"
+msgid "Cannot create CMS Message"
+msgstr "İleti açılamadı"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "İleti açılamadı"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "%s dosyası eklenemedi: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "%s dosyası eklenemedi: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "İleti açılamadı"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "S/MIME kodlama içeriği oluşturulamıyor."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9587,7 +10009,8 @@ msgstr "%s dizini alınamadı: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
@@ -9596,8 +10019,8 @@ msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 msgid "Trash"
 msgstr "Çöp"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Haziran"
@@ -9718,7 +10141,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "Uygulama doğrulamada hata"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9731,11 +10154,11 @@ msgstr ""
 "Fingerprint:      %s\n"
 "İmza:             %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "UYGUN"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "HATALI"
 
@@ -9759,7 +10182,7 @@ msgstr ""
 "Yine de kabul etmek istiyor musunuz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9774,7 +10197,7 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9783,7 +10206,7 @@ msgstr ""
 "Sertifika hatalı:%s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9792,7 +10215,7 @@ msgstr ""
 "Hatalı sertifika alanı: %s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9801,14 +10224,14 @@ msgstr ""
 "Sertifikanın süresi dolmuş:%s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
@@ -9832,7 +10255,7 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
@@ -9853,8 +10276,8 @@ msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Yeni iletileri tüm dizinlerde denetle"
 
@@ -9887,8 +10310,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9909,330 +10332,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kalın sisli"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "%s dizini silinemedi. Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "İleti mh dizinine eklenemedi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "İleti mh dizinine eklenemedi: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dizinler"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Sadece üye olunan dizinleri göster"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "İsim alanı"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
-"sağlar."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP sunucu %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 adresine bağlantı kurulamadı (%d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS mevcut değil"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Bağlantı iptal edildi"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Parola iletiminde hata: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Parola iletiminde hata: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"%s POP sunucusuyla bağlantı kurulamadı: Belirtilen kimlik sınama protokolü "
-"desteklenmiyor."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Dizin içinde yeni satır karakteri bulunamaz."
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "%s dizini silinemedi: Böyle bir dizin yok"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "%s dizini silinemedi. Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "%s dizini silinemedi. Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr ""
-"\n"
-"Açıklama: "
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "%s dizini silinemedi. Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "%s dizini alınamadı: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Görev yok"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10301,7 +10422,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10378,6 +10499,27 @@ msgstr ""
 "\n"
 "Açıklama: "
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Dizinler"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Sadece üye olunan dizinleri göster"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "İsim alanı"
+
 #: 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"
@@ -10400,45 +10542,97 @@ msgstr "IMAP"
 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-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP sunucu %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 adresine bağlantı kurulamadı (%d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS mevcut değil"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Bağlantı iptal edildi"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "İşlem desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Kimlik denetimi başarısız."
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s sunucusuna bağlantı kurulamadı"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sınama yöntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLütfen %s@%s için IMAP parolasını giriniz."
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10449,30 +10643,286 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Dizin içinde yeni satır karakteri bulunamaz."
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "İleti mh dizinine eklenemedi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "İleti mh dizinine eklenemedi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
+"sağlar."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"%s POP sunucusuyla bağlantı kurulamadı: Belirtilen kimlik sınama protokolü "
+"desteklenmiyor."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Açıklama: "
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Görev yok"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10639,19 +11089,27 @@ msgstr "Özet kaydedilemedi: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "İleti özete eklenemedi: bilinmeyen neden"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Gelen"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 #, fuzzy
 msgid "Maildir append message cancelled"
 msgstr "İleti aktarımı iptal edildi"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "%s dizinine ileti eklenemedi: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10667,48 +11125,48 @@ msgstr ""
 "%s iletisi %s dizininden alınamadı\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Geçersiz ileti içeriği"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "%s dizini bulunamadı."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' bir maildir dizini."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "`%s' dizini silinemedi: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11302,20 +11760,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "%s POP sunucusuna bağlantı kurulamadı (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, fuzzy, c-format
 msgid "Could not connect to POP server %s"
 msgstr "%s üzerindeki POP sunucusuna bağlantı kurulamadı."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11324,28 +11787,28 @@ msgstr ""
 "%s POP sunucusuyla bağlantı kurulamadı: Belirtilen kimlik sınama protokolü "
 "desteklenmiyor."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sLütfen %s@%s için POP parolasını giriniz."
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11354,7 +11817,16 @@ msgstr ""
 "%s POP sunucusuyla bağlantı kurulamadı.\n"
 "Parola iletiminde hata: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"%s POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
@@ -11567,98 +12039,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP sunucu %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "%s üzerinden STMP ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "İleti gönderilemiyor: gönderen adresi geçersiz"
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Gönderilen iletiler"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 #, fuzzy
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "MAIL FROM cevap hatası: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Karşılaması"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Kimlik Denetimi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "SASL kimlik denetim nesnesi yaratılamadı."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Sunucudan hatalı kimlik sınama yanıtı.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM zaman aşımı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO zaman aşımı: %s: ileti gönderilmedi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> başarısız oldu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
@@ -11666,28 +12138,28 @@ msgstr "DATA isteği zaman aşımına uğradı: %s: ileti gönderilmedi"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP komutu başarısız oldu: %s"
@@ -11752,99 +12224,6 @@ msgstr "MIME türü:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "İleti açılamadı"
-
-#: composer/e-msg-composer.c:1291
-#, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Başlıksız İleti)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Dosyayı aç"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Otomatik"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "İmza:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Bir ileti yaz"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Düzenleyici penceresi oluşturulamadı:\n"
-"HTML düzenleyici programı çalıştırılamadı.\n"
-"Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
-"kurulu olduğunu denetleyin.\n"
-
-#: composer/e-msg-composer.c:3279
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
-"e-posta bilgilerinizi girmediniz."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -11930,17 +12309,91 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Attach file(s)"
 msgstr "Bir dosya ekle"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "İleti açılamadı"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Başlıksız İleti)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Dosyayı aç"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Otomatik"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "İmza:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Bir ileti yaz"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Yönlendirilmiş ileti - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "İletiyi bir dosya ekle"
+msgstr[1] "İletiyi bir dosya ekle"
+
+#: composer/e-msg-composer.c:4332
+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>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "İletiyi bir dosya ekle"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11958,54 +12411,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Boru yaratılamadı: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Sonraki O_kunmamış İleti"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Silme"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Sil"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "İ_mza dosyası kaydedilemedi: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Kısayolları kaydederken hata oldu."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Uyarı: İleti Değiştirildi"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12013,60 +12480,74 @@ msgid ""
 msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Değişiklikleri Sil"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "İletiyi Farklı Kaydet..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Boru yaratılamadı: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "İ_mza dosyası kaydedilemedi: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Boru yaratılamadı: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
+msgstr ""
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Düzenleyici penceresi oluşturulamadı:\n"
+"HTML düzenleyici programı çalıştırılamadı.\n"
+"Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
+"kurulu olduğunu denetleyin.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12361,11 +12842,6 @@ msgstr "%d %b %Y"
 msgid "Select a time to compare against"
 msgstr "Bir Zaman Dilimi Seçin"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Filtre Kuralları"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12394,19 +12870,8 @@ msgstr "Bir dosya dı vermelisiniz"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "%s dizini siliniyor"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Bu dizin adı belirtmelisiniz."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12414,153 +12879,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Görevlendirme"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Bu filtrenin adını değiştirmelisiniz."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Bu vfolder adını değiştirmelisiniz."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Hiç sunucu seçilmedi"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Bir dosya seç"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Son tarih:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Dizini Seçin"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Filtre Kuralları"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "vFolder Kaynakları"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Karşılaştır"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Gelen"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "şimdiki zamana göreceli bir zaman"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "önce"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "ay"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "saniye"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "sadece belirtilen dizinler"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "şimdiki zaman"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr ""
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "tüm etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "tüm yerel dizinlerle birlikte"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "yılda bir güncelle"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Önemli"
 
@@ -12629,6 +12978,65 @@ msgstr "gelen"
 msgid "outgoing"
 msgstr "giden"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Filtre Kuralları"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Karşılaştır"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Gelen"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "şimdiki zamana göreceli bir zaman"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "önce"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "ay"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "saniye"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "şimdiki zaman"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr ""
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "yılda bir güncelle"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Görev Ekle"
@@ -12642,61 +13050,75 @@ msgstr "Görev Düzenle"
 msgid "Rule name"
 msgstr "Kural adı:"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Puan Kuralları"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puan"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Düzenleyici Tercihleri"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Gövde içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Gövde içermez"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Gövde ya da konu içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Posta hesaplarını buradan yapılandırın"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "İleti içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Alıcılar içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Gönderen içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution e-posta programı."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Konu içerir"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution e-posta programı."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Konu içermez"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Sanal Dizinler"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-posta özet bileşeni."
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Ekle"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "İleti"
 
-#: filter/vfolder-rule.c:573
-#, fuzzy
-msgid "VFolder source"
-msgstr "vFolder Kaynakları"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "E-posta Tercihleri"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "İ_leti"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12729,51 +13151,325 @@ msgstr "İmza Ekle"
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Yönlendirilmiş İleti"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Filtre Kuralları"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Dizini Seçin"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+#, fuzzy
+msgid "Adjust Score"
+msgstr "Puan Belirt"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Renk Belirle"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Puan Belirt"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Ekler"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Biple"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "içerir"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Dizine Kopyala"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Alınma tarihi"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Gönderilme tarihi"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Silinen"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "içermez"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "sonlanmaz"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "bulunmaz"
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "bulunmaz"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "benzemez"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "başlamaz"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Bulunmaz"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Taslak"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "biter"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "bulunur"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "bulunur"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Deyim"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "İ_zle..."
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "eşittir"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "sonra"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "önce"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "İşaretli"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "büyük"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "küçük"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "değil"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "İşaretli"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Haziran"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiket"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "E-posta listesi"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "İleti Gövdesi"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "İleti Başlığı"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "İleti gönderildi"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "%s numaralı ileti bulunamadı."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Dizine Taşı"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Programdan çık"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Ses çal:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Oku"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Alıcılar"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Düzgün Deyim Eşleşimi"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Cevaplanan"
+
+#: mail/em-filter-i18n.h:50
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: mail/em-filter-i18n.h:51
+#, fuzzy
+msgid "returns greater than"
+msgstr "büyük"
+
+#: mail/em-filter-i18n.h:52
+#, fuzzy
+msgid "returns less than"
+msgstr "küçük"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Program çalıştır:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puan"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Gönderen"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Durum belirt"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Boyut (Kb)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "benzer"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Kaynak Hesap"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Özel başlık"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "başlayan"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "İşlemeyi Durdur"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Konu"
+
+#: mail/em-filter-i18n.h:65
 #, 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:"
+msgid "Unset Status"
+msgstr "Durum belirt"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Son tarih:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Arama sonucundan  _Sanal Dizin Yarat..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Yazıtipi Özellikleri"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Özellikler"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Folder Name"
-msgstr "_Dizin Adı:"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Yardım mesajı"
+msgstr[1] "Yardım mesajı"
 
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Total messages"
-msgstr "Yardım mesajı"
-
-#: mail/em-folder-properties.c:158
-#, fuzzy
-msgid "Unread messages"
-msgstr "Sonraki O_kunmamış İleti"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Sonraki O_kunmamış İleti"
+msgstr[1] "Sonraki O_kunmamış İleti"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12783,413 +13479,431 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Create New Folder"
 msgstr "Yeni Bir Dizin Yarat"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yaratılacağını belirtin:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "Dizin _adı:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VDizin"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Yükleniyor..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Dizine _Taşı"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Taşı"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Görevi İptal Et"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopyala"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Dizini yeniden adlandır"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Göster"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pencerede Aç"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Kopyala..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Taşı..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "_Yeni Dizin..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Yeniden adlandır"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Ö_zellikler..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VDizin"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Gelen"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Y_eniden İsimlendir..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Yükleniyor..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "İleti"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Temizle"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Okunmuş Olarak İşaretle"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiket"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Filtreleri Uygula"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtre Kuralları"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listesine Göre Filtrele"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Görev eklemek için tıklayın"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Gönderen"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Eşleşenler:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Yanıtla"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Görevlendirildi"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Alıcı"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Bilgi"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Geçerli imza"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Gizli"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Konu"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Geçersiz imza"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarih"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s ek"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
-#, 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:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Şifrelenmemiş"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Şifrelenmiş"
+
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "_Sertifikayı Görüntüle"
+
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Desteklenmeyen şema"
+msgid "This certificate is not viewable"
+msgstr "Sertifika geçersiz"
 
-#: mail/em-format.c:1306
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Sertifika imzası açılamadı"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: mail/em-format.c:1306
+#: mail/em-format-html-display.c:1012
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Sertifika imzası açılamadı"
+msgid "Overdue:"
+msgstr "_Zamanı geçen görevler:"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s numaralı ileti alınıyor"
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:1085
 #, fuzzy
-msgid "Unsigned"
-msgstr "Görevlendirildi"
+msgid "_View Inline"
+msgstr "İzle"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Geçerli imza"
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "_Gizle"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Geçersiz imza"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Sayfa: %d / %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "%s numaralı ileti alınıyor"
 
 #: mail/em-format-html.c:562
 msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Şifrelenmemiş"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Şifrelenmiş"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr ""
-
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Bozuk harici gövde"
@@ -13224,9 +13938,35 @@ msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
 msgid "Formatting message"
 msgstr "İletiler taşınıyor"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Gönderen"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Yanıtla"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Alıcı"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Bilgi"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Gizli"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "E-postalayıcı"
 
@@ -13240,107 +13980,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Eşleşenler:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Tarih"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s ek"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, 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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "_Sertifikayı Görüntüle"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Sertifika geçersiz"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
 
-#: mail/em-format-html-display.c:1015
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Overdue:"
-msgstr "_Zamanı geçen görevler:"
+msgid "Unsupported signature format"
+msgstr "Desteklenmeyen şema"
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
+msgid "Error verifying signature"
+msgstr "Sertifika imzası açılamadı"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "İzle"
-
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "_Gizle"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Sayfa: %d / %d"
+msgid "Unknown error verifying signature"
+msgstr "Sertifika imzası açılamadı"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13456,7 +14136,7 @@ msgstr "İletiyi _listeye gönder..."
 msgid "_Add to Addressbook"
 msgstr "Adres Defterine Ek_le"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
@@ -13471,7 +14151,7 @@ msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 msgid "Subscribed"
 msgstr "Üye ol"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Dizin"
 
@@ -13507,11 +14187,25 @@ msgid "Add address"
 msgstr "Adres ekle"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "%s'ten E-posta"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Sanal Dizinler"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Ekle"
+
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "vFolder Kaynakları"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14007,68 +14701,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Aktar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Düzenleyici Tercihleri"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Posta hesaplarını buradan yapılandırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "E-posta özet bileşen mimarisi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "E-posta özet bileşen mimarisi"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-posta özet bileşeni."
+msgid "Evolution Pine importer"
+msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-posta Hesapları"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution e-posta programı."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "E-posta Tercihleri"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "İ_leti"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14130,38 +14793,6 @@ msgstr "Alınıyor"
 msgid "Importing mailbox"
 msgstr "Dosyalar Alınıyor"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution e-posta programı."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution e-posta programı."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution e-posta programı."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Evolution e-posta programı."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14309,80 +14940,86 @@ msgstr "%s posta listesi"
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d seçili"
+msgid_plural "%d deleted"
+msgstr[0] "%d seçili"
+msgstr[1] "%d seçili"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d gönderilmemiş"
+msgid_plural "%d junk"
+msgstr[0] "%d gönderilmemiş"
+msgstr[1] "%d gönderilmemiş"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Taslaklar"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Taslaklar"
+msgstr[1] "Taslaklar"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d gönderilmiş"
+msgid_plural "%d sent"
+msgstr[0] "%d gönderilmiş"
+msgstr[1] "%d gönderilmiş"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d gönderilmemiş"
+msgid_plural "%d unsent"
+msgstr[0] "%d gönderilmemiş"
+msgstr[1] "%d gönderilmemiş"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "toplam %d"
+msgid_plural "%d total"
+msgstr[0] "toplam %d"
+msgstr[1] "toplam %d"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d gönderilmemiş"
+msgid_plural ", %d unread"
+msgstr[0] "%d gönderilmemiş"
+msgstr[1] "%d gönderilmemiş"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Yeni bir e-posta hazırla"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VDizin"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-posta Filtreleri"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Servis Denetleniyor"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Sunucuya bağlantı kuruluyor..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Kimlik"
@@ -14445,16 +15082,24 @@ 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:895
+msgid "Checking Service"
+msgstr "Servis Denetleniyor"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Desteklenen türleri denetle "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Önizleme"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14732,7 +15377,7 @@ msgstr "İleti açılamadı"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Toplantı isteklerini imzalama (Outlook uyumluluğu için)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Tamamlandı"
 
@@ -15098,6 +15743,118 @@ msgstr "rengi ile tanımla"
 msgid "description"
 msgstr "açıklama"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "vFolder Kaynakları"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Onaylandı"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Tamamlandı"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Küçük/büyük Harfe Duyarlı"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "İletide Bul"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Bul:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Dizin Üyelikleri"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "S_unucu:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Güvenlik bilgisi"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"İzlemek için seçilen e-postalar aşağıda listelenmiştir. \n"
+"Lütfen \"Bayraklar\" menüsünden bir işlem seçiniz."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "E-posta Hesapları"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Tarihe göre:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bayraklar:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Üye ol"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Ü_yelikten çık"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "sadece belirtilen dizinler"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "tüm etkin uzak dizinlerle birlikte"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "tüm yerel ve etkin uzak dizinlerle birlikte"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "tüm yerel dizinlerle birlikte"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15304,14 +16061,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15416,8 +16165,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Dizin taşınamadı: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15467,8 +16217,9 @@ msgstr "'%s' adı değiştirilemedi: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "ve diğer 1 kart."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15497,8 +16248,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Silme"
+msgstr "_Silme"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15544,8 +16296,9 @@ msgstr ""
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
 #: mail/mail-errors.xml.h:184
+#, fuzzy
 msgid "_Discard changes"
-msgstr ""
+msgstr "_Değişiklikleri Sil"
 
 #. mail:vfolder-notexist primary
 #: mail/mail-errors.xml.h:186
@@ -15562,8 +16315,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Dizin silinemedi:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15595,13 +16351,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "%s dizini siliniyor"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Bu dizin adı belirtmelisiniz."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Bu vfolder adını değiştirmelisiniz."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Hiç sunucu seçilmedi"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15609,16 +16396,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Üzerine yaz"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15778,7 +16565,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15787,45 +16574,21 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Küçük/büyük Harfe Duyarlı"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "İletide Bul"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Bul:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Güvenlik bilgisi"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "İptal ediliyor..."
@@ -15861,24 +16624,24 @@ msgstr "Güncelleniyor..."
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
 
@@ -15935,15 +16698,15 @@ msgstr "\"%s\" içinde dizinler taranıyor"
 msgid "Updating vFolders for '%s'"
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
@@ -16007,7 +16770,7 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -16064,10 +16827,6 @@ msgstr "Yönlendir"
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Oku"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cevapla"
@@ -16080,50 +16839,51 @@ msgstr "Herkese cevapla"
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Gövde içerir"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Tamamlandı"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Gövde içermez"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"İzlemek için seçilen e-postalar aşağıda listelenmiştir. \n"
-"Lütfen \"Bayraklar\" menüsünden bir işlem seçiniz."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Gövde ya da konu içerir"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Tarihe göre:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "İleti içerir"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bayraklar:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Alıcılar içerir"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Dizin Üyelikleri"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Gönderen içerir"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr ""
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Konu içerir"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "S_unucu:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Konu içermez"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Üye ol"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Kabuğu"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Ü_yelikten çık"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Test Bileşeni"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
@@ -16191,31 +16951,20 @@ msgstr ""
 msgid "mail"
 msgstr "E-posta"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Bilinmeyen hata"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Geçersiz argümanlar"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "OAF'a kayıt yapılamadı"
+msgid "<b>Active Connections</b>"
+msgstr "Etkin Bağlantılar"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Yapılandırma Veritabanı bulunamadı"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Etkin Bağlantılar"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Genel hata"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
+"düğmesine tıklayın"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16398,30 +17147,6 @@ msgstr "Dizin adı içinde \"#\" karakteri bulunamaz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ve '..' dizin isimleri için ayrılmıştır."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "%s adresine postala"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
@@ -16439,115 +17164,94 @@ msgstr "Bug-buddy sistemde kurulu değil."
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Grup"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Denetim kutusu"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Yeni"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Yeni Görev"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Test"
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Yeni bir görev listesi oluştur"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Etkin Bağlantılar"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Etkin Bağlantılar"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
-"düğmesine tıklayın"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Takvim:"
+"Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
+"çalışmasını sağlayın."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Bağlantılar: "
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s adresine postala"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "İ_leti:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Görevler:"
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Bilinmeyen hata"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Dizin _türü:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Geçersiz argümanlar"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Başka Bir Kullanıcının Dizinini Aç"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Hesap:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Dizin Adı:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Genel hata"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Kullanıcı:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Yeni"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Kurulum Yardımcısı"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Dosyalar Alınıyor"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Zaman Dilimi "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Hoşgeldiniz"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/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"
@@ -16561,7 +17265,7 @@ msgstr ""
 "\n"
 "Lütfen devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16572,19 +17276,20 @@ msgstr ""
 "\n"
 "Ayarları kaydetmek için \"Uygula\" düğmesine tıklayın."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Kabuğu"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Yeni Görev"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Test"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Test Bileşeni"
+msgid "Create a new test item"
+msgstr "Yeni bir görev listesi oluştur"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16649,7 +17354,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16669,46 +17374,46 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr "Teşekkürler. Ximian Evolution Grubu\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Tekrar sorma"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Çevrimdışı çalışmaya başla"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Çevrimiçi çalışmaya başla"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Tüm Evolution bileşenlerini kapat"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16781,6 +17486,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17048,6 +17775,12 @@ msgstr "_Sertifika No:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Bu kart numarası var"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17275,12 +18008,6 @@ msgstr "Konu: %s"
 msgid "Certificate Signature Value"
 msgstr "Sertifika imza hatası"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Bu kart numarası var"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17424,8 +18151,8 @@ msgstr ""
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Eylemler"
@@ -17913,16 +18640,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:5
-msgid "Close this window"
-msgstr "Bu pencereyi kapat"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Kapat"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18345,6 +19062,16 @@ msgstr "_Araçlar"
 msgid "_Undelete"
 msgstr "_Silme"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Bu pencereyi kapat"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Kapat"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ekle"
@@ -18427,10 +19154,6 @@ msgstr "Güncel dosyayı farklı bir isimle kaydet"
 msgid "Save the message in a specified folder"
 msgstr "İletiyi belirtilen dizine kaydet"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Gönder"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19011,7 +19734,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19174,27 +19897,273 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Sunucudan hatalı kimlik sınama yanıtı."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Liste adı:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "bağlantı-listesi-düzenleyici"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Listeyi VCard Olarak Kaydet"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Grup"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Wombat başlatılamadı"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "_Takvim:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Ses Alarm Seçenekleri"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "İleti Alarm Seçenekleri"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "E-posta Alarm Seçenekleri"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Program Alarm Seçenekleri"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Bilinmeyen Alarm Seçenekleri"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarm Tekrarı"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "İleti Görünümü"
+
+#~ msgid "Message to Send"
+#~ msgstr "Gönderilecek Mesaj"
+
+#~ msgid "Play sound:"
+#~ msgstr "Ses çal:"
+
+#~ msgid "Run program:"
+#~ msgstr "Program çalıştır:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Bu argümanlarla:"
+
+#~ msgid "Basics"
+#~ msgstr "Temel"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Tarih/Zaman:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Hatırlatıcı"
+
+#~ msgid "_Options..."
+#~ msgstr "_Seçenekler..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Adres Defteri..."
+
+#~ msgid "Reminder"
+#~ msgstr "Hatırlatıcı"
+
+#~ msgid "B_usy"
+#~ msgstr "Meşgu_l"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Gizli"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Tarih/Zaman"
+
+#~ msgid "F_ree"
+#~ msgstr "_Boş"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Ö_zel"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Genel"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Katılımcı"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "_Göndereni Adres Defterine Ekle"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "İstisnalar"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Önizleme:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Tekrarlama Kuralı"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Özel tekrar"
+
+#~ msgid "_Modify"
+#~ msgstr "_Düzenle"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Tekrarlama yok"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Basit tekrar"
+
+#~ msgid "% _Complete"
+#~ msgstr "_Biten %"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "İşlemde"
+
+#~ msgid "Con_fidential"
+#~ msgstr "_Gizli"
+
+#~ msgid "Folder:"
+#~ msgstr "Dizin:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Başlangıç:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Bitiş: </b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Tamamlanan:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Son tarih:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Hiçbiri</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA sisteminde bir hata oluştu\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Öğe bulunamadı\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Katılımcı bilgileri güncellenemedi!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "_Göndereni Adres Defterine Ekle"
+
+#~ msgid "_Options"
+#~ msgstr "_Seçenekler"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Toplantı b_aşlama saati :"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Toplantı _bitiş saati:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "'%s' hatası:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "\"%s\" için sertifika bulunamadı."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "_Bu İletiden Bir Kural Yarat"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "S/MIME kodlama içeriği oluşturulamıyor."
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
+#~ "e-posta bilgilerinizi girmediniz."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Puan Kuralları"
+
+#, 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:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "_Dizin Adı:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Yeniden adlandır"
+
+#~ msgid "_Properties..."
+#~ msgstr "Ö_zellikler..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Denetim kutusu"
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Takvim:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Bağlantılar: "
+
+#~ msgid "_Mail:"
+#~ msgstr "İ_leti:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Görevler:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Dizin _türü:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Başka Bir Kullanıcının Dizinini Aç"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "_Dizin Adı:"
+
+#~ msgid "_User:"
+#~ msgstr "_Kullanıcı:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Root DSE üzerinde tarama yapılamadı"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Şema bilgisini yüklerken hata oluştu"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "_Desteklenen Türleri Denetle "
 
@@ -19254,9 +20223,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Webcam:"
 #~ msgstr "Web Sayfası:"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategori düzenleyici bulunamadı."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19296,48 +20262,18 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "_Source URL:"
 #~ msgstr "POP Kaynak URI adresi"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
-
 #~ msgid "Are you sure you want to cancel and delete this task?"
 #~ msgstr "Gerçekten bu görevi iptal edip silmek istiyor musunuz?"
 
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Gerçekten %d randevuyu silmek istiyor musunuz?"
-#~ msgstr[1] "Gerçekten %d randevuyu silmek istiyor musunuz?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Gerçekten %d görevi silmek istiyor musunuz?"
-#~ msgstr[1] "Gerçekten %d görevi silmek istiyor musunuz?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
-#~ msgstr[1] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Başkalarını Davet Et..."
 
@@ -19350,9 +20286,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ "\n"
 #~ "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#~ msgid "_Discard Changes"
-#~ msgstr "_Değişiklikleri Sil"
-
 #~ msgid "Save Event"
 #~ msgstr "Olayı Kaydet"
 
@@ -19369,10 +20302,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Sunucudan grup listesi alınamadı."
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "İletilerin otomatik kaydında hata: %s\n"
@@ -19396,187 +20325,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Bilinmeyen sunucu cevabı: %s"
 
-#, fuzzy
-#~ msgid "Adjust Score"
-#~ msgstr "Puan Belirt"
-
-#~ msgid "Assign Color"
-#~ msgstr "Renk Belirle"
-
-#~ msgid "Assign Score"
-#~ msgstr "Puan Belirt"
-
-#~ msgid "Attachments"
-#~ msgstr "Ekler"
-
-#~ msgid "Beep"
-#~ msgstr "Biple"
-
-#~ msgid "contains"
-#~ msgstr "içerir"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Dizine Kopyala"
-
-#~ msgid "Date received"
-#~ msgstr "Alınma tarihi"
-
-#~ msgid "Date sent"
-#~ msgstr "Gönderilme tarihi"
-
-#~ msgid "Deleted"
-#~ msgstr "Silinen"
-
-#~ msgid "does not contain"
-#~ msgstr "içermez"
-
-#~ msgid "does not end with"
-#~ msgstr "sonlanmaz"
-
-#~ msgid "does not exist"
-#~ msgstr "bulunmaz"
-
-#, fuzzy
-#~ msgid "does not return"
-#~ msgstr "bulunmaz"
-
-#~ msgid "does not sound like"
-#~ msgstr "benzemez"
-
-#~ msgid "does not start with"
-#~ msgstr "başlamaz"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Bulunmaz"
-
-#~ msgid "Draft"
-#~ msgstr "Taslak"
-
-#~ msgid "ends with"
-#~ msgstr "biter"
-
-#~ msgid "Exist"
-#~ msgstr "bulunur"
-
-#~ msgid "exists"
-#~ msgstr "bulunur"
-
-#~ msgid "Expression"
-#~ msgstr "Deyim"
-
-#~ msgid "is"
-#~ msgstr "eşittir"
-
-#, fuzzy
-#~ msgid "is after"
-#~ msgstr "sonra"
-
-#, fuzzy
-#~ msgid "is before"
-#~ msgstr "önce"
-
-#, fuzzy
-#~ msgid "is Flagged"
-#~ msgstr "İşaretli"
-
-#~ msgid "is greater than"
-#~ msgstr "büyük"
-
-#~ msgid "is less than"
-#~ msgstr "küçük"
-
-#~ msgid "is not"
-#~ msgstr "değil"
-
-#, fuzzy
-#~ msgid "is not Flagged"
-#~ msgstr "İşaretli"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Haziran"
-
-#~ msgid "Mailing list"
-#~ msgstr "E-posta listesi"
-
-#~ msgid "Message Body"
-#~ msgstr "İleti Gövdesi"
-
-#~ msgid "Message Header"
-#~ msgstr "İleti Başlığı"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "İleti gönderildi"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "%s numaralı ileti bulunamadı."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Dizine Taşı"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Programdan çık"
-
-#, fuzzy
-#~ msgid "Play Sound"
-#~ msgstr "Ses çal:"
-
-#~ msgid "Recipients"
-#~ msgstr "Alıcılar"
-
-#~ msgid "Regex Match"
-#~ msgstr "Düzgün Deyim Eşleşimi"
-
-#~ msgid "Replied to"
-#~ msgstr "Cevaplanan"
-
-#, fuzzy
-#~ msgid "returns"
-#~ msgstr "Burns"
-
-#, fuzzy
-#~ msgid "returns greater than"
-#~ msgstr "büyük"
-
-#, fuzzy
-#~ msgid "returns less than"
-#~ msgstr "küçük"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Program çalıştır:"
-
-#~ msgid "Sender"
-#~ msgstr "Gönderen"
-
-#~ msgid "Set Status"
-#~ msgstr "Durum belirt"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Boyut (Kb)"
-
-#~ msgid "sounds like"
-#~ msgstr "benzer"
-
-#~ msgid "Source Account"
-#~ msgstr "Kaynak Hesap"
-
-#~ msgid "Specific header"
-#~ msgstr "Özel başlık"
-
-#~ msgid "starts with"
-#~ msgstr "başlayan"
-
-#~ msgid "Stop Processing"
-#~ msgstr "İşlemeyi Durdur"
-
-#, fuzzy
-#~ msgid "Unset Status"
-#~ msgstr "Durum belirt"
-
 #~ msgid "Working"
 #~ msgstr "Çalışıyor"
 
@@ -19780,9 +20528,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Finished"
 #~ msgstr "Tamamlandı"
 
-#~ msgid "Group:"
-#~ msgstr "Grup:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20292,9 +21037,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "component"
 #~ msgstr "bileşen"
 
-#~ msgid "Alarms"
-#~ msgstr "Uyarılar"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Coğrafi Konum"
 
@@ -20839,10 +21581,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgstr "Haber grubu sunucusu için dizin açılamadı: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Adres Defterinden Bağlantıları Seç"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "_Doğum günü:"
 
@@ -20891,14 +21629,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgstr "Sınıflandırma"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Tarih & Zaman"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Açıklama:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Başlangıç:</b> "
 
@@ -21129,12 +21859,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "LDAP arama sonuçları alınıyor..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Arama yaparken bir hata oluştu"
-
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "İmleç yüklenemedi\n"
-
 #~ msgid "EBook not loaded\n"
 #~ msgstr "EBook yüklenmedi\n"
 
@@ -23564,9 +24288,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -24950,9 +25671,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25343,9 +26061,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27725,9 +28440,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "South Dakota"
 #~ msgstr "South Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30005,9 +30717,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "View the selected folder"
 #~ msgstr "Seçili dizini göster"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Kopyala..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Dizin Çubuğu"
 
@@ -30017,27 +30726,18 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Dizine _Git..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Taşı..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Yeni Dizin"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Diğer Kullanıcının Dizinini Sil"
 
-#~ msgid "_Rename..."
-#~ msgstr "Y_eniden İsimlendir..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "_Kısayol Çubuğu"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Kısayol..."
 
-#~ msgid "Information"
-#~ msgstr "Bilgi"
-
 #~ msgid "Error"
 #~ msgstr "Hata"
 
@@ -30047,9 +30747,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution Adres Defteri yerel/LDAP arayüzü"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution Takvim yerel dosya arkayüzü"
-
 #~ msgid "Evolution Addressbook local file backend"
 #~ msgstr "Evolution Adres Defteri yerel dosya arkayüzü"
 
@@ -30134,9 +30831,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Yeni Bir _Dizin Yarat..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Bağlantılar..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "LDIF dosyalarını Evolution'a aktarım mimarisi."
 
@@ -30260,9 +30954,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "(%d not shown)"
 #~ msgstr "(%d adet gösterilmiyor)"
 
-#~ msgid "C_ontacts..."
-#~ msgstr "_Bağlantılar..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Telefon Türleri"
 
@@ -30631,9 +31322,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "_Insert text file... (FIXME)"
 #~ msgstr "Metin dosyası yerleştir..."
 
-#~ msgid "Send _Later"
-#~ msgstr "_Sonra Gönder"
-
 #, fuzzy
 #~ msgid "F_ormat"
 #~ msgstr "Biçim"
@@ -30874,9 +31562,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Configure the calendar's settings"
 #~ msgstr "Takvim ayarlarını değiştir"
 
-#~ msgid "Copying"
-#~ msgstr "Kopyalanıyor"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Yeni iletileri almak için POP sunucusuna bağlantı kurulamadı: %s"
 
@@ -30931,9 +31616,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Free/Busy info begins: <b>"
 #~ msgstr "Boş/Meşgul bilgi başlangıcı: <b>"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Boş/Meşgul bilgi bitişi: <b>"
-
 #~ msgid "HTML signature file:"
 #~ msgstr "HTML imza dosyası:"
 
@@ -30970,9 +31652,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Message was received"
 #~ msgstr "İleti alındı"
 
-#~ msgid "Moving"
-#~ msgstr "Taşınıyor"
-
 #~ msgid "NNTP Server:"
 #~ msgstr "NNTP _Sunucusu:"
 
diff --git a/po/uk.po b/po/uk.po
index fe9fb88f04..0522049228 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2003-04-02 10:54--500\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -22,16 +22,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Переглядач мінікартки адресної книги Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Контакти:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Вікно Evolution"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -57,35 +47,261 @@ msgstr "картки"
 msgid " card"
 msgstr "1 картка"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Вікно Evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Неможливо завантажити курсор\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "На вдалося пройти автентифікацію на сервері LDAP"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Цей сервер не підтримує схему інформації LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Не вдалося отримати групу: %s"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Не вдалося завантажити %s: %s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Відсутній редактор категорій."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Зберегти у адресній книзі"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Помилка при завантаженні типової книги адрес."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Помилка виконання пошуку"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Ви хочете змінити зміни?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Скасувати"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "та одна інша картка."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Неможливо отримати повідомлення від редактора"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Помилка додавання картки"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Типова адреса синхронізації:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Не вдалося завантажити %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Не вдалося зчитати блок адреса програми \"Пілот\""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонімний доступ до сервера LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Неможливо автентифікуватися.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Теки автозавершення"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВведіть пароль для %s (користувач %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "Ідентифікатор сертифіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Налаштовування поштових рахунків"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Перевірочний компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -120,7 +336,7 @@ msgstr "Новий контакт:"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Контакти:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -145,15 +361,15 @@ msgid "Migrating `%s':"
 msgstr "Зондування %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -162,22 +378,22 @@ msgid "Personal"
 msgstr "Особисте"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Теки автозавершення"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -185,58 +401,67 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Властивості..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонімний доступ до сервера LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Неможливо автентифікуватися.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВведіть пароль для %s (користувач %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -256,68 +481,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Теки автозавершення"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "Ідентифікатор сертифіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Налаштовування поштових рахунків"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Перевірочний компонент Evolutuion."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -325,7 +488,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -334,8 +497,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -361,6 +523,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Автентифікація"
@@ -410,13 +573,11 @@ msgid "Anonymously"
 msgstr "Анонімно"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основні"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Подробиці"
 
@@ -682,34 +843,27 @@ msgid "cards"
 msgstr "картки"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "хвилини"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Вибрати контакти з книги адрес"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Видалити все"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Видалити все"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Показати список контактів"
@@ -724,7 +878,7 @@ msgid "Send HTML Mail?"
 msgstr "Надіслати ел.пошту у HTML?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Додати до контактів"
 
@@ -732,16 +886,23 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Джерело"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
+msgid "Select Contacts from Address Book"
+msgstr "Вибрати контакти з книги адрес"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -768,6 +929,11 @@ msgstr "Категорія:"
 msgid "_Find"
 msgstr "Знайти"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "Пошук"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -814,9 +980,8 @@ msgid "<b>Work</b>"
 msgstr "Робочий тиждень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -841,7 +1006,6 @@ msgid "Birthday:"
 msgstr "Дата народження:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Календар"
@@ -857,15 +1021,15 @@ msgid "Company:"
 msgstr "Компанія"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
@@ -975,8 +1139,8 @@ msgstr "Адреса сторінки WWW:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -998,44 +1162,28 @@ msgid "_File under:"
 msgstr "Назва файлу:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "кожні"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ви впевнені, що хочете\n"
-"стерти ці контакти?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ви впевнені, що хочете\n"
-" стерти ці контакти?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Адреса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Редаговане"
 
@@ -2016,141 +2164,133 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Надіслати повідомлення"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "Неназваний список"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Порто"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Групове"
+msgid "Service"
+msgstr "Послуга готова"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Розташування:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Ім'я користувача:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Інша"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Порто"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Групове"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Джерело"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Поля для запису"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Змінено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Цей контакт належить до таких категорій:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Оберіть серед наступних параметрів"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Нігер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Неправильна дата повторення"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Неправильне призначення"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Скасувати"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Надіслати повідомлення"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Послуга готова"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Розташування:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Ім'я користувача:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
@@ -2171,6 +2311,22 @@ msgstr "Повне ім'я:"
 msgid "E-_mail:"
 msgstr "Ел.пошта"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ви впевнені, що хочете\n"
+"стерти ці контакти?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ви впевнені, що хочете\n"
+" стерти ці контакти?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адреса _2:"
@@ -2299,51 +2455,72 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Вибрати контакти з книги адрес"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Члени"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Видалити вибрані елементи з списку долучень"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Вибраний"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Приховати адресу при надсиланні пошти до цього списку"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "Назва списку:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Наберіть ел.адресу або перетягніть контактну інформацію у нижчий список:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Редактор контактів"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Книга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Новий список"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Потрібні учасники"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Редактор списків контактів"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Зберегти список як VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Змінений контакт:"
@@ -2382,11 +2559,414 @@ msgstr ""
 "у цій теці.  Чи хочете ви додати його все одно?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Складний пошук"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Показати контакти"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Контакти"
+msgstr[1] "Контакти"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Запит"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Помилка отримання вигляду книги"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Модель"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Помилка модифікації картки"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Ім'я починається з"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "Поштова адреса починається з"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Категорія - "
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Будь-яке поле містить"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Додатково..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Тип"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Адресна книга"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Зберегти як VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Новий контакт..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Новий контактний список..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Перейти на теку..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Імпорт..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Пошук контактів..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Джерела адресних книг..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Установки \"Пілота\"..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Переслати контакт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Відіслати повідомлення за контактом"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Друкувати"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Надрукувати конверт"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Книга адрес..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Книга адрес..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Вирізати"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Скопіювати"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Вставити"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Поточний вигляд"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Будь-яка категорія"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Помічник"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Телефон помічника"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Робочий факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Робочий телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Робочий телефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Зворотній дзвінок"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Автомобільний телефон"
+
+#: 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:3
+msgid "Categories"
+msgstr "Категорії"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Телефон компанії"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Ел.пошта"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Ел.пошта 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Ел.пошта 3"
+
+#: 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
+#, fuzzy
+msgid "Given Name"
+msgstr "Назва поля"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Домашній факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Домашній телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Домашній телефон 2"
+
+#: 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.etspec.h:22
+msgid "Manager"
+msgstr "Керівник"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мобільний телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Прізвисько"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Примітки"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Офіс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+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
+msgid "Other Phone"
+msgstr "Інший телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Пейджер"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Основний телефон"
+
+#: 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:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Телекс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Титул"
+
+#: 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 "Сайт"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Ширина"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Висота"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Має фокус"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Поле"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Назва поля"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Текстова модель"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Максимальна довжина імені поля"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ширина стовпчика"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Немає елементів для відображення у цьому вікні\n"
+"\n"
+"Двічі клацніть для створення нового контакту."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Немає елементів для відображення у цьому вікні."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Адаптер"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Вибраний"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Має курсор"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2398,117 +2978,90 @@ msgid "map"
 msgstr ""
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Члени"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Організація"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Бостон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Групове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #, fuzzy
 msgid "Phone"
 msgstr "Автомобільний телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Робота"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Болонья"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мобільний телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Особисте"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Примітки"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "Посада:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Ел.пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Домашній факс"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Успішно"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Адресна книга не існує"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Новий список контактів"
@@ -2516,74 +3069,74 @@ msgstr "Новий список контактів"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картки не знайдено"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ідентифікатор картки вже існує"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Скасовано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не вдалося відкрити загальну теку: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Збій автентифікації."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Вимагається автентифікація"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS недоступна"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Неправильне повідомлення"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Інша помилка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2592,7 +3145,7 @@ msgstr ""
 "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2601,7 +3154,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2613,7 +3166,7 @@ msgstr ""
 "встановити LDAP з указаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2622,7 +3175,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/widgets/eab-gui-util.c:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2634,7 +3187,7 @@ msgstr ""
 "відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
 "обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 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"
@@ -2645,48 +3198,48 @@ msgstr ""
 "встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
 "специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Цей запит не було завершено відповідним чином."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Помилка додавання списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Помилка додавання картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Помилка модифікування списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Помилка модифікації картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Помилка видалення списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Помилка видалення картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2695,7 +3248,7 @@ msgstr ""
 "При відкритті картки %d  буде також відкрито нове вікно %d.\n"
 "Ви справді бажаєте відкрити всі ці картки?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2704,49 +3257,49 @@ msgstr ""
 "%s вже існує\n"
 "Хочете переписати?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Переписати"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перенести картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Скопіювати картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перенести картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Копіювати картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "Декілька VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -2756,48 +3309,38 @@ msgstr "vCard для %s"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(немає)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Головна ел. пошта"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Ел.пошта 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Ел.пошта 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Вибір дії"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Створити новий контакт \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Додати адресу до існуючого контакту \"%s\""
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Запит адресної книги..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Виправлення контактної інформації"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Об'єднати ел.адреси"
 
@@ -2823,377 +3366,6 @@ msgstr "Зберегти контакти як VCard"
 msgid "Save in addressbook"
 msgstr "Зберегти у адресній книзі"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Показати контакти"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Контакти"
-msgstr[1] "Контакти"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Запит"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Помилка отримання вигляду книги"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Модель"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Помилка модифікації картки"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Ім'я починається з"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "Поштова адреса починається з"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Категорія - "
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Будь-яке поле містить"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Додатково..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Тип"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Адресна книга"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Зберегти як VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Новий контакт..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Новий контактний список..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Перейти на теку..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Імпорт..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Пошук контактів..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Джерела адресних книг..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Установки \"Пілота\"..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Переслати контакт"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Відіслати повідомлення за контактом"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Друкувати"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Надрукувати конверт"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Книга адрес..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Книга адрес..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Вирізати"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Скопіювати"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Вставити"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Поточний вигляд"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Будь-яка категорія"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Помічник"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Телефон помічника"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Робочий факс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Робочий телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Робочий телефон 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Зворотній дзвінок"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Автомобільний телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Категорії"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Телефон компанії"
-
-#: 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
-#, fuzzy
-msgid "Given Name"
-msgstr "Назва поля"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Домашній факс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Домашній телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Домашній телефон 2"
-
-#: 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.etspec.h:22
-msgid "Manager"
-msgstr "Керівник"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Прізвисько"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Офіс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Інший факс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Інший телефон"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Пейджер"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Основний телефон"
-
-#: 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:234
-#: 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:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "TTY/TDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Телекс"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Титул"
-
-#: 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 "Сайт"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Ширина"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Висота"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Має фокус"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Вибраний"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Має курсор"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Поле"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Назва поля"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Текстова модель"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Максимальна довжина імені поля"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Немає елементів для відображення у цьому вікні\n"
-"\n"
-"Двічі клацніть для створення нового контакту."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Немає елементів для відображення у цьому вікні."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Адаптер"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина стовпчика"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Перегляд карток: "
@@ -3239,6 +3411,11 @@ msgstr "Редактор пошти Evolutuion."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Надрукувати конверт"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3250,11 +3427,6 @@ msgstr "Надрукувати вибрані контакти"
 msgid "Print contact"
 msgstr "Надрукувати вибрані контакти"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Надрукувати конверт"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "Tahoma 10 пт"
@@ -3441,6 +3613,23 @@ msgstr "_Список контактів"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Неможливо відкрити повідомлення"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Не вдалося завантажити %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не вдалося відкрити адресну книгу"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3498,23 +3687,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Внутрішня помилка"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Неможливо відкрити повідомлення"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Не вдалося завантажити %s: %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Не вдалося відкрити адресну книгу"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Помилка при завантаженні типової книги адрес."
@@ -3531,40 +3703,370 @@ msgstr "Не вказано назви файлу."
 msgid "Unnamed List"
 msgstr "Неназваний список"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не стирати"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Відправити"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Ви впевнені, що хочете стерти %d завдань?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Ви впевнені, що хочете стерти %d записів в журналі?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ви впевнені, що хочете стерти %d зустрічей?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Зустріч"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Ви хочете змінити зміни?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Ви внесли зміни. Забути ці зміни та оновити вікно редагування?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "Скасувати зміни"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Зберегти повідомлення як..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Відправити"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ввід пароля"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Розділити багатоденні події:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Не вдалося запустити сервер Wombat"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Не вдалось запустити Wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не вдалося зчитати програмний блок календаря з \"Пілота\""
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Типовий пріоритет:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неможливо зчитати програмний блок завдань \"Пілота\""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календар та завдання"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Календар та завдання"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Переглядач iTip/iMip з календарю 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Завдання"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+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:213
 msgid "Starting:"
 msgstr "Початок:"
@@ -3660,11 +4162,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
@@ -3813,9 +4310,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Зведення містить"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Опис містить"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Коментар містить"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Опис містить"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Інше"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3839,8 +4357,8 @@ msgid "Purge events older than"
 msgstr "повертає менше ніж"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "діб"
 
@@ -3851,7 +4369,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3901,69 +4419,57 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Зустріч"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "Засідання"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Створити новий запит на засідання"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "_Щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
+msgid "Cale_ndar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Створити нову теку"
@@ -3994,27 +4500,6 @@ msgstr "Перегляд тижня"
 msgid "Month View"
 msgstr "Перегляд місяця"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Зведення містить"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Опис містить"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Коментар містить"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Опис містить"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Інше"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Помилка під час відкриття календаря"
@@ -4032,230 +4517,133 @@ msgstr "Відказано в доступі при відкриття кале�
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Параметри звукових сповіщень"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Параметри сигнальних повідомлень"
-
-#: calendar/gui/dialogs/alarm-options.c:485
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "Параметри поштових сповіщень"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Програмні параметри сповіщення"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Невідомі параметри сповіщення"
+msgid "<b>Alarm</b>\t"
+msgstr "Календарна інформація"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "Повторення сповіщення"
+msgid "<b>Options</b>"
+msgstr "Опис:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "Відображення повідомлень"
+msgid "<b>Repeat</b>"
+msgstr "Нагадування"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "Тіло повідомлення"
+msgid "Add Alarm"
+msgstr "Сповіщення"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Відтворити звук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Повторити сповіщення"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Запустити програму:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "Відправити"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "З цими аргументами:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "додатковий час кожні"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "години"
+msgid "Custom _message"
+msgstr "Підготувати повідомлення"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Додати"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Основи"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Дата й час:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Повідомлення"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Відтворити звук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "Нагадування"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Запустити програму"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Відправити"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Відіслати пошту"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Зведення:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "Обліковий рахунок:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Запустити програму:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Повторити сповіщення"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "Параметри..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Південь"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "після"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "перед"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "діб"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "кінець зустрічі"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "додатковий час кожні"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "годин(а)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "години"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "хвилин"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "початок зустрічі"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Необхідно вказати назву файлу."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Нова Каледонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Список завдань"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Кольори"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Вибір кольору"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Нова Каледонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "Нова група..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Оновити"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "Додати"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "тижнів"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Сповіщення"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4373,7 +4761,7 @@ msgid "Free/Busy Publishing"
 msgstr "Відповісти про зайнятість"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "П'ятниця"
@@ -4387,7 +4775,7 @@ msgid "Minutes"
 msgstr "Хвилини"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понеділок"
@@ -4397,7 +4785,7 @@ msgid "S_un"
 msgstr "_Ндл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
@@ -4411,7 +4799,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Неділя"
@@ -4425,7 +4813,7 @@ msgid "T_hu"
 msgstr "Чтв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвер"
@@ -4439,7 +4827,7 @@ msgid "Time format:"
 msgstr "Формат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вівторок"
@@ -4449,7 +4837,7 @@ msgid "W_eek starts:"
 msgstr "_Тиждень починається:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Середа"
@@ -4483,7 +4871,8 @@ msgstr "Стискати вихідні дні при перегляді міс�
 msgid "_Day begins:"
 msgstr "_День починається:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4533,6 +4922,81 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "Перед початком кожної зустрічі"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Необхідно вказати назву файлу."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Нова Каледонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Список завдань"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Кольори"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Вибір кольору"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Нова Каледонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Нова група..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Оновити"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "тижнів"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Цю подію було видалено."
@@ -4577,83 +5041,77 @@ msgstr "%s  Ви внесли зміни. Забути ці зміни та он
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ви не зробили змін, поновити вікно редагування?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Помилка під час перевірки: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " до "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Виконано "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Виконано "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Обумовлені завдання"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Обумовлені завдання "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Зустріч - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Завдання - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальний запис - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Зберегти як..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Внесені в цей елемент зміни може бути скасовано, якщо прийде оновлення по ел."
 "пошті"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Неможливо отримати поточну версію!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Помилка під час перевірки: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " до "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Виконано "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Виконано "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Обумовлені завдання"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Обумовлені завдання "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4723,8 +5181,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Книга адрес..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Контакти..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4734,164 +5193,222 @@ msgstr "Доручити:"
 msgid "Enter Delegate"
 msgstr "Ввести делегата"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Зустріч"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Нагадування"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Інформація"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Засідання"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Неправильна дата початку"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Неправильна дата закінчення"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Неправильний час початку:"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Неправильний час закінчення"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Відказано в доступі при відкриття календарю"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "Перед початком кожної зустрічі"
+msgstr[1] "Перед початком кожної зустрічі"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "кінець зустрічі"
+msgstr[1] "кінець зустрічі"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "Перед початком кожної зустрічі"
+msgstr[1] "Перед початком кожної зустрічі"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Вс_і події доби"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "Перед початком кожної зустрічі"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Зайнятий"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "Перед початком кожної зустрічі"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Категорії..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "Перед початком кожної зустрічі"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Календарна інформація"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Класифікація"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Дата й час"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Конфіденційне"
+msgid "A_ll day event"
+msgstr "Вс_і події доби"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
 #, fuzzy
-msgid "Date & Time"
-msgstr "Дата й час:"
+msgid "C_ustomize..."
+msgstr "Зберегти спеціальний вигляд"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Вільний"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Категорії..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
 #, fuzzy
-msgid "L_ocation:"
-msgstr "Розташування:"
+msgid "Cale_ndar:"
+msgstr "Календар"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Особисте"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Класифікація"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Публічне"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Конфіденційне"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
-msgid "Show Time As"
-msgstr "Показувати час як"
+msgid "L_ocation:"
+msgstr "Розташування:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Приватне"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Загальне"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Показувати час як"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "З_ведення:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Сповіщення"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Опис:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Час _завершення:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Час _початку:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Немає"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Потрібно вказати організатора."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один учасник."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "Доручити..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "Стерти"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Видалити"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4930,36 +5447,45 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Зацікавлена персона"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Відвідування"
+msgid "<b>Attendees</b>"
+msgstr "<b>Починається:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Додати відправника в адресну книгу"
+msgid "<b>Organizer</b>"
+msgstr "<b>Обумовлена дата:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Змінити організатора"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Організатор:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Контакти..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Змінити організатора"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Організатор:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -5035,153 +5561,145 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Ця зустріч містить правила повторення, які Evolution не може редагувати."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Неправильна дата повторення"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "у"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "перший"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "другий"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "третій"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "четвертий"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "останній"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Інша дата"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "у"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "випадки"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Дата й час:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "Винятки"
+msgid "<b>Exceptions</b>"
+msgstr "Опис:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "Перегляд:"
+msgid "<b>Preview</b>"
+msgstr "Перегляд"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "Правило повторення"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Інше повторення"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "З_мінити"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Без періодичності"
+msgid "<b>Recurrence</b>"
+msgstr "Повторення"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Видалити"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Кожен"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "_Проста періодичність"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Ви_правити зустріч"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "для"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "завжди"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "місяць"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "доки"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "тижнів"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "років"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Стерти цю теку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "Список завдань"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Неправильна дата виконання"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Повідомлення"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% виконання:"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Повідомлення"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Завершено"
 
@@ -5193,8 +5711,8 @@ msgstr "Високий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Виконується"
@@ -5206,23 +5724,22 @@ msgid "Low"
 msgstr "Низький"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Не розпочато"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "Виконується"
+msgid "P_ercent complete:"
+msgstr "Відсоток виконання: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5247,37 +5764,42 @@ msgstr "Стан:"
 msgid "_Web Page:"
 msgstr "Адреса сторінки WWW:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Завдання"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Неправильна дата виконання"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не вдалося відкрити адресну книгу"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Кон_фіденційне"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Повідомлення"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Повідомлення"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Опис:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Тека:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5288,60 +5810,58 @@ msgstr "Дата по_чатку:"
 msgid "_Due date:"
 msgstr "Дата ви_конання:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Неправильна автентифікація від сервера."
+msgid "_Group:"
+msgstr "Групове"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Календарна інформація"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "День"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Інформація про зайнятість"
+msgid "<b>Publishing _Location</b>"
+msgstr "Відповісти про зайнятість"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "Відповісти про зайнятість"
+msgid "Free/Busy Editor"
+msgstr "Інформація про зайнятість"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "Назва списку:"
+msgid "_Daily"
+msgstr "День"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Пароль"
+msgid "_Manual"
+msgstr "Манагуа"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Пароль"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Запам'ятати цей пароль"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "Ім'я користувача:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Тиждень"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5423,7 +5943,7 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невідомого типу перемикача"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Клацніть щоб додати завдання"
@@ -5432,6 +5952,11 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Untitled"
 msgstr "Без заголовку"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Зведення:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5445,7 +5970,7 @@ msgstr "Дата ви_конання:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Стан:"
 
@@ -5459,20 +5984,93 @@ msgstr "Пріоритет:"
 msgid "Web Page:"
 msgstr "Адреса сторінки WWW:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Загальне"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Приватне"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Дата початку"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Конфіденційне"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Зведення"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Вільний"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Зайнятий"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Пн"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Пд"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Сх"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Зх"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географічне положення потрібно вводити у такому форматі: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Так"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ні"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Невідоме"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Періодично"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Прив'язано"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5518,96 +6116,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Вільний"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Зайнятий"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Відкрити"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "Відкрити повідомлення"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вирізати"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Скопіювати"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Призначити завдання"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Позначити вибрані завдання як _виконані"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "Стерти"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Стерти вибрані завдання"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Зберегти як..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Клацніть щоб додати завдання"
 
@@ -5616,181 +6220,112 @@ msgstr "Клацніть щоб додати завдання"
 msgid "% Complete"
 msgstr "% виконання:"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Виконано"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Обумовлена дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Пріоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Дата початку"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Зведення"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Сортування завдання"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Перенесення повідомлень"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Копіювання повідомлень"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вибрати гілку"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Стерти..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Скопіювати до теки..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перенести в теку..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "За_планувати зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Параметри..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Дата завершення"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата початку"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Невідоме"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Періодично"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Прив'язано"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Так"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ні"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Пн"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Пд"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Сх"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Зх"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географічне положення потрібно вводити у такому форматі: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5814,36 +6349,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "дп"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "пп"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i хвилинне поділення"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i хвилинне поділення"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "дп"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "пп"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5910,37 +6445,35 @@ msgid ", ending on "
 msgstr ", закінчуючи "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Починається:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Закінчується:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Стан"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Виконано:</b> "
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Обумовлена дата:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Обумовлені завдання "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Невідома персона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5948,305 +6481,285 @@ msgstr ""
 "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
 "нижнього меню."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Немає</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Розташування:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Оновити"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Гаразд"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Неправильне повідомлення про засідання"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пропонує %s виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пропонує вам виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Неправильне повідомлення про завдання"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Неправильне повідомлення про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Повідомлення сформовано неправильно"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Долучений файл не містить правильно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Долучений файл не містить елементів календаря, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Об'єкт є неправильним і не може бути оновлений\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ця відповідь не від поточного учасника. Додати його як учасника?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Трапилась помилка в системі CORBA\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Неможливо знайти об'єкт\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Ви не маєте прав для оновлення календарю\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Неможливо оновити стан учасника!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
@@ -6275,6 +6788,10 @@ msgstr "Завантаження календаря"
 msgid "Loading calendar..."
 msgstr "Завантаження календаря..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Організатор:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Повідомлення від сервера:"
@@ -6291,11 +6808,6 @@ msgstr "дата-початку"
 msgid "Chair Persons"
 msgstr "Головуючі"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Потрібні учасники"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Необов'язкові учасники"
@@ -6363,6 +6875,28 @@ msgstr "Доручено"
 msgid "In Process"
 msgstr "Відбувається"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "За межами офісу"
@@ -6371,98 +6905,64 @@ msgstr "За межами офісу"
 msgid "No Information"
 msgstr "Немає інформації"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Додати відправника в адресну книгу"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+msgid "O_ptions"
 msgstr "Параметри"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Показувати лише робочі години"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Показати зменшене"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "Поновити зайнятість"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Автовибір"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr "_>>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "Всі люди і ресурси"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Всі люди і один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "Потрібні люди"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Потрібні люди і один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Час початку зібрання:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Час завершення зібрання:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Введіть пароль для %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6471,123 +6971,53 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Відкривання завдань на %s"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Помилка на %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Відкривання завдань на %s"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Завершення завдання..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Стирання вибраних об'єктів"
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Завдання"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Оновити об'єкти"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Немає зустрічей."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Відкрити в %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Турін"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Календар та завдання"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Календар та завдання"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Переглядач iTip/iMip з календарю 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:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Завдання"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Квітень"
@@ -6927,10 +7357,6 @@ msgstr "Вибраний місяць (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Вибраний рік (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Завдання"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6961,7 +7387,7 @@ msgid "Contacts: "
 msgstr "Контакти:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
@@ -6990,7 +7416,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Немає завдань"
 msgstr[1] "Немає завдань"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7011,35 +7437,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Створити нову завдання"
@@ -8723,69 +9143,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Отримано неправильний потік повідомлень з %s: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Синхронізація тек"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка аналізу фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка виконання фільтра: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Не вдалося відкрити буферну теку"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Не вдалося обробити буферну теку"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Отримання повідомлення %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Неможливо відкрити повідомлення"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Збій на повідомленні %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Синхронізація теки"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Отримання повідомлення %d з %d"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Збій на повідомленні %d з %d"
@@ -8807,44 +9227,6 @@ msgstr "Неправильні аргументи до (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Операція не підтримується: додавання повідомлення: для %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Операція не підтримується: пошук за виразом: для %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Операція не підтримується: пошук за ідентифікаторами користувачів: для %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Перенесення повідомлень"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Копіювання повідомлень"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Попередження"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Отримання %d повідомлень"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8890,7 +9272,45 @@ msgstr "(співпадають всі) потребує єдиного логі
 msgid "Performing query on unknown header: %s"
 msgstr "Виконання запиту на невідомий заголовок: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Операція не підтримується: додавання повідомлення: для %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Операція не підтримується: пошук за виразом: для %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Операція не підтримується: пошук за ідентифікаторами користувачів: для %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Перенесення повідомлень"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копіювання повідомлень"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Попередження"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Отримання %d повідомлень"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8901,15 +9321,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Неможливо проаналізувати запит паролю gpg."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8918,28 +9338,28 @@ msgstr ""
 "Потрібен пароль, щоб відкрити ключ для \n"
 "користувача: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Відмінено."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Неможливо відкрити секретний ключ: отримано 3 неправильних пароля."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від GnuPG: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Неможливо зашифрувати: не визначено жодного отримувачів"
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8950,89 +9370,69 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збій GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неможливо виконати gpg: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Неможливо виконати gpg."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Тіло містить"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Не вдалося створити файл блокування для %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Вийшов час при спробі блокування файлу %s. Спробуйте ще раз пізніше."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9053,6 +9453,26 @@ msgstr "Неможливо заблокувати '%s': помилка прот�
 msgid "Could not lock '%s'"
 msgstr "Не вдалося заблокувати %s"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Не вдалося створити файл блокування для %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Вийшов час при спробі блокування файлу %s. Спробуйте ще раз пізніше."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9303,7 +9723,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Неправильна автентифікація від сервера."
 
@@ -9386,55 +9806,55 @@ msgstr "POP до SMTP авторизація, використовуючи не
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Збій при компіляції регулярного виразу: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' потребує компонент імені користувача"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' потребує компонент назви хосту"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' потребує компонент шляху"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Розв'язання: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Помилка при розв'язанні імені: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Помилка при пошуку хосту: причина невідома"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Помилка при пошуку хосту: %s: хост не знайдено"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Помилка при пошуку хосту: %s: причина невідома"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Розв'язання адреси"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Помилка при пошуку хосту: хост не знайдено"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Помилка при пошуку хосту: причина невідома"
 
@@ -9510,7 +9930,7 @@ msgstr "Ідентифікатор сертифіката:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Неможливо створити контекст декодування S/MIME."
@@ -9606,7 +10026,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Редагувати підпис"
 
 #: camel/camel-smime-context.c:651
@@ -9621,49 +10041,48 @@ msgstr "Збій команди IMAP: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Не вдалося знайти сертифікат для \"%s\"."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Не вдалося знайти загальний алгоритм."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Створити правило з повідомлення"
+msgid "Cannot create CMS Message"
+msgstr "Неможливо відкрити повідомлення"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Неможливо відкрити повідомлення"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Неможливо долучити файл %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Неможливо долучити файл %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Неможливо відкрити повідомлення"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Неможливо створити контекст декодування S/MIME."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9710,7 +10129,8 @@ msgstr "Не вдалося отримати теку: %s: %s"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неможливо стерти теку: %s: неправильна операція"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неможливо перейменувати теку: %s: неправильна операція"
@@ -9719,8 +10139,8 @@ msgstr "Неможливо перейменувати теку: %s: неправ
 msgid "Trash"
 msgstr "Смітник"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Червень"
@@ -9841,7 +10261,7 @@ msgstr "Використання ключа не підтримує підпис
 msgid "Error in application verification"
 msgstr "Помилка при перевірці додатку"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9854,11 +10274,11 @@ msgstr ""
 "Відбиток:       %s\n"
 "Підпис:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ГАРАЗД"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "НЕПРАВИЛЬНИЙ"
 
@@ -9882,7 +10302,7 @@ msgstr ""
 "Бажаєте прийняти його?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9897,7 +10317,7 @@ msgstr ""
 "\n"
 "Бажаєте прийняти його?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9906,7 +10326,7 @@ msgstr ""
 "Проблема сертифікату: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9915,7 +10335,7 @@ msgstr ""
 "Сертифікат має неправильний домен: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9924,7 +10344,7 @@ msgstr ""
 "Строк дії сертифікату вийшов: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9933,7 +10353,7 @@ msgstr ""
 "Вийшов строк дії списку скасування сертифікатів: %s\n"
 "Подавець: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Неможливо проаналізувати URL \"%s\""
@@ -9957,7 +10377,7 @@ msgstr "Неможливо скопіювати або перенести пов
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неможливо перейменувати теку: %s: немає такої теки"
@@ -9978,8 +10398,8 @@ msgid "Checking for new mail"
 msgstr "Перевіряти нову пошту"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Перевіряти нову пошту в усіх теках"
 
@@ -10013,8 +10433,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -10033,322 +10453,28 @@ msgstr "Під'єднуватись до IMAP серверу з використ
 msgid "Checklist"
 msgstr "Сильна мгла"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неочікувана відповідь від сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Неможливо стерти теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Сервер несподівано розірвав з'єднання: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Теки"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показувати лише підписані теки"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Замінити запропонований сервером простір назв тек"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Простір назв"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Для зчитування та збереження пошти на серверах IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP сервіс для %s на %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS недоступна"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "З'єднання скасовано"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Невідома помилка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного "
-"механізму автентифікації."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sВведіть SMTP пароль для %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Неможливо перейменувати теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Неможливо стерти теку: %s: немає такої теки"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Неможливо стерти теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Неможливо стерти теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Компанія"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Неможливо стерти теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Неможливо перейменувати теку: %s: неправильна операція"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неочікувана відповідь від сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Немає завдань"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Сервер несподівано розірвав з'єднання: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано розірвав з'єднання: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10417,7 +10543,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10492,6 +10618,27 @@ msgstr "Неможливо з'єднатись з сервером LDAP"
 msgid "Command:"
 msgstr "Компанія"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Теки"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Показувати лише підписані теки"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Замінити запропонований сервером простір назв тек"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Простір назв"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10515,43 +10662,93 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження пошти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Сервер IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP сервіс для %s на %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS недоступна"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "З'єднання скасовано"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Розширення SSL/TLS не підтримується"
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Збій при встановленні сеансу SSL"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автентифікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Немає підтримки автентифікації типу %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10562,30 +10759,280 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома батьківська тека: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Неможливо стерти теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Сервер несподівано розірвав з'єднання: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Неможливо додати повідомлення у теку MH: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Для зчитування та збереження пошти на серверах IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного "
+"механізму автентифікації."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sВведіть SMTP пароль для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Неможливо перейменувати теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Неможливо стерти теку: %s: немає такої теки"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Неможливо стерти теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Неможливо стерти теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Неможливо стерти теку: %s: немає такої теки"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Неможливо перейменувати теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Компанія"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Неможливо стерти теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Неможливо перейменувати теку: %s: неправильна операція"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Немає завдань"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Сервер несподівано розірвав з'єднання: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10753,18 +11200,26 @@ msgstr "Не вдалося зберегти зведення %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Неможливо додати повідомлення до зведення: причина невідома"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Вхідні"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Відмінено додавання повідомлення у maildir"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Неможливо додати повідомлення у теку maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10780,48 +11235,48 @@ msgstr ""
 "Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Неправильний вміст повідомлення"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Теки \"%s\" не існує."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "\"%s\" не є каталогом Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалось стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11417,20 +11872,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Не вдалося з'єднатись з POP сервером %s (порт %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Неможливо під'єднатися до POP серверу %s в безпечному режимі: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Не вдалося з'єднатись з POP сервером %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11439,28 +11899,28 @@ msgstr ""
 "Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного "
 "механізму автентифікації."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Не вдалося під'єднатися через SASL \"%s\" до POP серверу %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Не вдалось під'єднатися до POP серверу %s: помилка протоколу SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sБудь ласка, введіть пароль POP3 для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, fuzzy, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11469,7 +11929,16 @@ msgstr ""
 "Неможливо з'єднатись з сервером POP.\n"
 "Помилка відсилання пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Неможливо з'єднатись з сервером POP.\n"
+"Помилка відсилання пароля: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Теки \"%s\" не існує."
@@ -11684,98 +12153,98 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Постачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо відіслати повідомлення: неправильна адреса відправника."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Відсилання повідомлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо відіслати повідомлення: не визначено отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Неможливо відіслати повідомлення: один або більше неправильних отримувачів"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Привітання SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "Автентифікація SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Помилка створення об'єкта автентифікації SASL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Неправильна автентифікаціна відповідь від сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Затримка відповіді на MAIL FROM: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Затримка відповіді на RCPT TO: %s: пошту не відіслано"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Збій команди RCPT TO <%s>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Затримка відповіді на DATA: %s: пошту не відіслано"
@@ -11783,28 +12252,28 @@ msgstr "Затримка відповіді на DATA: %s: пошту не ві�
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "Збій команди IMAP: %s"
@@ -11869,103 +12338,6 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Показувати долучення автоматично"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr ""
-"Завжди підписувати повідомлення при використанні цього облікового рахунку"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr ""
-"Завжди підписувати повідомлення при використанні цього облікового рахунку"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Неможливо відкрити повідомлення"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Неможливо отримати повідомлення від редактора"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Неназване повідомлення)"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Відкрити файл"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Згенеровано автоматично"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Підпис:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Підготувати повідомлення"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Не вдалося створити вікно редагування:\n"
-"Неможливо активувати керуючий елемент обрання адреси."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Не вдалось створити вікно редактора:\n"
-"Неможливо активізувати компонент редактора HTML.\n"
-"Будь ласка, впевніться що у вас встановлено\n"
-"коректну версію gtkhtml та libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Не вдалося створити вікно редактора:\n"
-"Неможливо активувати компонент HTML-редактора."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
-"відредагувати.)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Адреса призначення"
@@ -12048,17 +12420,94 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Attach file(s)"
 msgstr "Долучити файл(и)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Завжди підписувати повідомлення при використанні цього облікового рахунку"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Завжди підписувати повідомлення при використанні цього облікового рахунку"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Неможливо відкрити повідомлення"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Неможливо отримати повідомлення від редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Неназване повідомлення)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Відкрити файл"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Згенеровано автоматично"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Підпис:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Підготувати повідомлення"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Переслане повідомлення %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Долучити оригінальне повідомлення"
+msgstr[1] "Долучити оригінальне повідомлення"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
+"відредагувати.)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Долучити файл до повідомлення"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12076,54 +12525,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Не вдалося створити канал: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Наступне непрочитане повідомлення"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Ви хочете змінити зміни?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Не імпортувати"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Видалити"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Не вдалося зберегти файл підпису: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Помилка збереження ярликів."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Увага: змінене повідомлення"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12131,60 +12594,77 @@ msgid ""
 msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Скасувати зміни"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Зберегти повідомлення як..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Не вдалося створити канал: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Не вдалося зберегти файл підпису: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "Вам потрібно налаштувати користувача\n"
 "перш ніж ви зможете створити повідомлення."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Не вдалося створити канал: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Не вдалося створити вікно редагування:\n"
+"Неможливо активувати керуючий елемент обрання адреси."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Не вдалось створити вікно редактора:\n"
+"Неможливо активізувати компонент редактора HTML.\n"
+"Будь ласка, впевніться що у вас встановлено\n"
+"коректну версію gtkhtml та libgtkhtml.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12488,11 +12968,6 @@ msgstr "%d.%m.%Y"
 msgid "Select a time to compare against"
 msgstr "Обрати час для порівняння"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Правила фільтрування"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12521,19 +12996,8 @@ msgstr "Необхідно вказати назву файлу."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Файл '%s' не існує або не є звичайним файлом."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Видалення теки %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Необхідно вказати теку."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12541,159 +13005,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Призначення"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Цьому фільтру необхідно дати назву."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Віртуальній теці необхідно дати назву."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Не було вибрано сервера"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Виберіть файл"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Обумовлена дата:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Вибір теки"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Правила фільтрування"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Джерела вірт.папок"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Порівняти з"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Вхідні"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Дату повідомлення буде порівняно з вказаною\n"
-"датою (час 12:00am)."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Дату повідомлення буде порівняно з часом\n"
-"відносно запуску фільтру."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Дату повідомлення буде порівняно з поточним\n"
-"часом, коли відбулося фільтрування."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "час відносно поточного"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "тому"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "місяців"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "секунд"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "лише вказані теки"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "поточний час"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "час, що ви вказали"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "з усіма активними віддаленими теками"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "з усіма локальними та активними віддаленими теками"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "з усіма локальними теками"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "років"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важливо"
 
@@ -12763,6 +13105,71 @@ msgstr "вхідні"
 msgid "outgoing"
 msgstr "вихідні"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила фільтрування"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Порівняти з"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Вхідні"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дату повідомлення буде порівняно з вказаною\n"
+"датою (час 12:00am)."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дату повідомлення буде порівняно з часом\n"
+"відносно запуску фільтру."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дату повідомлення буде порівняно з поточним\n"
+"часом, коли відбулося фільтрування."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "час відносно поточного"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "тому"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "місяців"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "секунд"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "поточний час"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "час, що ви вказали"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "років"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Додати правило"
@@ -12775,60 +13182,76 @@ msgstr "Змінити правило"
 msgid "Rule name"
 msgstr "Назва правила"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Правила підрахунку"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Підрахунок"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Вподобання редактора"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Тіло містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Налаштовування вподобань, включаючи безпеку та відображення повідомлень"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Тіло не містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тіло або тема містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Налаштовування поштових рахунків"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Повідомлення містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Адресати містять"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Редактор облікових рахунків Evolution"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Відправник містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Редактор пошти Evolutuion."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Тема містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Редактор пошти Evolutuion."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Тема не містить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Редактор пошти Evolutuion."
 
-#: filter/vfolder-editor.c:108
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "Віртуальні теки"
+msgid "Evolution Mail preferences control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Додати"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Пошта"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "Вподобання пошти"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "Пошта"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12861,51 +13284,314 @@ msgstr "_Додати підпис"
 msgid "Signature(s)"
 msgstr "Підписи"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Переслане повідомлення"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Правила фільтрування"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Вибір теки"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Скорегувати вагу"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Призначити колір"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Призначити вагу"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Долучення"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Звукове повідомлення"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "містить"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Скопіювати у теку"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Дата отримання"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Дата відсилання"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Стерто"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "не містить"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "не закінчується на"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "не існує"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "не повертається"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "не схоже на"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "не починається з"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "не існують"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Чернетка"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "закінчується на"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Існують"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "існує"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Вираз"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "Повне ім'я..."
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "співпадає з"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "після"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "перед"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "Відмічено"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "більше"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "менше"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "не співпадає з"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "не відмічено"
+
+#: mail/em-filter-i18n.h:36
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
+msgid "Junk Test"
+msgstr "Червень"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Позначка"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Список листування"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Тіло повідомлення"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Заголовок повідомлення"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Повідомлення"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Позначити як важливе"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Перенести в теку"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Вийти з програми"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Відтворити звук"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочитано"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Адресати"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Відповідність  рег.виразу"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Відповісти"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "повертає"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "повертає більше ніж"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "повертає менше ніж"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Запустити програму:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Підрахунок"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Відправник"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Встановити стан"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Розмір (КБ)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "схоже на"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Обліковий рахунок відправника"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Особливий заголовок"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "починається на"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Зупинити обробку"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Скинути стан:"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Обумовлена дата:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Створити віртуальну теку з пошуку..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Властивості шрифту"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Властивості"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "Назва _теки:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Довідкове повідомлення"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Довідкове повідомлення"
+msgstr[1] "Довідкове повідомлення"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Наступне непрочитане повідомлення"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Наступне непрочитане повідомлення"
+msgstr[1] "Наступне непрочитане повідомлення"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12915,419 +13601,443 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Вкажіть, де створити теку:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Кортез"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Назва теки:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Вірт.теки"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Завантаження..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "С_копіювати у теку"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Пере_нести в теку"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Перенести"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Скасувати завдання"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Скопіювати"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Перейменувати теку"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Вигляд"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Відкрити у новому вікні"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "Скопіювати..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "Перенести..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова тека"
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Перейменувати"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Властивості..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Вірт.теки"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Вхідні"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Перейменувати..."
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Завантаження..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Пошта"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Властивості"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Позначка"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила фільтрування"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Типово"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скопіювати посилання"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клацніть щоб додати завдання"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Від"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Відповідності:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Відповідати на"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Прив'язано"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
+"складено."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Копія:"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Редагувати підпис"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Прих.копія:"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
+"складено."
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Тема"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Редагувати підпис"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "долучення %s"
+#: mail/em-format-html-display.c:644
+#, 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.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
+msgid "Unencrypted"
+msgstr "Перервано"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Схема не підтримується"
+#: mail/em-format-html-display.c:651
+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.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Неможливо перевірити підпис листа"
+msgid "Encrypted"
+msgstr "Шифрування PGP"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Неможливо перевірити підпис листа"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Отримання повідомлення %s"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Прив'язано"
+msgid "_View Certificate"
+msgstr "Ідентифікатор сертифіката:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Редагувати підпис"
+msgid "This certificate is not viewable"
+msgstr "Сертифікат ще не дійсний"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Редагувати підпис"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Запізнілі завдання:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Перервано"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Вбудований перегляд"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Шифрування PGP"
+msgid "_Hide"
+msgstr "Прибрати"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Сторінка %d з %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Отримання повідомлення %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13364,9 +14074,35 @@ msgstr "Вказівник на невідомі зовнішні дані (ти
 msgid "Formatting message"
 msgstr "Перенесення повідомлень"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Від"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Відповідати на"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "До"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Копія:"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Прих.копія:"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Поштова програма"
 
@@ -13380,113 +14116,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Відповідності:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
-"складено."
-
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
-"складено."
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "долучення %s"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, 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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "Ідентифікатор сертифіката:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Сертифікат ще не дійсний"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Запізнілі завдання:"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
 
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Схема не підтримується"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Вбудований перегляд"
+msgid "Error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Прибрати"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Сторінка %d з %d"
+msgid "Unknown error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13605,7 +14275,7 @@ msgstr "Відіслати повідомлення у список..."
 msgid "_Add to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
@@ -13620,7 +14290,7 @@ msgstr "Цей сервер не підтримує схему інформац�
 msgid "Subscribed"
 msgstr "Підписатися"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Тека"
 
@@ -13657,11 +14327,24 @@ msgid "Add address"
 msgstr "Адреса"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Пошта від %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Віртуальні теки"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Додати"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Джерело вірт.папок"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -14155,69 +14838,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Імпорт"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Вподобання редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Налаштовування вподобань, включаючи безпеку та відображення повідомлень"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Налаштовування поштових рахунків"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Редактор облікових рахунків Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
+msgid "Evolution Pine importer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Поштові Рахунки"
+msgid "Evolution mbox importer"
+msgstr "Редактор пошти Evolutuion."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Вподобання пошти"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "Пошта"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14279,38 +14930,6 @@ msgstr "Імпортування"
 msgid "Importing mailbox"
 msgstr "Імпортування файлів"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14478,80 +15097,86 @@ msgstr "Список розсилки %s"
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d вибрано"
+msgid_plural "%d deleted"
+msgstr[0] "%d вибрано"
+msgstr[1] "%d вибрано"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d не відіслано"
+msgid_plural "%d junk"
+msgstr[0] "%d не відіслано"
+msgstr[1] "%d не відіслано"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Чернетки"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Чернетки"
+msgstr[1] "Чернетки"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d відіслано"
+msgid_plural "%d sent"
+msgstr[0] "%d відіслано"
+msgstr[1] "%d відіслано"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d не відіслано"
+msgid_plural "%d unsent"
+msgstr[0] "%d не відіслано"
+msgstr[1] "%d не відіслано"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d всього"
+msgid_plural "%d total"
+msgstr[0] "%d всього"
+msgstr[1] "%d всього"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d не відіслано"
+msgid_plural ", %d unread"
+msgstr[0] "%d не відіслано"
+msgstr[1] "%d не відіслано"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Поштове повідомлення"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Створити нове поштове повідомлення"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нова віртуальна тека"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Поштові фільтри"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Створити нову теку"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Перевірка служби"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "З'єднання з сервером..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Назва"
@@ -14613,16 +15238,24 @@ msgstr ""
 "Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись "
 "тільки для показу."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Перевірка служби"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "З'єднання з сервером..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Перевірка типів, що підтримуються"
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Перегляд"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14901,7 +15534,7 @@ msgstr ""
 "Не підписувати запрошення на засідання (для сумісності з Outlook "
 "compatibility)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Виконано"
 
@@ -15267,6 +15900,121 @@ msgstr "колір"
 msgid "description"
 msgstr "опис"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Джерела вірт.папок"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Прийнято"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "За_вершено"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Регістрова чутливість"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Знайти у повідомленні"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Знайти:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Керування підпискою"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Вибраний"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "кожні"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Інформація про рахунок"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Поштові Рахунки"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Обумовлена дата:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+#, fuzzy
+msgid "_Flag:"
+msgstr "Відмічено"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Підписатися"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Відписатися"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "лише вказані теки"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "з усіма активними віддаленими теками"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "з усіма локальними та активними віддаленими теками"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "з усіма локальними теками"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15473,14 +16221,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15585,8 +16325,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Неможливо перейменувати теку: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15636,8 +16377,9 @@ msgstr "Не вдалося відкрити загальну теку: %s"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "та одна інша картка."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15666,8 +16408,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Не стирати"
+msgstr "Відновити"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15731,8 +16474,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Не вдалось стерти теку:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15774,13 +16520,44 @@ msgstr ""
 "    \"%s\"\n"
 "та її було оновлено."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Видалення теки %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Необхідно вказати теку."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Віртуальній теці необхідно дати назву."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не було вибрано сервера"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15788,16 +16565,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Переписати"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Аспен"
@@ -15957,7 +16734,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15966,46 +16743,21 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Регістрова чутливість"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Знайти у повідомленні"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Знайти:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Інформація про рахунок"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Скасування..."
@@ -16042,24 +16794,24 @@ msgstr "Оновлення..."
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введіть пароль для %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "Пам'ятати цей пароль до закінчення поточного сеансу"
 
@@ -16116,15 +16868,15 @@ msgstr "Оновлення вірт.тек для uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Оновлення вірт.тек для uri: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
@@ -16188,7 +16940,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -16245,10 +16997,6 @@ msgstr "Переслати"
 msgid "No Response Necessary"
 msgstr "Відповідь не вимагається"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитано"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Відповісти"
@@ -16261,52 +17009,52 @@ msgstr "Відповісти всім"
 msgid "Review"
 msgstr "Перегляд"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тіло містить"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "За_вершено"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тіло не містить"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тіло або тема містить"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Обумовлена дата:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Повідомлення містить"
 
-#: mail/message-tags.glade.h:7
-#, fuzzy
-msgid "_Flag:"
-msgstr "Відмічено"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Адресати містять"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Керування підпискою"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Відправник містить"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Вибраний"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Тема містить"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Тема не містить"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "кожні"
+msgid "Evolution Shell"
+msgstr "Оболонка Evolutuion."
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Підписатися"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Відписатися"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Перевірочний компонент Evolutuion."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16376,31 +17124,20 @@ msgstr ""
 msgid "mail"
 msgstr "Ел.пошта"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Невідома помилка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Неправильні аргументи"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Неможливо зареєструватись на OAF"
+msgid "<b>Active Connections</b>"
+msgstr "З'єднання"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Не знайдено конфігураційної бази даних"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "З'єднання"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Загальна помилка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+"Для закриття цих з'єднань та переходу до автономної роботи клацніть на OK"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16582,30 +17319,6 @@ msgstr "Назва теки не може містити символ \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" і \"..\" є зарезервованими назвами тек."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
-"автономної роботи."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution у процесі переходу до автономної роботи."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
-"переходу до роботи у мережі."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Пошта до %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Здається, програму GNOME Pilot не встановлено у цій системі"
@@ -16623,116 +17336,94 @@ msgstr "Програму \"Bug buddy\" не встановлено."
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Групове"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Новий"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Нове завдання"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "Тест"
-
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Створити нову завдання"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
+"автономної роботи."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "З'єднання"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution у процесі переходу до автономної роботи."
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "Active Connections"
-msgstr "З'єднання"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Для закриття цих з'єднань та переходу до автономної роботи клацніть на OK"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "Календар"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-#, fuzzy
-msgid "_Contacts:"
-msgstr "Контакти:"
+"Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
+"переходу до роботи у мережі."
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "Пошта"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Пошта до %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Завдання:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "Folder _type:"
-msgstr "Тип теки:"
+msgid "Uknown system error."
+msgstr "Невідома помилка"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Відкрити теки інших користувачів"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Неправильні аргументи"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "Обліковий рахунок:"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Назва _теки:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Не знайдено конфігураційної бази даних"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Користувач:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Загальна помилка"
+
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Новий"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помічник встановлення Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Імпортування файлів"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Часовий пояс "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Вітаємо"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
@@ -16747,7 +17438,7 @@ msgstr ""
 "\n"
 "Натисніть клавішу \"Далі\" для продовження."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
@@ -16760,20 +17451,20 @@ msgstr ""
 "\n"
 "Щоб зберегти налаштовування клацніть кнопку \"Завершити\"."
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Оболонка Evolutuion."
+msgid "New Test"
+msgstr "Нове завдання"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Тест"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Перевірочний компонент Evolutuion."
+msgid "Create a new test item"
+msgstr "Створити нову завдання"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16838,7 +17529,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution може імпортувати дані з таких файлів:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16874,7 +17565,7 @@ msgstr ""
 "Сподіваємось вам сподобається результат нашої праці та\n"
 "ми із нетерпінням чекаємо на ваші внески!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16883,40 +17574,40 @@ msgstr ""
 "Дякуємо\n"
 "Команда розробників Ximian Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Більше не казати"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Починати в режимі оффлайн"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Починати в режимі онлайн"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Примусити відновлення конфігураційних файлів з Evolution 1.0.x"
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Записувати інформацію налагодження всіх компонентів у файл."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16991,6 +17682,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17258,6 +17971,12 @@ msgstr "Ідентифікатор сертифіката:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Ідентифікатор картки вже існує"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17485,12 +18204,6 @@ msgstr "Тема - %s"
 msgid "Certificate Signature Value"
 msgstr "Помилка підпису сертифікату"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Ідентифікатор картки вже існує"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17634,8 +18347,8 @@ msgstr "Переглянути поточний контакт."
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Дії"
@@ -18131,16 +18844,6 @@ msgstr "Інвертувати вибір"
 msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Закрити це вікно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "За_крити"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18557,6 +19260,16 @@ msgstr "_Інструменти"
 msgid "_Undelete"
 msgstr "Відновити"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрити це вікно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "За_крити"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Долучити"
@@ -18639,10 +19352,6 @@ msgstr "Зберегти поточний файл з іншою назвою"
 msgid "Save the message in a specified folder"
 msgstr "Зберегти повідомлення у вказаній теці"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Відправити"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19227,7 +19936,7 @@ msgid "Evolution Query"
 msgstr "Компонент Зведення Evolutuion."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19390,27 +20099,277 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% виконано)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Неправильна автентифікація від сервера."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "Назва списку:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Редактор контактів"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Зберегти список як VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Групове"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Не вдалось запустити Wombat"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "Календар"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Параметри звукових сповіщень"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Параметри сигнальних повідомлень"
+
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "Параметри поштових сповіщень"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Програмні параметри сповіщення"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Невідомі параметри сповіщення"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "Повторення сповіщення"
+
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "Відображення повідомлень"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "Тіло повідомлення"
+
+#~ msgid "Play sound:"
+#~ msgstr "Відтворити звук:"
+
+#~ msgid "Run program:"
+#~ msgstr "Запустити програму:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "З цими аргументами:"
+
+#~ msgid "Basics"
+#~ msgstr "Основи"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Дата й час:"
+
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "Нагадування"
+
+#~ msgid "_Options..."
+#~ msgstr "Параметри..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Книга адрес..."
+
+#~ msgid "Reminder"
+#~ msgstr "Нагадування"
+
+#~ msgid "B_usy"
+#~ msgstr "_Зайнятий"
+
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "Конфіденційне"
+
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "Дата й час:"
+
+#~ msgid "F_ree"
+#~ msgstr "_Вільний"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Особисте"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Публічне"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Відвідування"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Додати відправника в адресну книгу"
+
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "Винятки"
+
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "Перегляд:"
+
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило повторення"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Інше повторення"
+
+#~ msgid "_Modify"
+#~ msgstr "З_мінити"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Без періодичності"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "_Проста періодичність"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% виконання:"
+
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "Виконується"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Кон_фіденційне"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Тека:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Починається:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Закінчується:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Виконано:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Обумовлена дата:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Немає</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Трапилась помилка в системі CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Неможливо знайти об'єкт\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Ви не маєте прав для оновлення календарю\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Неможливо оновити стан учасника!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Додати відправника в адресну книгу"
+
+#~ msgid "_Options"
+#~ msgstr "Параметри"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Час початку зібрання:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Час завершення зібрання:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Помилка на %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Не вдалося знайти сертифікат для \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Створити правило з повідомлення"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Неможливо створити контекст декодування S/MIME."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Не вдалося створити вікно редактора:\n"
+#~ "Неможливо активувати компонент HTML-редактора."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Правила підрахунку"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Назва _теки:"
+
+#~ msgid "_Rename"
+#~ msgstr "Перейменувати"
+
+#~ msgid "_Properties..."
+#~ msgstr "Властивості..."
+
+#~ msgid "C_alendar:"
+#~ msgstr "Календар"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Контакти:"
+
+#~ msgid "_Mail:"
+#~ msgstr "Пошта"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Завдання:"
+
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "Тип теки:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Відкрити теки інших користувачів"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Назва _теки:"
+
+#~ msgid "_User:"
+#~ msgstr "_Користувач:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Неможливо з'єднатись з сервером LDAP"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "На вдалося пройти автентифікацію на сервері LDAP"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Неможливо виконати запит на Кореневому DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Цей сервер не підтримує схему інформації LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Помилка при отриманні схеми інформації"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " Показати підтримувані бази "
 
@@ -19488,9 +20447,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Webcam:"
 #~ msgstr "Сторінка"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Відсутній редактор категорій."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19546,9 +20502,6 @@ msgstr "%s (%d%% виконано)"
 #~ "Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про "
 #~ "відміну?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19566,45 +20519,15 @@ msgstr "%s (%d%% виконано)"
 #~ "Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте "
 #~ "відіслати повідомлення про відміну?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Ви впевнені, що хочете стерти це неназване завдання?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Ви впевнені, що хочете стерти цей неназваний запис в журналі?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Ви впевнені, що хочете стерти %d зустрічей?"
-#~ msgstr[1] "Ви впевнені, що хочете стерти %d зустрічей?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Ви впевнені, що хочете стерти %d завдань?"
-#~ msgstr[1] "Ви впевнені, що хочете стерти %d завдань?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Ви впевнені, що хочете стерти %d записів в журналі?"
-#~ msgstr[1] "Ви впевнені, що хочете стерти %d записів в журналі?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "Запросити інших..."
 
@@ -19638,10 +20561,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Змінилась інформація про завдання. Надіслати оновлену версію?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Не вдалося отримати групу: %s"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Помилка автозбереження файлу: %s\n"
@@ -19665,176 +20584,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Невідома відповідь сервера: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Скорегувати вагу"
-
-#~ msgid "Assign Color"
-#~ msgstr "Призначити колір"
-
-#~ msgid "Assign Score"
-#~ msgstr "Призначити вагу"
-
-#~ msgid "Attachments"
-#~ msgstr "Долучення"
-
-#~ msgid "Beep"
-#~ msgstr "Звукове повідомлення"
-
-#~ msgid "contains"
-#~ msgstr "містить"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Скопіювати у теку"
-
-#~ msgid "Date received"
-#~ msgstr "Дата отримання"
-
-#~ msgid "Date sent"
-#~ msgstr "Дата відсилання"
-
-#~ msgid "Deleted"
-#~ msgstr "Стерто"
-
-#~ msgid "does not contain"
-#~ msgstr "не містить"
-
-#~ msgid "does not end with"
-#~ msgstr "не закінчується на"
-
-#~ msgid "does not exist"
-#~ msgstr "не існує"
-
-#~ msgid "does not return"
-#~ msgstr "не повертається"
-
-#~ msgid "does not sound like"
-#~ msgstr "не схоже на"
-
-#~ msgid "does not start with"
-#~ msgstr "не починається з"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "не існують"
-
-#~ msgid "Draft"
-#~ msgstr "Чернетка"
-
-#~ msgid "ends with"
-#~ msgstr "закінчується на"
-
-#~ msgid "Exist"
-#~ msgstr "Існують"
-
-#~ msgid "exists"
-#~ msgstr "існує"
-
-#~ msgid "Expression"
-#~ msgstr "Вираз"
-
-#~ msgid "is"
-#~ msgstr "співпадає з"
-
-#~ msgid "is after"
-#~ msgstr "після"
-
-#~ msgid "is before"
-#~ msgstr "перед"
-
-#~ msgid "is Flagged"
-#~ msgstr "Відмічено"
-
-#~ msgid "is greater than"
-#~ msgstr "більше"
-
-#~ msgid "is less than"
-#~ msgstr "менше"
-
-#~ msgid "is not"
-#~ msgstr "не співпадає з"
-
-#~ msgid "is not Flagged"
-#~ msgstr "не відмічено"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Червень"
-
-#~ msgid "Mailing list"
-#~ msgstr "Список листування"
-
-#~ msgid "Message Body"
-#~ msgstr "Тіло повідомлення"
-
-#~ msgid "Message Header"
-#~ msgstr "Заголовок повідомлення"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Повідомлення"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Позначити як важливе"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Перенести в теку"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Вийти з програми"
-
-#~ msgid "Play Sound"
-#~ msgstr "Відтворити звук"
-
-#~ msgid "Recipients"
-#~ msgstr "Адресати"
-
-#~ msgid "Regex Match"
-#~ msgstr "Відповідність  рег.виразу"
-
-#~ msgid "Replied to"
-#~ msgstr "Відповісти"
-
-#~ msgid "returns"
-#~ msgstr "повертає"
-
-#~ msgid "returns greater than"
-#~ msgstr "повертає більше ніж"
-
-#~ msgid "returns less than"
-#~ msgstr "повертає менше ніж"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Запустити програму:"
-
-#~ msgid "Sender"
-#~ msgstr "Відправник"
-
-#~ msgid "Set Status"
-#~ msgstr "Встановити стан"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Розмір (КБ)"
-
-#~ msgid "sounds like"
-#~ msgstr "схоже на"
-
-#~ msgid "Source Account"
-#~ msgstr "Обліковий рахунок відправника"
-
-#~ msgid "Specific header"
-#~ msgstr "Особливий заголовок"
-
-#~ msgid "starts with"
-#~ msgstr "починається на"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Зупинити обробку"
-
-#~ msgid "Unset Status"
-#~ msgstr "Скинути стан:"
-
 #~ msgid "Working"
 #~ msgstr "Робота"
 
@@ -20049,10 +20798,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Finished"
 #~ msgstr "Завершено"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Групове"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20609,9 +21354,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "component"
 #~ msgstr "Зустріч"
 
-#~ msgid "Alarms"
-#~ msgstr "Сповіщення"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Географічне положення"
 
@@ -21160,10 +21902,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Не вдалося створити каталог %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Вибрати контакти з книги адрес"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "Дата народження:"
 
@@ -21232,22 +21970,10 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Календарна інформація"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Календарна інформація"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Класифікація"
 
 #, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Дата й час"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Опис:"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Починається:</b> "
 
@@ -21658,9 +22384,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Отримання результатів пошуку на LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Помилка виконання пошуку"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Репозиторій поза мережею"
@@ -21804,10 +22527,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Переглядач мінікартки адресної книги Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Переглядач мінікартки адресної книги Evolution"
 
@@ -21902,9 +22621,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Use Score"
 #~ msgstr "Використовувати вагу"
 
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Неможливо завантажити курсор\n"
-
 #~ msgid "Folder containing contact information"
 #~ msgstr "Тека, що містить контактну інформацію"
 
@@ -23169,9 +23885,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Makhachkala"
 #~ msgstr "Махачкала"
 
-#~ msgid "Managua"
-#~ msgstr "Манагуа"
-
 #~ msgid "Manchester"
 #~ msgstr "Манчестер"
 
@@ -23811,10 +24524,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Південна Дакота"
 
 #, fuzzy
-#~ msgid "Southend"
-#~ msgstr "Південь"
-
-#, fuzzy
 #~ msgid "South Marsh Island"
 #~ msgstr "Маршалові острови"
 
@@ -25357,9 +26066,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "View the selected folder"
 #~ msgstr "Показати вибрану теки"
 
-#~ msgid "_Copy..."
-#~ msgstr "Скопіювати..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Панель тек"
 
@@ -25369,27 +26075,18 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Перейти на теку..."
 
-#~ msgid "_Move..."
-#~ msgstr "Перенести..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Нова тека"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Видалити теку іншого користувача"
 
-#~ msgid "_Rename..."
-#~ msgstr "Перейменувати..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Панель ярликів"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Ярлик..."
 
-#~ msgid "Information"
-#~ msgstr "Інформація"
-
 #~ msgid "Error"
 #~ msgstr "Помилка"
 
@@ -25476,9 +26173,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Створити нову теку..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Контакти..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Майстер імпорту файлів LDIF у Evolutuion."
 
diff --git a/po/vi.po b/po/vi.po
index edfb3ef7fb..44f09c238c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-26 22:59+0700\n"
 "Last-Translator: pclouds <pclouds@vnlinux.org>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -20,14 +20,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Sổ địa chỉ Evolution"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "tiêu đề liên lạc: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "thư mục sổ địa chỉ hiện thời "
@@ -48,34 +40,248 @@ msgstr " card"
 msgid " card"
 msgstr " card"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "tiêu đề liên lạc: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Không thể nạp con trỏ\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Lỗi xác thực với LDAP server"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Không thể lấy danh sách nhóm từ server."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Server không trả lời bằng schema hợp lệ"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Không thể nạp sổ địa chỉ"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Bộ biên soạn phân loại không tồn tại."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Lưu vào sổ địa chỉ"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Lỗi nạp sổ địa chỉ mặc định."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Lỗi khi tìm kiếm"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Hủy bỏ"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "và một liên lạc khác."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Không thể phân tích nội dung thông điệp"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Lỗi thêm liên lạc"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Địa chỉ đồng bộ mặc định:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Không thể nạp sổ địa chỉ"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 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.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Truy cập vô danh tới LDAP server"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Lỗi xác thực.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Tự động hoàn thành"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, 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/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "_Liên lạc"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Chứng nhận"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Cấu hình tự động hoàn thành ở đây"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Liên lạc"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Sổ địa chỉ Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Thành phần Sổ địa chỉ Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Điều khiển Quản lý Chứng nhận S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Điều khiển cấu hình thiết lập thư mục Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Quản lý chứng nhận S/MIME của bạn ở đây"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -106,7 +312,8 @@ msgid "New Contacts Group"
 msgstr "Nhóm Liên lạc mới"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "Nhóm _Liên lạc"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -129,15 +336,15 @@ msgid "Migrating `%s':"
 msgstr "Đang nâng cấp `%s`:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Trên máy này"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -146,19 +353,19 @@ msgid "Personal"
 msgstr "Cá nhân"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "Trên máy chủ LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "Máy chủ LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Thiết lập Tự động hoàn thành"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -166,57 +373,66 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Sổ địa chỉ mới"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Xoá"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Liên lạc"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Truy cập vô danh tới LDAP server"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Lỗi xác thực.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, 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/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -236,58 +452,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Tự động hoàn thành"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "_Liên lạc"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Chứng nhận"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Cấu hình tự động hoàn thành ở đây"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Sổ địa chỉ Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Thành phần Sổ địa chỉ Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Điều khiển Quản lý Chứng nhận S/Mime Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Điều khiển cấu hình thiết lập thư mục Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Quản lý chứng nhận S/MIME của bạn ở đây"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -295,7 +459,7 @@ msgstr "Quản lý chứng nhận S/MIME của bạn ở đây"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -304,8 +468,7 @@ msgstr "Quản lý chứng nhận S/MIME của bạn ở đây"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -331,6 +494,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>Xác thực</b>"
 
@@ -372,13 +536,11 @@ msgid "Anonymously"
 msgstr "Vô danh"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Cơ bản"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Chi tiết"
 
@@ -438,7 +600,9 @@ msgstr "Phạm vị tìm:"
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL or TLS."
-msgstr "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy chủ LDAP của bạn nếu máy chủ LDAP của bạn hỗ trợ SSL hoặc TLS."
+msgstr ""
+"Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới máy chủ LDAP của bạn "
+"nếu máy chủ LDAP của bạn hỗ trợ SSL hoặc TLS."
 
 #: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
@@ -446,14 +610,20 @@ msgid ""
 "you are in a insecure environment. For example, if you and your LDAP server "
 "are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
 "because your connection is already secure."
-msgstr "Chọn tùy chọn này có nghĩa là Evolution sẽ chỉ thử dùng SSL/TLS nếu bạn trong môi trường không an toàn. Ví dụ, nếu bạn và máy chủ LDAP của bạn nằm sau tường lửa đang hoạt động, thì Evolution sẽ không cần dùng SSL/TLS vì kết nối đã đủ an toàn rồi."
+msgstr ""
+"Chọn tùy chọn này có nghĩa là Evolution sẽ chỉ thử dùng SSL/TLS nếu bạn "
+"trong môi trường không an toàn. Ví dụ, nếu bạn và máy chủ LDAP của bạn nằm "
+"sau tường lửa đang hoạt động, thì Evolution sẽ không cần dùng SSL/TLS vì kết "
+"nối đã đủ an toàn rồi."
 
 #: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits. "
-msgstr "Chọn tùy chọn này nghĩa là máy chủ của bạn không hỗ trợ cả SSL lẫn TLS. Điều này nghĩa là kết nối của bạn không an toàn, có thể bị lỗ hổng bảo mật."
+msgstr ""
+"Chọn tùy chọn này nghĩa là máy chủ của bạn không hỗ trợ cả SSL lẫn TLS. Điều "
+"này nghĩa là kết nối của bạn không an toàn, có thể bị lỗ hổng bảo mật."
 
 #: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
@@ -468,7 +638,9 @@ msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-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ỏ trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
+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ỏ "
+"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:37
 msgid ""
@@ -476,7 +648,10 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr "Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi tìm kiếm \"sub\" sẽ bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm \"one\" sẽ chỉ tìm những mục nằm trong cơ sở tìm."
+msgstr ""
+"Phạm vi tìm cho biết độ sâu tìm kiếm đi xuống trong cây thư mục. Phạm vi tìm "
+"kiếm \"sub\" sẽ bao gồm mọi mục dưới cơ sở tìm. Phạm vi tìm kiếm \"one\" sẽ "
+"chỉ tìm những mục nằm trong cơ sở tìm."
 
 #: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
@@ -503,14 +678,19 @@ msgstr ""
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
-msgstr "Đây là tên máy chủ xuất hiện trong danh sách thư mục Evolution. Chỉ được dùng với mục đích hiển thị thôi."
+msgstr ""
+"Đây là tên máy chủ xuất hiện trong danh sách thư mục Evolution. Chỉ được "
+"dùng với mục đích hiển thị thôi."
 
 #: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
-msgstr "Đây là số hiệu cổng của máy chủ LDAP mà Evolution sẽ kết nối. Một danh sách các cổng chuẩn sẽ được cung cấp. Hãy hỏi quản trị hệ thống của bạn để biết dùng cổng nào."
+msgstr ""
+"Đây là số hiệu cổng của máy chủ LDAP mà Evolution sẽ kết nối. Một danh sách "
+"các cổng chuẩn sẽ được cung cấp. Hãy hỏi quản trị hệ thống của bạn để biết "
+"dùng cổng nào."
 
 #: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
@@ -583,33 +763,26 @@ msgid "cards"
 msgstr "card"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "phút"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Chọn liên lạc từ sổ địa chỉ"
+#: 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:208
+msgid "Remove All"
+msgstr "Loại bỏ tất cả"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Loại bỏ tất cả"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Xem danh sách liên lạc"
@@ -624,7 +797,7 @@ msgid "Send HTML Mail?"
 msgstr "Gửi thư HTML"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Thêm vào liên lạc"
 
@@ -632,15 +805,22 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Nguồn"
 
-#: 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Chọn liên lạc từ sổ địa chỉ"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -662,6 +842,11 @@ msgstr "_Phân loại:"
 msgid "_Find"
 msgstr "_Tìm"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Tìm"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>Email</b>"
@@ -699,9 +884,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Công việc</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
 
@@ -722,7 +906,6 @@ msgid "Birthday:"
 msgstr "Ngày sinh:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Lịch:"
 
@@ -735,15 +918,15 @@ msgid "Company:"
 msgstr "Công ty:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
 msgstr "Liên lạc"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -835,8 +1018,8 @@ msgstr ""
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -855,39 +1038,27 @@ msgid "_File under:"
 msgstr "_Tập tin trong:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 msgid "_Where:"
 msgstr "_Nơi:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Bạn có chắc muốn xoá liên lạc này?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Địa chỉ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Có thể sửa"
 
@@ -1859,128 +2030,122 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Tin nhắn AOL"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Tin nhắn Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Dịch vụ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Địa chỉ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Tên người dùng"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Nhà"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Khác"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "Sổ nguồn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "Sổ đích"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "Là Liên lạc mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Liên lạc này thuộc các phân loại này:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "Vui lòng chọn ảnh cho liên lạc này"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "Không ảnh"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Dữ liệu liên lạc không hợp lệ:\n\n"
+msgstr ""
+"Dữ liệu liên lạc không hợp lệ:\n"
+"\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "Liên lạc không hợp lệ."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Hủy bỏ"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Tin nhắn AOL"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Tin nhắn Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Dịch vụ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Địa chỉ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Tên người dùng"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Thêm nhanh liên lạc"
@@ -1998,6 +2163,18 @@ msgstr "_Họ và tên:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Bạn có chắc muốn xoá liên lạc này?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Địa chỉ _2:"
@@ -2120,48 +2297,68 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Chọn liên lạc từ sổ địa chỉ"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Thành viên"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+msgid "Select"
+msgstr "Chọn"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "Ẩ_n địa chỉ này khi gửi mail tới danh sách"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "Tên _danh sách:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dưới đây:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Sách"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Là danh sách mới"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Người tham dự yêu cầu"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Bộ hiệu chỉnh danh sách liên lạc"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Lưu danh sách bằng VCard"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Liên lạc đã đổi:"
@@ -2200,406 +2397,11 @@ msgstr ""
 "Bạn có muốn thêm nó nữa?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Danh sách Thành viên"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Tổ chức"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Vị trí"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Hội thoại video"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Điện thoại"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "công việc"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Điện thoại di động"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "cá nhân"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Ghi chú"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Tên nghề"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Thành công"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Kho ngoại tuyến"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Address Book does not exist"
-msgstr "Sổ địa chỉ không tồn tại"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "No Self Contact defined"
-msgstr "Chưa định nghĩa Tự liên hệ"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Không đủ quyền truy cập"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Không tìm thấy liên lạc"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "ID Liên lạc đã tồn tại"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Chưa hỗ trợ giao thức này"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Bị hủy bỏ"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Could not cancel"
-msgstr "Không thể hủy bỏ"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Xác thực thất bại"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Yêu cầu xác thực"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "Không có TLS"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-msgid "No such source"
-msgstr "Không có nguồn này"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Lỗi khác"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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 hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là  do bạn đã nhập sai URI, hoặc là do máy chủ LDAP không thể truy cập."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr "Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP. Nếu bạn muốn dùng LDAP trong Evolution, bạn phải cài đặt gói Evolution hỗ trợ LDAP."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr "Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã nhập sai URI, hoặc là do server không truy cập."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
-"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
-"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/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
-"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/widgets/eab-gui-util.c:141
-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/widgets/eab-gui-util.c:144
-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/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Truy vấn không hoàn tất."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Lỗi khi thêm danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Lỗi thêm liên lạc"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Lỗi khi sửa đổi danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Lỗi hiệu chỉnh liên lạc"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Lỗi khi loại bỏ danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Lỗi loại bỏ liên lạc"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 ""
-"Việc mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\n"
-"Bạn có thật sự muốn hiển thị tất cả các liên lạc này không?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s đã tồn tại.\n"
-"Bạn có muốn ghi đè lên nó?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Ghi đè"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Chuyển liên lạc tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Chép liên lạc tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Chuyển các liên lạc tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Chép các liên lạc tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Chọn sổ địa chỉ đích."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Nhiều VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard cho %s"
-
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(không)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email chính"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Email 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Chọn hành động"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Tạo liên lạc mới \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Thêm địa chỉ vào liên lạc đã có \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Đang truy vấn sổ địa chỉ..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Sửa thông tin liên lạc"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Trộn địa chỉ email"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "và một liên lạc khác."
-msgstr[1] "và %d liên lạc khác."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Lưu vào sổ địa chỉ"
-
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Không có liên lạc"
@@ -2613,9 +2415,9 @@ msgstr[1] "%d liên lạc"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "Truy vấn"
 
@@ -2631,129 +2433,129 @@ msgstr "Kiểu"
 msgid "Error modifying card"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "Tên bắt đầu bằng"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "Thư bắt đầu bằng"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Kiểu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lưu mới VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "Liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "Danh sách liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "Đi tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "Nhập..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "Tìm liên lạc..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 msgid "Address Book Sources..."
 msgstr "Nguồn sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Thiết lập pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "In"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "In phong bì"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 msgid "Copy to Address Book..."
 msgstr "Chép vào Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 msgid "Move to Address Book..."
 msgstr "Chuyển vào Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: 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"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
@@ -2787,6 +2589,8 @@ msgid "Car Phone"
 msgstr "Điện thoại xe"
 
 #: 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:3
 msgid "Categories"
 msgstr "Phân loại"
 
@@ -2794,6 +2598,21 @@ msgstr "Phân loại"
 msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Email 3"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Tên gia đình"
@@ -2830,14 +2649,29 @@ msgstr ""
 msgid "Manager"
 msgstr "Quản lý"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Điện thoại di động"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Tên hiệu"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Ghi chú"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Văn phòng"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Tổ chức"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax khác"
@@ -2889,29 +2723,21 @@ msgstr ""
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "Rộng"
 
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "Cao"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "Nhận focus"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Đã chọn"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Có con trỏ"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Trường"
@@ -2928,7 +2754,11 @@ msgstr "Kiểu chữ"
 msgid "Max field name length"
 msgstr "Độ dài tên trường tối đa"
 
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Độ rộng cột"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -2942,7 +2772,7 @@ msgstr ""
 "\n"
 "Nhấp đúp vào đây để tạo liên lạc mới."
 
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -2952,13 +2782,384 @@ msgstr ""
 "\n"
 "Không có mục nào để xem trong khung nhìn này."
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "Bộ tiếp hợp"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Độ rộng cột"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Đã chọn"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Có con trỏ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Danh sách Thành viên"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Vị trí"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Hội thoại video"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Điện thoại"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "công việc"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "cá nhân"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Tên nghề"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Thành công"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Kho ngoại tuyến"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr "Sổ địa chỉ không tồn tại"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr "Chưa định nghĩa Tự liên hệ"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Không đủ quyền truy cập"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Không tìm thấy liên lạc"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "ID Liên lạc đã tồn tại"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Chưa hỗ trợ giao thức này"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Bị hủy bỏ"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr "Không thể hủy bỏ"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Xác thực thất bại"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Yêu cầu xác thực"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "Không có TLS"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr "Không có nguồn này"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Lỗi khác"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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 hay "
+"không và bạn có quyền truy cập vào đường dẫn đó hay không."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là  do bạn đã nhập sai URI, "
+"hoặc là do máy chủ LDAP không thể truy cập."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP. Nếu bạn muốn "
+"dùng LDAP trong Evolution, bạn phải cài đặt gói Evolution hỗ trợ LDAP."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là do bạn đã nhập sai URI, "
+"hoặc là do server không truy cập."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
+"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
+"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/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
+"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/widgets/eab-gui-util.c:142
+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/widgets/eab-gui-util.c:145
+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/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Truy vấn không hoàn tất."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Lỗi khi thêm danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Lỗi thêm liên lạc"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Lỗi khi sửa đổi danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Lỗi hiệu chỉnh liên lạc"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Lỗi khi loại bỏ danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Lỗi loại bỏ liên lạc"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 ""
+"Việc mở %d liên lạc sẽ mở %d cửa sổ mới cùng lúc.\n"
+"Bạn có thật sự muốn hiển thị tất cả các liên lạc này không?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s đã tồn tại.\n"
+"Bạn có muốn ghi đè lên nó?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Ghi đè"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Chuyển liên lạc tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Chép liên lạc tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Chuyển các liên lạc tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Chép các liên lạc tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Chọn sổ địa chỉ đích."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Nhiều VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard cho %s"
+
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(không)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Email chính"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Chọn hành động"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Tạo liên lạc mới \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Thêm địa chỉ vào liên lạc đã có \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr "Đang truy vấn sổ địa chỉ..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Sửa thông tin liên lạc"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Trộn địa chỉ email"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "và một liên lạc khác."
+msgstr[1] "và %d liên lạc khác."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Lưu vào sổ địa chỉ"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3002,6 +3203,11 @@ msgstr "Bộ nhập VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "In phong bì"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "In liên lạc"
@@ -3011,11 +3217,6 @@ msgstr "In liên lạc"
 msgid "Print contact"
 msgstr "In liên lạc"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "In phong bì"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3200,6 +3401,20 @@ msgstr ""
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Không thể mở tập tin"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "Không thể lấy danh sách sổ địa chỉ"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "lỗi mở sổ"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3254,20 +3469,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Không thể mở tập tin"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "Không thể lấy danh sách sổ địa chỉ"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "lỗi mở sổ"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Lỗi nạp sổ địa chỉ mặc định."
@@ -3284,39 +3485,363 @@ msgstr "Chưa có tên tập tin."
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Không xóa"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Gửi _sau"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Bạn có chắc muốn xóa %d công việc?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for 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:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Bạn có chắc muốn xóa %d mục nhật ký?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Bạn có chắc muốn xóa %d cuộc hẹn?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Bạn có chắc muốn xóa công việc `%s'?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Bạn có chắc muốn xóa công việc `%s'?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Cuộc hẹn"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+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/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Hủy thay đổi"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Gửi"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Nhập mật khẩu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Tácg sự kiện nhiều ngày:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Không thể khởi động wombat server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Không thể khởi động wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Không thể đọc khối ứng dụng lịch của pilot"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Độ ưu tiên mặc định:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Không thể đọc khối ứng dụng ToDo của pilot"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Công việc và Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Công việc và Lịch Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Điều khiển cấu hình lịch Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Bộ xem thông báo lập lịch Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Bộ hiệu chỉnh lịch/công việc Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Thành phần lịch Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Thành phần công việc Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Công việc"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "_Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Công việc"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Dịch vụ lịch báo động Evolution"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bắt đầu:"
@@ -3414,10 +3939,6 @@ 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
-msgid "Evolution Calendar alarm notification service"
-msgstr "Dịch vụ lịch báo động Evolution"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
@@ -3558,9 +4079,29 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày hay không"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Tóm tắt chứa"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Mô tả chứa"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Ghi chú chứa"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "Địa chỉ chứa"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Không khớp"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3572,7 +4113,9 @@ 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 "Thao tác này sẽ xóa vĩnh viễn mọi sự kiện trước khoảng thời gian được chọn. Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những công việc này."
+msgstr ""
+"Thao tác này sẽ xóa vĩnh viễn mọi sự kiện trước khoảng thời gian được chọn. "
+"Nếu bạn tiếp tục, bạn sẽ không thể phục hồi những công việc này."
 
 #: calendar/gui/calendar-commands.c:358
 #, fuzzy
@@ -3580,8 +4123,8 @@ msgid "Purge events older than"
 msgstr "Xóa sự kiện trước"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "ngày"
 
@@ -3592,7 +4135,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -3640,62 +4183,52 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Lịch"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Cuộc họp"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "Lịch mới"
 
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "_Lịch"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Lịch"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "Tạo lịch mới"
 
@@ -3725,26 +4258,6 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Tóm tắt chứa"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Mô tả chứa"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Ghi chú chứa"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "Địa chỉ chứa"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Không khớp"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Lỗi mở server lịch"
@@ -3762,215 +4275,132 @@ msgstr "Không đủ quyền truy cập để mở lịch"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Tùy chọn báo động âm thanh"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Tùy chọn báo động thông điệp"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Tùy chọn báo động thư"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Tùy chọn báo động chương trình"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Tùy chọn báo động lạ"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Lặp báo động"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Thông điệp cần hiển thị:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Thông điệp cần gửi"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Phát âm thanh:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Lặp báo động"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Chạy chương trình:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Gửi đến:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "Thông tin lịch"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Với tham số này:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Mô tả"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Chung</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr ""
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Báo động"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "giờ"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Biên soạn thông điệp"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "T_hêm"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Cơ bản"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Ngày/Giờ:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Thông điệp"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Phát âm thanh"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Bộ nhắc nhở"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Chạy chương trình"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Gửi đến:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Gửi thư"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Tóm tắt:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Tài khoản:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Tùy chọn..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Chạy chương trình:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Lặp báo động"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "sau khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "trước khi"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "kết thúc cuộc hẹn"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "giờ"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "phút"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "bắt đầu cuộc hẹn"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Bạn phải xác định địa chỉ để lấy lịch."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Địa chỉ nguồn '%s' không hợp dạng thức."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Địa chỉ nguồn '%s' không phải là nguồn webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Nguồn tên '%s' đã có trong nhóm được chọn rồi"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Thêm lịc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Thêm Nhóm công việc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "_Màu sắc:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Chọn màu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "_Thêm lịch"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "_Thêm nhóm"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "_Cập nhật:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "_Kiểu:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "T_hêm"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tuần"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Báo động"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4079,7 +4509,7 @@ msgid "Free/Busy Publishing"
 msgstr "Công bố bận/rảnh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Thứ Sáu"
@@ -4093,7 +4523,7 @@ msgid "Minutes"
 msgstr "Phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Thứ Hai"
@@ -4103,7 +4533,7 @@ msgid "S_un"
 msgstr "_CN"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Thứ Bảy"
@@ -4117,7 +4547,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Chủ nhật"
@@ -4131,7 +4561,7 @@ msgid "T_hu"
 msgstr "_Năm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thứ Năm"
@@ -4145,7 +4575,7 @@ msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Thứ Ba"
@@ -4155,7 +4585,7 @@ msgid "W_eek starts:"
 msgstr "Tuần _bắt đầu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Thứ Tư"
@@ -4188,7 +4618,8 @@ msgstr "_Nén ngày nghỉ trong khung tháng"
 msgid "_Day begins:"
 msgstr "_Ngày bắt đầu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4238,6 +4669,72 @@ msgstr "_Tư"
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Bạn phải xác định địa chỉ để lấy lịch."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Địa chỉ nguồn '%s' không hợp dạng thức."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Địa chỉ nguồn '%s' không phải là nguồn webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Nguồn tên '%s' đã có trong nhóm được chọn rồi"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Thêm lịc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Thêm Nhóm công việc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "_Màu sắc:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Chọn màu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "_Thêm lịch"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "_Thêm nhóm"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "_Cập nhật:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "_Kiểu:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "tuần"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Sự kiện đã bị xóa."
@@ -4286,79 +4783,73 @@ msgstr ""
 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?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " tới "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Đã hoàn thành "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Đã hoàn thành "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Đến hạn "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Đến hạn "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Lưu mới..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 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"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "Không thể dùng phiên bản hiện thời!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " tới "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Đã hoàn thành "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Đã hoàn thành "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Đến hạn "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Đến hạn "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Không thể mở nguồn"
@@ -4420,8 +4911,9 @@ msgid "The item could not be deleted due to an error"
 msgstr ""
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Sổ địa chỉ..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Liên lạc..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4431,160 +4923,218 @@ 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:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Bộ nhắc nhở"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 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:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Thông tin"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Ngày kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Thời điểm đầu sai"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Thời điểm kết thúc sai"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Không thể mở lịch '%s'."
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "trước khi mỗi cuộc hẹn"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "kết thúc cuộc hẹn"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "trước khi mỗi cuộc hẹn"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Sự kiện _mọi ngày"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "trước khi mỗi cuộc hẹn"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Bận"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "trước khi mỗi cuộc hẹn"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "_Phân loại.."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "trước khi mỗi cuộc hẹn"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Danh sách công việc</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Phân loại"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "Ngày & giờ"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Tin tưởng"
+msgid "A_ll day event"
+msgstr "Sự kiện _mọi ngày"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Ngày & Giờ"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Lưu khung xem tự chọn..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "_Rảnh"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Phân loại.."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "Đị_a điểm:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Lịch:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "_Riêng tư"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Phân loại"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Công cộng"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Tin tưởng"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Hiện thời giản kiểu"
+msgid "L_ocation:"
+msgstr "Đị_a điểm:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Riêng tư"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Công cộng"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Hiện thời giản kiểu"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Tó_m tắt:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Báo động"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Mô tả"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "Thời điểm _cuối:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "Thời điểm đầ_u:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Không"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Cần một tổ chức."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 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:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Xóa"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Loại bỏ"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4623,34 +5173,45 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "Thêm _Người tham dự"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>Báo động</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "Thêm người tham dự vào sổ địa chỉ."
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>Khác</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Đổ_i tổ chức"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Tổ chức:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Liên lạc..."
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Đổ_i tổ chức"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Tổ chức:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4717,145 +5278,140 @@ msgstr ""
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Cuộc hẹn chứa đệ quy mà Evolution không thể hiệu chỉnh."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "đầu tiên"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "thứ hai"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "thứ ba"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "thứ tư"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "cuối cùng"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Ngày khác"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "ngày"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "lúc"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "lần"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "Ngày/Giờ"
 
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Mô tả"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Xem thử"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Đệ quy"
+
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "Mỗi"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Ngoại lệ"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Xem trước"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Quy tắc truy hồi"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Truy hồi tự _chọn"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Thay đổi"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "_Không truy hồi"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Loại bỏ"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Truy hồi đơ_n"
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "cho"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "mãi mãi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "tháng"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "tới khi"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "tuần"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "năm"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "Chọn đích"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "Đí_ch"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Thông điệp hiển thị"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _hoàn tất"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">Chữ ký điện tử</span>"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Hoàn thành"
 
@@ -4867,8 +5423,8 @@ msgstr "Cao"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Đang làm"
@@ -4880,22 +5436,22 @@ msgid "Low"
 msgstr "Thấp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Bình thường"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Chưa bắt đầu"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Tiến triển"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Phần trăm hoàn thành: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4918,36 +5474,42 @@ msgstr "_Trạng thái:"
 msgid "_Web Page:"
 msgstr "Trang _Web:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Công việc"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Không thể mở công việc trong '%s'."
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Tin tưởn_g"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Thông điệp hiển thị"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">Chữ ký điện tử</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Mô tả"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Thư mục:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "Ngày _bắt đầu:"
@@ -4956,52 +5518,57 @@ msgstr "Ngày _bắt đầu:"
 msgid "_Due date:"
 msgstr "N_gày đến hạn:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Nhóm"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Kết thúc thông tin Rảnh/Bận: <b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "Hàng ngày"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr ""
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Phân loại"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Tên đăng nhập:"
+#, fuzzy
+msgid "_Daily"
+msgstr "Hàng ngày"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Mật khẩu:"
+#, fuzzy
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Mật khẩu:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "Nhớ mật khẩu"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Tên người dùng:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "Hàng tuần"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5083,7 +5650,7 @@ msgstr "%s tại %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s cho loại trigger lạ"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "Nhấn để mở %s"
@@ -5092,6 +5659,11 @@ msgstr "Nhấn để mở %s"
 msgid "Untitled"
 msgstr "Vô danh"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Tóm tắt:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5103,7 +5675,7 @@ msgstr "Ngày đến hạn:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Trạng thái:"
 
@@ -5115,20 +5687,93 @@ msgstr "Độ ưu tiên:"
 msgid "Web Page:"
 msgstr "Trang Web:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Công cộng"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Ngày kết thúc"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Riêng tư"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Ngày bắt đầu"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Tin tưởng"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Tóm tắt"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Rảnh"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Bận"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "B"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "Đ"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "T"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Vị trí địa lý phải được nhập theo dạng thức:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Có"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Không"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Lạ"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Đệ quy"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Đã gán"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5174,95 +5819,101 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Rảnh"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Bận"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Mở"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 msgid "Open _Web Page"
 msgstr "Mở trang _Web"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lư_u mới..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_In..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Cắt"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Sao chép"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Dán"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "_Gán công việc"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Chuyển như iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "Đánh dấu _hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Đánh _dấu công việc hoàn tất"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Xóa"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "Xóa côn_g việc được chọn"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Lưu mới..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Nhấn để thêm công việc"
 
@@ -5271,174 +5922,105 @@ msgstr "Nhấn để thêm công việc"
 msgid "% Complete"
 msgstr "% hoàn tất"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Hoàn tất"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "Ngày hoàn tất"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "Ngày đến hạn"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Độ ưu tiên"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "Ngày bắt đầu"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Tóm tắt"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Loại công việc"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Đang di chuyển"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Đang sao chép"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Chọn _hôm nay"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 msgid "_Select Date..."
 msgstr "_Chọn ngày..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 msgid "Cop_y to Calendar..."
 msgstr "_Chép vào lịch..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 msgid "Mo_ve to Calendar..."
 msgstr "_Chuyển vào lịch..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "T_hiết lập..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Ngày kết thúc"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Ngày bắt đầu"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Lạ"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Đệ quy"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Đã gán"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Có"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Không"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "B"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "Đ"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "T"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Vị trí địa lý phải được nhập theo dạng thức:\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5462,36 +6044,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "lệch %02i phút"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "lệch %02i phút"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5558,346 +6140,325 @@ msgid ", ending on "
 msgstr ", kết thúc lúc "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Bắt đầu:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Kết thúc:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Trạng thái"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Hoàn tất:</b>"
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Tới hạn:</b>"
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Đến hạn "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 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:918
-msgid "<i>None</i>"
-msgstr "<i>Không</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Địa điểm:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, 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:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, 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:1261
+#: calendar/gui/e-itip-control.c:1274
 #, 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:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, 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:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, 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:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, 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:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 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:1465
+#: calendar/gui/e-itip-control.c:1478
 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:1496
+#: calendar/gui/e-itip-control.c:1509
 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:1528
+#: calendar/gui/e-itip-control.c:1541
 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:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-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:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 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:1818
+#: calendar/gui/e-itip-control.c:1813
 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:1830
+#: calendar/gui/e-itip-control.c:1825
 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:1849
-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:1852
-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:1855
-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:1858
+#: calendar/gui/e-itip-control.c:1842
 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:1861
-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:1845
+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:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
@@ -5926,6 +6487,10 @@ msgstr "Đang nạp lịch"
 msgid "Loading calendar..."
 msgstr "Đang nạp lịch..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Tổ chức:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Thông điệp server:"
@@ -5942,11 +6507,6 @@ msgstr "ngày bắt đầu"
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Người tham dự yêu cầu"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Người tham dự không yêu cầu"
@@ -6014,6 +6574,28 @@ msgstr "Ủy nhiệm"
 msgid "In Process"
 msgstr "Trong tiến trình"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 %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:1604
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Không chính thức"
@@ -6022,90 +6604,57 @@ msgstr "Không chính thức"
 msgid "No Information"
 msgstr "Không có thông tin"
 
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "Add attendees from addressbook"
-msgstr "Thêm người tham dự từ sổ địa chỉ"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "_Tùy chọn"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Tùy chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "Chỉ hiện giờ làm _việc"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "Hiện Thu _nhỏ"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "_Cập nhật Rảnh/Bận"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "_Tự chọn"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "_Mọi người và tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "Mọi người và mộ_t tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "Người _yêu cầu"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "Người yêu cầu _và một tài nguyên"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Lúc _bắt đầu cuộc họp:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Lúc _kết thúc cuộc họp:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 %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:1604
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6114,115 +6663,51 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Đang nạp công việc"
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Lỗi mở %s:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Đang nạp công việc"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Công việc"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Đang cập nhật đối tượng"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Đang nạp cuộc hẹn lúc %s"
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Đang nạp công việc lúc %s"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "Opening %s"
 msgstr "Đang mở %s"
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 msgid "Purging"
 msgstr "Đang xóa"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Công việc và Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Công việc và Lịch Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Điều khiển cấu hình lịch Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Bộ xem thông báo lập lịch Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Bộ hiệu chỉnh lịch/công việc Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Thành phần lịch Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Thành phần công việc Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "_Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Công việc"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Tháng Tư"
@@ -6560,10 +7045,6 @@ msgstr "Tháng được chọn (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Năm được chọn (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Công việc"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6594,7 +7075,7 @@ msgid "Contacts: "
 msgstr "Liên lạc: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
@@ -6622,7 +7103,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d công việc"
 msgstr[1] "%d công việc"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6642,33 +7123,28 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "Nhóm công việc mới"
 
-#: calendar/gui/tasks-component.c:1049
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "_Nhóm công việc"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "Tạo nhóm công việc mới"
 
@@ -8345,69 +8821,69 @@ 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:513
+#: camel/camel-filter-driver.c:669 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:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, 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:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, 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:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Không thể mở thư mục spool"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Không thể xử lý thư mục spool"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Đang lấy thông diệp %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Không thể mở thông điệp"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Lỗi trên thông điệp %d"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Đang đồng bộ thư mục"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, 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:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Lỗi tại thông điệp %d trên %d"
@@ -8429,41 +8905,6 @@ msgstr "Đối số không hợp lệ (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
 
-#: camel/camel-folder.c:653
-#, 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:1262
-#, 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:1302
-#, 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:1416
-msgid "Moving messages"
-msgstr "Đang di chuyển thông điệp"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Đang chép thông điệp"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "Học là rác"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "Học không phải là rác"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "Đang lọc thông điệp mới"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8507,7 +8948,42 @@ msgstr ""
 msgid "Performing query on unknown header: %s"
 msgstr "Đang thực hiện truy vấn trên header lạ: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, 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:1262
+#, 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:1302
+#, 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:1416
+msgid "Moving messages"
+msgstr "Đang di chuyển thông điệp"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Đang chép thông điệp"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "Học là rác"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "Học không phải là rác"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "Đang lọc thông điệp mới"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8518,15 +8994,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 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:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8535,28 +9011,28 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, 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:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8567,81 +9043,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG gặp lỗi %s: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Không thể phát sinh dữ liệu ký nhận: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Lỗi thực hiện GPG: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 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:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Không thể xác minh chữ ký thông điệp: dạng thức thông điệp sai"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể phát sinh dữ liệu mã hóa: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 msgid "This is a digitally encrypted message part"
 msgstr "Đây là một phần thông điệp mã hóa"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Nội dung bị mã hóa"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 msgid "Unable to parse message content"
 msgstr "Không thể phân tích nội dung thông điệp"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Không thể tạo tập tin khóa cho %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Quá hạn thử lấy tập tin khóa trên %s. Sẽ thử lại sau."
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "Lỗi lấy khóa bằng fcntl(2): %s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "Lỗi lấy khóa bằng flock(2): %s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8662,6 +9118,26 @@ msgstr "Không thể khóa '%s': lỗi giao thức với bộ hỗ trợ khóa (
 msgid "Could not lock '%s'"
 msgstr "Không thể khóa '%s'"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Không thể tạo tập tin khóa cho %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "Quá hạn thử lấy tập tin khóa trên %s. Sẽ thử lại sau."
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Lỗi lấy khóa bằng fcntl(2): %s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Lỗi lấy khóa bằng flock(2): %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8906,7 +9382,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Trả lời xác thực từ server sai."
 
@@ -8987,55 +9463,55 @@ msgstr "Xác thực POP trước SMTP dùng nguồn không phải POP"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Biên dịch biểu thức chính quy thất bại: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' cần phần tên người dùng"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' cần phần máy chủ"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' cần phần đường dẫn"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Đang phân giải: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Lỗi tra cứu tên: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Lỗi tra cứu máy: không thể tạo thread: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Lỗi tra cứu máy chủ: %s: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: %s: lỗi lạ"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Đang phân giải địa chỉ"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Lỗi tra cứu máy chủ: không tìm thấy máy chủ"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Lỗi tra cứu máy chủ: lỗi lạ"
 
@@ -9110,7 +9586,7 @@ msgstr "_ID Chứng nhận:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
@@ -9202,7 +9678,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Sửa chữ ký"
 
 #: camel/camel-smime-context.c:651
@@ -9217,48 +9693,47 @@ msgstr "Lỗi lệnh IMAP: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
-msgstr "Lỗi tìm chứng nhận cho \"%s\"."
+msgid "Cannot find certificate for `%s'"
+msgstr "Không thể tìm chứng nhận cho '%s'"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Tạo _quy tắc từ thông điệp"
+msgid "Cannot create CMS Message"
+msgstr "Không thể tạo thông điệp CMS"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Không thể tạo thông điệp CMS"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Không thể đính kèm tập tin %s: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Không thể đính kèm tập tin %s: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Không thể tạo thông điệp CMS"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9305,7 +9780,8 @@ msgstr "Không thể lấy thư mục: %s: %s"
 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-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, 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ệ"
@@ -9314,8 +9790,8 @@ msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
 msgid "Trash"
 msgstr "Sọt rác"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rác"
 
@@ -9435,7 +9911,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9444,11 +9920,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "TỐT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "XẤU"
 
@@ -9472,7 +9948,7 @@ msgstr ""
 "Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9487,7 +9963,7 @@ msgstr ""
 "\n"
 "Bạn có muốn chấp nhận không?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9496,7 +9972,7 @@ msgstr ""
 "Vấn đề chứng nhận: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9505,7 +9981,7 @@ msgstr ""
 "Vùng chứng nhận sai: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9514,14 +9990,14 @@ msgstr ""
 "Chứng nhận quá hạn: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Không thể phân tích URL `%s'"
@@ -9545,7 +10021,7 @@ msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục
 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:395
+#: camel/camel-vee-store.c:396
 #, 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"
@@ -9565,8 +10041,8 @@ msgid "Checking for new mail"
 msgstr "Kiểm tra tìm thư mới"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Kiểm tra tìm thư mới trên mọi thư mục"
 
@@ -9601,8 +10077,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9621,318 +10097,28 @@ msgstr ""
 msgid "Checklist"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Máy chủ IMAP4 %s ngắt kết nối bất ngờ: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr "Đã nhận hồi đáp BYE"
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Thư mục"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: 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/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vùng tên"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Để đọc và lưu thư trên IMAP server."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Máy chủ IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Dịch vụ IMAP cho %s trên %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 "Không thể kết nối tới %s (cổng %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "Không có SSL"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Kết nối bị hủy bỏ"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Lỗi lại"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Không thể xác thực tại POP server: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-msgid "Bad command"
-msgstr "Lệnh sai"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Không thể lấy thư mục: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-msgid "No data"
-msgstr "Không có dữ liệu"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Server đã ngắt kết nối bất ngờ: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Lỗi lại"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10001,7 +10187,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10075,6 +10261,27 @@ msgstr "Lỗi kết nối tới LDAP server."
 msgid "Command:"
 msgstr "Lệnh:"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Thư mục"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Chỉ hiện những thư mục đăng ký"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Vùng tên"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10099,43 +10306,92 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Để đọc và lưu thư trên IMAP server."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Máy chủ IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Dịch vụ IMAP cho %s trên %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 "Không thể kết nối tới %s (cổng %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "Không có SSL"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Kết nối bị hủy bỏ"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "Chưa hỗ trợ phần mở rộng SSL/TLS."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "Thương lượng SSL thất bại"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Không thể kết nối tới server: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s không hỗ trợ loại xác thực được yêu cầu %s"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Không hỗ trợ loại xác thực %s"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu IMAP cho %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Bạn chưa nhập mật khẩu"
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10146,30 +10402,277 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Thư mục cha không được phép có các thư mục con"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Không thể xác thực tại POP server: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Máy chủ IMAP4 %s ngắt kết nối bất ngờ: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "Đã nhận hồi đáp BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Để đọc và lưu thư trên IMAP server."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Không thể xác thực tại POP server: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "Lệnh sai"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "Không có dữ liệu"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server đã ngắt kết nối bất ngờ: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10335,18 +10838,26 @@ msgstr "Không thể lưu tóm tắt: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Không thể thêm thông điệp vào bảng tóm tắt: nguyên nhân lạ"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Thư mục nhận"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Thông điệp nối thêm dạng Maildir đã bị hủy"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào thư mục Maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10362,48 +10873,48 @@ msgstr ""
 "Không thể lấy thông điệp: %s từ thư mục%s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Nội dung thông điệp không hợp lệ"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Không thể lấy thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Thư mục `%s' không tồn tại."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' không phải là thư mục dạng Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Không thể xóa thư mục `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10989,20 +11500,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Không thể kết nối tới POP server %s (cổng %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Không thể xác thực tại POP server: %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Lỗi kết nối tới POP server %s trong chế độ an toàn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Không thể kết nối tới POP server %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11010,28 +11526,28 @@ msgid ""
 msgstr ""
 "Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "Đăng nhập SASL `%s' thất bại với POP server %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Không thể đăng nhập vào POP server %s: lỗi giao thức SASL"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Không thể xác thực tại POP server: %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sVui lòng nhập mật khẩu POP cho %s trên máy %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11040,7 +11556,16 @@ msgstr ""
 "Không thể kết nối tới POP server %s.\n"
 "Lỗi gửi mật khẩu: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Không thể kết nối tới POP server %s.\n"
+"Lỗi gửi mật khẩu: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
@@ -11251,94 +11776,94 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP server %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Gửi thư (SMTP) thông qua %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Không thể gửi thông điệp: chưa có địa chỉ người gửi."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 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:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Đang gửi thông điệp"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Không thể gửi thông điệp: chưa có người nhận."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Không thể gửi thông điệp: có một hoặc vài người nhận không hợp lệ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "Chào hỏi của SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Lỗi lệnh HELO: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 msgid "HELO command failed"
 msgstr "Lỗi lệnh HELO"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "xác thực SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Lỗi tạo đối tượng xác thực SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Lỗi lệnh AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 msgid "AUTH command failed"
 msgstr "Lỗi lệnh AUTH"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Trả lời xác thực từ server sai.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Lỗi lệnh MAIL FROM: %s: thư chưa được gửi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 msgid "MAIL FROM command failed"
 msgstr "Lỗi lệnh MAIL FROM"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Lỗi lệnh RCPT TO: %s: thư chưa được gửi"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> thất bại"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Lỗi lệnh DATA: %s: thư chưa được gửi"
@@ -11346,26 +11871,26 @@ msgstr "Lỗi lệnh DATA: %s: thư chưa được gửi"
 #. 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:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 msgid "DATA command failed"
 msgstr "Lỗi lệnh DATA"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Lỗi lệnh RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 msgid "RSET command failed"
 msgstr "Lỗi lệnh RSET"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Lỗi lệnh QUIT: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 msgid "QUIT command failed"
 msgstr "Lỗi lệnh QUIT"
 
@@ -11428,100 +11953,6 @@ msgstr "Kiểu MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Đề nghị tự động hiển thị đồ đính kèm"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for 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"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Không thể mở thông điệp"
-
-#: composer/e-msg-composer.c:1291
-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:1561
-msgid "Untitled Message"
-msgstr "Thông điệp không tên"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Mở tập tin"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Tự phát sinh"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Chữ ký:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ẩ_n thanh đính kèm (thả đính kèm vào đây)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "_Hiện thanh đính kèm (thả đính kèm vào đây)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Biên soạn thông điệp"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-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:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Không thể tạo cửa sổ biên soạn:\n"
-"Không thể kích hoạt bộ biên soạn HTML.\n"
-"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:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-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:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
-"chỉnh)</b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Đích gửi đến"
@@ -11604,17 +12035,90 @@ msgstr "<nhấn đây để chọn thư mục>"
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for 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"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Không thể mở thông điệp"
+
+#: composer/e-msg-composer.c:1291
+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:1561
+msgid "Untitled Message"
+msgstr "Thông điệp không tên"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Mở tập tin"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Tự phát sinh"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Chữ ký:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ẩ_n thanh đính kèm (thả đính kèm vào đây)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "_Hiện thanh đính kèm (thả đính kèm vào đây)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Biên soạn thông điệp"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Thông điệp chuyển tiếp - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Đính kèm thông điệp gốc"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
+"chỉnh)</b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Đính kèm tập tin vào thông điệp"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11632,54 +12136,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Không thể nhận thông điệp từ POP server %s: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Vì \"{1}\"."
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Thông điệp chưa đọc _kế"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Bạn có muốn lưu các thay đổi không?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Không loại bỏ"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Loại bỏ"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Không thể lưu tập tin chữ ký: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Lỗi lưu lối tắt"
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11687,60 +12205,77 @@ msgid ""
 msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Hủy thay đổi"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Lưu thông điệp là..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Không thể tạo ống dẫn: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Không thể lưu tập tin chữ ký: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Vì \"{1}\"."
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, 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ư."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Không thể tạo ống dẫn: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+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ỉ."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+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.\n"
+"Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
+"có được cài đặt đúng phiên bản chưa.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12037,11 +12572,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Chọn thời điểm đối chiếu"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Quy tắc bộ lọc"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12070,19 +12600,8 @@ msgstr "Bạn phải xác định tên tập tin."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Đang gở bỏ thư mục %s"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Bạn phải xác định thư mục."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12090,159 +12609,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Phân công"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Bạn phải đặt tên cho bộ lọc này."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Bạn phải đặt tên cho vfolder này."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Chưa chọn server"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Chọn tập tin"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Tới hạn:</b>"
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Chọn thư mục"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Quy tắc bộ lọc"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Nguồn VFolder"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Đối chiếu"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Vào"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
-" điểm 12:00am tại ngày xác định."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Ngày của thông điệp sẽ được so sánh với thời\n"
-"điểm tương đối so với lúc bộ lọc chạy."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
-" điểm hiện thời, khi bộ lọc chạy."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "thời điểm so với hiện thời"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "trước"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "tháng"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "giây"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "chỉ chọn thư mục"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "thời điểm hiện thời"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "thời điểm bạn chọn"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "với mọi thư mục hoạt động từ xa"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "với mọi thư mục hoạt động từ xa và thư mục cục bộ"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "với mọi thư mục cục bộ"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "năm"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Quan trọng"
 
@@ -12306,6 +12703,71 @@ msgstr "vào"
 msgid "outgoing"
 msgstr "ra"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Quy tắc bộ lọc"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Đối chiếu"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Vào"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
+" điểm 12:00am tại ngày xác định."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Ngày của thông điệp sẽ được so sánh với thời\n"
+"điểm tương đối so với lúc bộ lọc chạy."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Ngày tạo thông điệp sẽ được đối chiếu với thời\n"
+" điểm hiện thời, khi bộ lọc chạy."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "thời điểm so với hiện thời"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "trước"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "tháng"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "giây"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "thời điểm hiện thời"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "thời điểm bạn chọn"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "năm"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
@@ -12318,58 +12780,77 @@ msgstr "Sửa quy tắc"
 msgid "Rule name"
 msgstr "Tên quy tắt"
 
-#: filter/score-editor.c:110
-msgid "_Score Rules"
-msgstr "_Tính điểm quy tắc"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Điểm"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Thông số bộ soạn thảo"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Phần thân chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+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."
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Phân thân không chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+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"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Phần thân và chủ đề chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Cấu hình tài khoản thư ở đây"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Thông điệp chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "Người nhận chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "Người gửi chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Bộ soạn thư của Evolution."
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Chủ đề chứa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Bộ soạn thư của Evolution."
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Chủ đề không chứa"
+#: mail/GNOME_Evolution_Mail.server.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."
 
-#: filter/vfolder-editor.c:108
-msgid "Virtual _Folders"
-msgstr "Thư mục ả_o"
+#: 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."
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Thêm"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Thư"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Nguồn VFolder"
+#: 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:99
+msgid "Mail Preferences"
+msgstr "Thông số thư"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Thư"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12401,45 +12882,310 @@ msgstr "Thêm chữ ký"
 msgid "Signature(s)"
 msgstr "Chữ ký"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Thông điệp chuyển tiếp --------"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Vào %a, %d-%m-%Y lúc %H:%M %%+05d, %s viết rằng:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Quy tắc bộ lọc"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Chọn thư mục"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "Chỉnh điểm"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "Gán màu"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Gán điểm"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Đồ đính kèm"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Bíp"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "chứa"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Chép vào thư mục"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Ngày nhận"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Ngày gửi"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Đã xóa"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "không chứa"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "không kết thúc bằng"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "không tồn tại"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "không trả về"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "không giống với"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "không bắt đầu bằng"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Không tồn tại"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Nháp"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "kết thúc bằng"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Tồn tại"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "tồn tại"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Biểu thức"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr ""
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "bằng"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "sau"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "trước"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "được đặt cờ"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "lớn hơn"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "nhỏ hơn"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "không phải"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "không được đặt cờ"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Tháng Sáu"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Nhãn"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Mailing list"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Thân thông điệp"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Đầu thông điệp"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Đã gửi thông điệp"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Không tìm thấy thông điệp %s."
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Chuyển vào thư mục"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Thoát chương trình"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Phát âm thanh"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Đọc"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Người nhận"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Khớp Regex"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Trả lời cho"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "trả về"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "trả về lớn hơn"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "trả về nhỏ hơn"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Chạy chương trình:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Điểm"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Người gửi"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Đặt trạng thái"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Kích thước (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "giống như"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Tài khoản nguồn"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Header xác định"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "bắt đầu bằng"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Dừng tiến trình"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Chủ đề"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Bỏ đặt trạng thái"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Tới hạn:</b>"
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
-#: mail/em-folder-properties.c:120
-msgid "Folder properties"
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
 msgstr "Thuộc tính thư mục"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Thuộc tính"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Tên thư mục"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Tất cả thông điệp"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Tất cả thông điệp"
 
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Thông điệp chưa đọc"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Thông điệp chưa đọc"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12449,402 +13195,423 @@ msgstr "<nhấn đây để chọn thư mục>"
 msgid "Create New Folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Xác định nơi tạo thư mục:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 msgid "Create"
 msgstr "Tạo"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Tên thư mục:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Đang nạp..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "Đang chuyển thư mục %s"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "Đang chép thư mục %s"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Đang chuyển thông điệp vào thư mục %s"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Đang chép thông điệp vào thư mục %s"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Không thể thả thông điệp vào toplevel store"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Sao chép vào thư mục"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Chuyển vào thư mục"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Di chuyển"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Hủy bỏ _kéo"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "_Sao chép"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Đang tạo thư mục `%s'"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "Tạo thư mục"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Đổi tên thư mục"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Xem"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ mớ_i"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "_Sao chép..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Di chuyển..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Thư mục mớ_i..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "Đổi _tên"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "Thuộc tính..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Đổi _tên..."
 
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Thư mục nhận"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Đang nạp..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Thư"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_In"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Đánh dấu đã đọ_c"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Đánh dấu _rác"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Đánh dấu không phải rá_c"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Hủy xóa"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Nhãn"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "_Lọc rác"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "Sao chép địa chỉ _liên kết"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "Nhấn để gửi %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Từ"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Khớp:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Hồi âm đến"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Đã gán"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Tới"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this 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.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Sửa chữ ký"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"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.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Chủ đề"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Sửa chữ ký"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ngày"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "Nhóm tin"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s đồ đính kèm"
+#: mail/em-format-html-display.c:644
+#, 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.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, 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 "Unencrypted"
+msgstr "Đã ngắt"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-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-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Lược đồ không hỗ trợ"
+msgid "Encrypted"
+msgstr "Mã hóa PGP"
 
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "Lỗi xác minh chữ lý"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format.c:1306
-#, 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:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Đang nhận thông điệp %s"
+#: mail/em-format-html-display.c:653
+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.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Đã gán"
+msgid "_View Certificate"
+msgstr "_ID Chứng nhận:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Sửa chữ ký"
+msgid "This certificate is not viewable"
+msgstr "Chứng nhận chưa hợp lệ"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Sửa chữ ký"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Quá hạn:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Đã ngắt"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Xem Inline"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "Mã hóa PGP"
+msgid "_Hide"
+msgstr "Ẩn"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Trang %d trên %d"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Đang nhận thông điệp %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -12881,9 +13648,35 @@ msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
 msgid "Formatting message"
 msgstr "Đang di chuyển thông điệp"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Từ"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Hồi âm đến"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Tới"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr ""
 
@@ -12897,109 +13690,46 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Khớp:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this 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:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"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.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Ngày"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Nhóm tin"
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s đồ đính kèm"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, 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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+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:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_ID Chứng nhận:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Chứng nhận chưa hợp lệ"
-
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "bởi %d %B, %Y, %l:%M %P"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Quá hạn:"
+#: mail/em-format.c:1279
+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-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "bởi %d %B, %Y, %l:%M %P"
+msgid "Unsupported signature format"
+msgstr "Lược đồ không hỗ trợ"
 
-#: mail/em-format-html-display.c:1088
-#, fuzzy
-msgid "_View Inline"
-msgstr "Xem Inline"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Lỗi xác minh chữ lý"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Ẩn"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "Trang %d trên %d"
+msgid "Unknown error verifying signature"
+msgstr "Không thể giải mã chữ ký chứng nhận"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13112,7 +13842,7 @@ msgstr "Gửi _thông điệp cho danh sách..."
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
@@ -13127,7 +13857,7 @@ msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
 msgid "Subscribed"
 msgstr "Đăng ký"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -13164,11 +13894,23 @@ msgid "Add address"
 msgstr "Địa chỉ"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Thừ từ %s"
 
+#: mail/em-vfolder-editor.c:104
+msgid "Virtual _Folders"
+msgstr "Thư mục ả_o"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Thêm"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Nguồn VFolder"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
 msgid "Automatic link recognition"
@@ -13659,70 +14401,37 @@ msgstr ""
 msgid "spamd port"
 msgstr "Nhập"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Thông số bộ soạn thảo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-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:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "Cấu hình tài khoản thư ở đây"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+msgid "Evolution Elm importer"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.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."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Thành phần tóm tắt thư của Evolution."
+msgid "Evolution Pine importer"
+msgstr "Bộ soạn thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Tài khoản thư"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Bộ soạn thư của Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Thông số thư"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "_Thư"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13784,38 +14493,6 @@ msgstr "Đang nhập"
 msgid "Importing mailbox"
 msgstr "Đang nhập tập tin"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -13963,80 +14640,79 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-component.c:461
-#, c-format
+#: mail/mail-component.c:459
+#, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d đã xóa"
+msgid_plural "%d deleted"
+msgstr[0] "%d đã xóa"
 
-#: mail/mail-component.c:463
-#, c-format
+#: mail/mail-component.c:461
+#, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d rác"
+msgid_plural "%d junk"
+msgstr[0] "%d rác"
 
-#: mail/mail-component.c:486
-#, c-format
-msgid "%d drafts"
-msgstr "%d nháp"
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d nháp"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "đã gửi %d"
+msgid_plural "%d sent"
+msgstr[0] "đã gửi %d"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "chưa gửi %d"
+msgid_plural "%d unsent"
+msgstr[0] "chưa gửi %d"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "tổng cộng %d"
+msgid_plural "%d total"
+msgstr[0] "tổng cộng %d"
 
-#: mail/mail-component.c:496
-#, c-format
+#: mail/mail-component.c:494
+#, fuzzy, c-format
 msgid ", %d unread"
-msgstr ", %d chưa đọc"
+msgid_plural ", %d unread"
+msgstr[0] ", %d chưa đọc"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder mới"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Bộ lọc thư"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Đang kiểm tra dịch vụ"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Đang kết nối tới server..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Thực thể"
@@ -14099,16 +14775,24 @@ 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:895
+msgid "Checking Service"
+msgstr "Đang kiểm tra dịch vụ"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Đang kết nối tới server..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "  _Hiện cơ sở được hỗ trợ "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Xem thử"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14382,7 +15066,7 @@ msgstr "Không trích dẫn thông điệp gốc"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Xong"
 
@@ -14744,6 +15428,120 @@ msgstr "màu"
 msgid "description"
 msgstr "mô tả"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Nguồn VFolder"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr "<span weight=\"bold\">Chữ ký điện tử</span>"
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr "<span weight=\"bold\">Mã hóa</span>"
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Chấp nhận"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Hoàn tất"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Phân biệt hoa/thường"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Tìm trong thông điệp"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Tìm:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "Quản lý đăng ký"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Đã chọn"
+
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "_mỗi"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Thông tin tài khoản"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Tài khoản thư"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Đến _hạn:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Cờ:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Đăng _ký"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "_Bỏ đăng ký"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "chỉ chọn thư mục"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "với mọi thư mục hoạt động từ xa"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "với mọi thư mục hoạt động từ xa và thư mục cục bộ"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "với mọi thư mục cục bộ"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -14935,8 +15733,9 @@ msgstr ""
 
 #. mail:async-error secondary
 #: mail/mail-errors.xml.h:64
+#, fuzzy
 msgid "{1}."
-msgstr ""
+msgstr "{1}"
 
 #. mail:async-error-nodescribe primary
 #: mail/mail-errors.xml.h:66
@@ -14951,14 +15750,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15063,8 +15854,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Không thể di chuyển thư mục: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15114,8 +15906,9 @@ msgstr "Không thể mở thư mục chia sẽ: %s."
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "và một liên lạc khác."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15144,8 +15937,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Không xóa"
+msgstr "_Hủy xóa"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15160,8 +15954,9 @@ msgstr "Vì \"{0}\"."
 
 #. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
+#, fuzzy
 msgid "Cannot set signature script \"{0}\"."
-msgstr ""
+msgstr "Không thể lưu tập tin chữ ký: %s"
 
 #. mail:signature-notscript secondary
 #: mail/mail-errors.xml.h:177
@@ -15208,8 +16003,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Không thể xóa thư mục:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15241,13 +16039,44 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Đang gở bỏ thư mục %s"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Bạn phải xác định thư mục."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Bạn phải đặt tên cho vfolder này."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Chưa chọn server"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15255,15 +16084,15 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr "Bỏ qua"
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Ghi đè"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 msgid "_Append"
 msgstr "_Thêm vào"
 
@@ -15422,7 +16251,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15431,46 +16260,21 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Phân biệt hoa/thường"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Tìm trong thông điệp"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Tìm:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">Chữ ký điện tử</span>"
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">Mã hóa</span>"
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Thông tin tài khoản"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Đang hủy bỏ..."
@@ -15507,24 +16311,24 @@ msgstr "Đang cập nhập..."
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 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"
 
@@ -15581,15 +16385,15 @@ msgstr "Đang cập nhật vfolder cho URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "VFolder mới"
 
@@ -15653,7 +16457,7 @@ msgstr "%d %b %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -15709,10 +16513,6 @@ msgstr "Chuyển tiếp"
 msgid "No Response Necessary"
 msgstr "Không cần thiết trả lời"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Đọc"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Trả lời"
@@ -15725,51 +16525,52 @@ msgstr "Trả lời tất cả"
 msgid "Review"
 msgstr "Xem lại"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr ""
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Phần thân chứa"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Hoàn tất"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Phân thân không chứa"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Phần thân và chủ đề chứa"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Đến _hạn:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Thông điệp chứa"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Cờ:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Người nhận chứa"
 
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "Quản lý đăng ký"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Người gửi chứa"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "Đã chọn"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Chủ đề chứa"
 
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Chủ đề không chứa"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "_mỗi"
+msgid "Evolution Shell"
+msgstr "Vỏ bọc Evolution"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Đăng _ký"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "_Bỏ đăng ký"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Thành phần kiểm tra Evolution"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -15837,30 +16638,17 @@ msgstr ""
 msgid "mail"
 msgstr "thư"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "Lỗi hệ thống lại."
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Đối số không hợp lệ"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Không thể đăng ký với OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
+msgstr "<b>Kết nối hoạt động</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Kết nối hoạt động"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Lỗi chung chung"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Nhấn Đồng ý để đóng những kết nối này và chuyển sang ngoại tuyến"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16042,29 +16830,6 @@ msgstr "Tên thư mục không thể chứa ký tự Enter"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' và '..' là hai tên thư mục đặc biệt, được dành riêng."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "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-window.c:344
-#, fuzzy
-msgid "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-window.c:350
-#, fuzzy
-msgid "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-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "Chuyển san %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Công cụ GNOME Pilot có lẽ chưa được cài đặt trên hệ thống này."
@@ -16082,108 +16847,91 @@ msgstr "Bug Buddy chưa được cài đặt."
 msgid "Bug buddy could not be run."
 msgstr "Không thể chạy Bug buddy"
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 msgid "Groupware Suite"
 msgstr "Bộ phần mềm nhóm"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Ô kiểm"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Mới"
-
-#: shell/evolution-test-component.c:140
-msgid "New Test"
-msgstr ""
-
-#: shell/evolution-test-component.c:141
-msgid "_Test"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "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/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Tạo công việc mới"
-
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>Kết nối hoạt động</b>"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Kết nối hoạt động"
-
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Nhấn Đồng ý để đóng những kết nối này và chuyển sang ngoại tuyến"
+msgid "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/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "_Lịch:"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "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/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Liên lạc:"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "Chuyển san %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Thư:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Công việc:"
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "Lỗi hệ thống lại."
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Kiểu thư mục:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Đối số không hợp lệ"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Mở thư mục của người dùng khác"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Không thể đăng ký với OAF"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Tài khoản:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Tên thư _mục:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Lỗi chung chung"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Tên người dùng:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Mới"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Trợ tá thiết lập Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Đang nhập tập tin"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Múi giờ "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Chào mừng"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
@@ -16198,7 +16946,7 @@ msgstr ""
 "\n"
 "Vui lòng nhấn nút \"Kế tiếp\" để tiếp tục."
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
@@ -16210,20 +16958,18 @@ 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
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Vỏ bọc Evolution"
+#: shell/evolution-test-component.c:140
+msgid "New Test"
+msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+#: shell/evolution-test-component.c:141
+msgid "_Test"
+msgstr ""
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Thành phần kiểm tra Evolution"
+msgid "Create a new test item"
+msgstr "Tạo công việc mới"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16284,7 +17030,7 @@ 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:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16310,12 +17056,13 @@ msgstr ""
 "nhưng vẫn còn vài tính năng hoặc chưa hoàn chỉnh, hoặc chưa làm việc\n"
 "đúng.\n"
 "\n"
-"Nếu bạn tìm thấy lỗi, vui lòng thông báo cho chúng tôi tại bugzilla.ximian.com.\n"
+"Nếu bạn tìm thấy lỗi, vui lòng thông báo cho chúng tôi tại bugzilla.ximian."
+"com.\n"
 "\n"
 "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:255
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16323,39 +17070,39 @@ msgstr ""
 "Xin cám ơn\n"
 "Nhóm Evolution\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Khởi động trong chế độ ngoại tuyến"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Khởi động trong chế độ trực tuyến"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Buộc tái nâng cấp từ Evolution 1.4"
 
-#: shell/main.c:510
+#: shell/main.c:475
 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:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16427,6 +17174,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16663,6 +17432,11 @@ msgstr "Chứng nhận của bạn"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Chứng nhận đã tồn tại"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16862,11 +17636,6 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr "Giá trị chữ ký chứng nhận"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Chứng nhận đã tồn tại"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Mật khẩu tập tin PKCS12"
@@ -17007,8 +17776,8 @@ msgstr "Xem liên lạc hiện thời"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Hành động"
@@ -17490,16 +18259,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:5
-msgid "Close this window"
-msgstr "Đóng cửa sổ này"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Đón_g"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17908,6 +18667,16 @@ msgstr "_Công cụ"
 msgid "_Undelete"
 msgstr "_Hủy xóa"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Đóng cửa sổ này"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Đón_g"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Đính kèm"
@@ -17990,10 +18759,6 @@ msgstr "Lưu tập tin hiện thời với tên khác"
 msgid "Save the message in a specified folder"
 msgstr "Lưu thông điệp vào thư mục xác định"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Gửi"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18545,7 +19310,7 @@ msgid "Evolution Query"
 msgstr "Truy vấn Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18692,27 +19457,248 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
+#~ msgid "Login name:"
+#~ msgstr "Tên đăng nhập:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "contact-list-editor"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Lưu danh sách bằng VCard"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Không thể khởi động wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "_Lịch"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Tùy chọn báo động âm thanh"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Tùy chọn báo động thông điệp"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Tùy chọn báo động thư"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Tùy chọn báo động chương trình"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Tùy chọn báo động lạ"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Lặp báo động"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Thông điệp cần hiển thị:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Thông điệp cần gửi"
+
+#~ msgid "Play sound:"
+#~ msgstr "Phát âm thanh:"
+
+#~ msgid "Run program:"
+#~ msgstr "Chạy chương trình:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Với tham số này:"
+
+#~ msgid "Basics"
+#~ msgstr "Cơ bản"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Ngày/Giờ:"
+
+#~ msgid "Reminders"
+#~ msgstr "Bộ nhắc nhở"
+
+#~ msgid "_Options..."
+#~ msgstr "_Tùy chọn..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Sổ địa chỉ..."
+
+#~ msgid "Reminder"
+#~ msgstr "Bộ nhắc nhở"
+
+#~ msgid "B_usy"
+#~ msgstr "_Bận"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Tin tưởng"
+
+#~ msgid "Date & Time"
+#~ msgstr "Ngày & Giờ"
+
+#~ msgid "F_ree"
+#~ msgstr "_Rảnh"
+
+#~ msgid "Pri_vate"
+#~ msgstr "_Riêng tư"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Công cộng"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "Thêm _Người tham dự"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Thêm người tham dự vào sổ địa chỉ."
+
+#~ msgid "Exceptions"
+#~ msgstr "Ngoại lệ"
+
+#~ msgid "Preview"
+#~ msgstr "Xem trước"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Quy tắc truy hồi"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Truy hồi tự _chọn"
+
+#~ msgid "_Modify"
+#~ msgstr "_Thay đổi"
+
+#~ msgid "_No recurrence"
+#~ msgstr "_Không truy hồi"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Truy hồi đơ_n"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _hoàn tất"
+
+#~ msgid "Progress"
+#~ msgstr "Tiến triển"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Tin tưởn_g"
+
+#~ msgid "Folder:"
+#~ msgstr "Thư mục:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Bắt đầu:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Kết thúc:</b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Hoàn tất:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Tới hạn:</b>"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Không</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Lỗi trong hệ thống CORBA\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Không thể tìm thấy đối tượng\n"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Thêm người tham dự từ sổ địa chỉ"
+
+#~ msgid "_Options"
+#~ msgstr "_Tùy chọn"
+
+#~ msgid "Meeting _start time:"
+#~ 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:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Lỗi mở %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Lỗi tìm chứng nhận cho \"%s\"."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Tạo _quy tắc từ thông điệp"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ 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."
+
+#~ msgid "_Score Rules"
+#~ msgstr "_Tính điểm quy tắc"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "Vào %a, %d-%m-%Y lúc %H:%M %%+05d, %s viết rằng:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Tên thư mục"
+
+#~ msgid "_Rename"
+#~ msgstr "Đổi _tên"
+
+#~ msgid "_Properties..."
+#~ msgstr "Thuộc tính..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Ô kiểm"
+
+#~ msgid "C_alendar:"
+#~ msgstr "_Lịch:"
+
+#~ msgid "_Contacts:"
+#~ msgstr "_Liên lạc:"
+
+#~ msgid "_Mail:"
+#~ msgstr "_Thư:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Công việc:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Kiểu thư mục:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Mở thư mục của người dùng khác"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Tên thư _mục:"
+
+#~ msgid "_User:"
+#~ msgstr "_Tên người dùng:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Lỗi kết nối tới LDAP server."
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Lỗi xác thực với LDAP server"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Không thể thực hiện truy vấn tại Root DSE"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Lỗi nhận thông tin schema"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Server không trả lời bằng schema hợp lệ"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  _Hiện cơ sở được hỗ trợ "
 
@@ -18785,9 +19771,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Webcam:"
 #~ msgstr "Trang"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Bộ biên soạn phân loại không tồn tại."
-
 #~ msgid "Could not find widget for a field: `%s'"
 #~ msgstr "Không thể tìm thấy widget cho trường: `%s'"
 
@@ -18837,9 +19820,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "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?"
 
-#~ 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?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -18850,45 +19830,15 @@ msgstr "%s (%d%% hoàn tất)"
 #~ 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?"
 
-#~ 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?"
-
-#~ 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'?"
-
 #~ 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?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#~ 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'?"
-
 #~ 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?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Bạn có chắc muốn xóa %d cuộc hẹn?"
-#~ msgstr[1] "Bạn có chắc muốn xóa %d cuộc hẹn?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Bạn có chắc muốn xóa %d công việc?"
-#~ msgstr[1] "Bạn có chắc muốn xóa %d công việc?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Bạn có chắc muốn xóa %d mục nhật ký?"
-#~ msgstr[1] "Bạn có chắc muốn xóa %d mục nhật ký?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Mời người khác..."
 
@@ -18922,10 +19872,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Không thể lấy danh sách nhóm từ server."
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Lỗi tự động lưu thông điệp: %s\n"
@@ -18949,176 +19895,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Hồi đáp lại từ server: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Chỉnh điểm"
-
-#~ msgid "Assign Color"
-#~ msgstr "Gán màu"
-
-#~ msgid "Assign Score"
-#~ msgstr "Gán điểm"
-
-#~ msgid "Attachments"
-#~ msgstr "Đồ đính kèm"
-
-#~ msgid "Beep"
-#~ msgstr "Bíp"
-
-#~ msgid "contains"
-#~ msgstr "chứa"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Chép vào thư mục"
-
-#~ msgid "Date received"
-#~ msgstr "Ngày nhận"
-
-#~ msgid "Date sent"
-#~ msgstr "Ngày gửi"
-
-#~ msgid "Deleted"
-#~ msgstr "Đã xóa"
-
-#~ msgid "does not contain"
-#~ msgstr "không chứa"
-
-#~ msgid "does not end with"
-#~ msgstr "không kết thúc bằng"
-
-#~ msgid "does not exist"
-#~ msgstr "không tồn tại"
-
-#~ msgid "does not return"
-#~ msgstr "không trả về"
-
-#~ msgid "does not sound like"
-#~ msgstr "không giống với"
-
-#~ msgid "does not start with"
-#~ msgstr "không bắt đầu bằng"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Không tồn tại"
-
-#~ msgid "Draft"
-#~ msgstr "Nháp"
-
-#~ msgid "ends with"
-#~ msgstr "kết thúc bằng"
-
-#~ msgid "Exist"
-#~ msgstr "Tồn tại"
-
-#~ msgid "exists"
-#~ msgstr "tồn tại"
-
-#~ msgid "Expression"
-#~ msgstr "Biểu thức"
-
-#~ msgid "is"
-#~ msgstr "bằng"
-
-#~ msgid "is after"
-#~ msgstr "sau"
-
-#~ msgid "is before"
-#~ msgstr "trước"
-
-#~ msgid "is Flagged"
-#~ msgstr "được đặt cờ"
-
-#~ msgid "is greater than"
-#~ msgstr "lớn hơn"
-
-#~ msgid "is less than"
-#~ msgstr "nhỏ hơn"
-
-#~ msgid "is not"
-#~ msgstr "không phải"
-
-#~ msgid "is not Flagged"
-#~ msgstr "không được đặt cờ"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "Tháng Sáu"
-
-#~ msgid "Mailing list"
-#~ msgstr "Mailing list"
-
-#~ msgid "Message Body"
-#~ msgstr "Thân thông điệp"
-
-#~ msgid "Message Header"
-#~ msgstr "Đầu thông điệp"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Đã gửi thông điệp"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Không tìm thấy thông điệp %s."
-
-#~ msgid "Move to Folder"
-#~ msgstr "Chuyển vào thư mục"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Thoát chương trình"
-
-#~ msgid "Play Sound"
-#~ msgstr "Phát âm thanh"
-
-#~ msgid "Recipients"
-#~ msgstr "Người nhận"
-
-#~ msgid "Regex Match"
-#~ msgstr "Khớp Regex"
-
-#~ msgid "Replied to"
-#~ msgstr "Trả lời cho"
-
-#~ msgid "returns"
-#~ msgstr "trả về"
-
-#~ msgid "returns greater than"
-#~ msgstr "trả về lớn hơn"
-
-#~ msgid "returns less than"
-#~ msgstr "trả về nhỏ hơn"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Chạy chương trình:"
-
-#~ msgid "Sender"
-#~ msgstr "Người gửi"
-
-#~ msgid "Set Status"
-#~ msgstr "Đặt trạng thái"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Kích thước (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "giống như"
-
-#~ msgid "Source Account"
-#~ msgstr "Tài khoản nguồn"
-
-#~ msgid "Specific header"
-#~ msgstr "Header xác định"
-
-#~ msgid "starts with"
-#~ msgstr "bắt đầu bằng"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Dừng tiến trình"
-
-#~ msgid "Unset Status"
-#~ msgstr "Bỏ đặt trạng thái"
-
 #~ msgid "Working"
 #~ msgstr "Đang làm việc"
 
@@ -19330,10 +20106,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Finished"
 #~ msgstr "Hoàn tất"
 
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "Nhóm"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -19874,9 +20646,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "component"
 #~ msgstr "Cuộc hẹn"
 
-#~ msgid "Alarms"
-#~ msgstr "Báo động"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Vị trí địa lý"
 
@@ -20434,10 +21203,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Không thể tạo thư mục %s: %s"
 
 #, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "Chọn liên lạc từ sổ địa chỉ"
-
-#, fuzzy
 #~ msgid "Birthdays"
 #~ msgstr "Ngày _sinh:"
 
@@ -20507,22 +21272,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Thông tin lịch"
 
 #, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "Thông tin lịch"
-
-#, fuzzy
-#~ msgid "<b>Classification</b>"
-#~ msgstr "Phân loại"
-
-#, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "Ngày & giờ"
-
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "Mô tả"
-
-#, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>Bắt đầu:</b> "
 
@@ -20933,9 +21682,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "Đang nhận kết quả tìm kiếm LDAP..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Lỗi khi tìm kiếm"
-
 #, fuzzy
 #~ msgid "Repository is offline"
 #~ msgstr "Kho ngoại tuyến"
@@ -21077,10 +21823,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Bộ xem Minicard sổ địa chỉ evolution"
 
 #, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Bộ xem lịch iTip/iMip Evolution"
-
-#, fuzzy
 #~ msgid "Evolution Addressbook local backend"
 #~ msgstr "Bộ xem Minicard sổ địa chỉ evolution"
 
@@ -21172,9 +21914,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Arbitrary"
 #~ msgstr "Tổng quát"
 
-#~ 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"
 
@@ -23455,9 +24194,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -24841,9 +25577,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25234,9 +25967,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27613,9 +28343,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "South Dakota"
 #~ msgstr "South Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "Đảo South Marsh"
 
@@ -29817,9 +30544,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "View the selected folder"
 #~ msgstr "Xem thư mục được chọn"
 
-#~ msgid "_Copy..."
-#~ msgstr "_Sao chép..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "Thanh Thư _mục"
 
@@ -29829,37 +30553,24 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "Đ_i tới thư mục..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Di chuyển..."
-
 #~ msgid "_New Folder"
 #~ msgstr "Thư mục mớ_i"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "_Loại bỏ thư mục của người dùng khác"
 
-#~ msgid "_Rename..."
-#~ msgstr "Đổi _tên..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "Thanh _lối tắt"
 
 #~ msgid "_Shortcut..."
 #~ msgstr "_Lối tắt..."
 
-#~ msgid "Information"
-#~ msgstr "Thông tin"
-
 #~ msgid "Error"
 #~ msgstr "Lỗi"
 
 #~ msgid "Question"
 #~ msgstr "Câu hỏi"
 
-#, fuzzy
-#~ msgid "Evolution Addressbook local file backend"
-#~ msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
 #~ msgid "De_lete"
 #~ msgstr "_Xóa"
 
@@ -29918,9 +30629,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "Tạo thư mục mớ_i..."
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Liên lạc..."
-
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "Factory Nhập tập tin LDIF vào Evolution."
 
@@ -30322,9 +31030,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "Vui lòng chọn thuộc tính Evolution và thuộc\n"
 #~ "tính LDAP liên kết với nó."
 
-#~ msgid "Select"
-#~ msgstr "Chọn"
-
 #~ msgid ""
 #~ "Selecting this option will let you change Evolution's default settings "
 #~ "for LDAP\n"
@@ -30334,9 +31039,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "Evolution\n"
 #~ "cho tìm kiếm LDAP, tạo và sửa các liên lạc."
 
-#~ msgid "C_ontacts..."
-#~ msgstr "_Liên lạc..."
-
 #~ msgid "Phone Types"
 #~ msgstr "Kiểu điện thoại"
 
@@ -30865,9 +31567,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Meeting ends: <b>"
 #~ msgstr "Kết thúc cuộc họp: <b>"
 
-#~ msgid "Free/Busy info ends: <b>"
-#~ msgstr "Kết thúc thông tin Rảnh/Bận: <b>"
-
 #~ msgid "Task Completed: <b>"
 #~ msgstr "Công việc hoàn tất: <b>"
 
@@ -30956,9 +31655,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Không thể mở thư mục: danh sách thông điệp chưa hoàn chỉnh."
 
-#~ msgid "Could not retrieve message from POP server %s: %s"
-#~ msgstr "Không thể nhận thông điệp từ POP server %s: %s"
-
 #~ msgid ""
 #~ "This will connect to the POP server and use Kerberos 4 to authenticate to "
 #~ "it."
@@ -31087,12 +31783,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "%s may not be reconfigured because it is not a local folder"
 #~ msgstr "%s không thể được cấu hình lại vì không phải là thư mục cục bộ"
 
-#~ msgid "Moving"
-#~ msgstr "Đang di chuyển"
-
-#~ msgid "Copying"
-#~ msgstr "Đang sao chép"
-
 #~ msgid "Show _folders from server: "
 #~ msgstr "Hiện _thư mục từ server: "
 
@@ -31162,9 +31852,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Send _Later"
 #~ msgstr "Gửi _sau"
 
-#~ msgid "Send _later"
-#~ msgstr "Gửi _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/wa.po b/po/wa.po
index dd577c887d..b4faf8a81f 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.66.9\n"
-"POT-Creation-Date: 2002-05-15 13:04+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-24 15:41+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -20,2136 +20,2249 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
-msgid "Factory to import LDIF files into Evolution."
-msgstr ""
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Calpin d' adresses"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
-msgid "Imports LDIF files into Evolution."
+#: a11y/addressbook/ea-minicard-view.c:101
+msgid "current addressbook folder "
 msgstr ""
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
-msgid "Factory to import VCard files into Evolution."
-msgstr ""
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Schaper et rlomer"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
-msgid "Imports VCard files into Evolution."
-msgstr ""
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Bouyes "
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:332
-msgid "File As"
+#: a11y/addressbook/ea-minicard-view.c:104
+msgid " cards"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-msgid "Name"
-msgstr "No"
-
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:334
-msgid "Email"
-msgstr "Emile"
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
-msgid "Primary"
-msgstr "Prumioûle"
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Prum."
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "card.vcf"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1716
-#: addressbook/gui/widgets/e-addressbook-view.c:366
-msgid "Assistant"
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1717
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
-msgid "Business"
-msgstr "Ovraedje"
-
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-msgid "Bus"
-msgstr "Ovr."
-
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1720
-msgid "Callback"
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1722
-msgid "Company"
-msgstr "Eterprijhe"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-msgid "Comp"
-msgstr "Eter."
-
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1723
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
-msgid "Home"
-msgstr "Måjhon"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:341
-msgid "Organization"
-msgstr "Organizåcion"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-msgid "Org"
-msgstr "Org."
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+msgid "This addressbook could not be opened."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1727
-msgid "Mobile"
-msgstr "Axhlåve"
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1721
-msgid "Car"
-msgstr "Vweteure"
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1719
-#: addressbook/gui/widgets/e-addressbook-view.c:346
-msgid "Business Fax"
-msgstr "Facs å buro"
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-msgid "Bus Fax"
-msgstr "Facs å buro"
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1725
-#: addressbook/gui/widgets/e-addressbook-view.c:347
-msgid "Home Fax"
-msgstr "Facs al måjhon"
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1718
-msgid "Business 2"
-msgstr "Ovraedje 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:76
-msgid "Bus 2"
-msgstr "Ovr. 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1724
-msgid "Home 2"
-msgstr "Måjhon 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1726
-#: addressbook/gui/widgets/e-addressbook-view.c:350
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1728
-#: addressbook/gui/contact-editor/e-contact-editor.c:1786
-#: mail/mail-config.glade.h:58
-msgid "Other"
-msgstr "Ôte"
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+msgid "This server does not support LDAPv3 schema information."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:352
-msgid "Other Fax"
-msgstr "Ôte facs"
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+msgid "Could not get schema information for LDAP server."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/widgets/e-addressbook-view.c:353
-msgid "Pager"
-msgstr "Pådjeu"
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+msgid "LDAP server did not respond with valid schema information."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:354
-msgid "Radio"
-msgstr "Radio"
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+msgid "Could not remove addressbook."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
-#: addressbook/gui/widgets/e-addressbook-view.c:355
-msgid "Telex"
-msgstr "Telex"
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:356
-msgid "TTY"
-msgstr "TTY"
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
-#: addressbook/gui/widgets/e-addressbook-view.c:358
-msgid "Email 2"
-msgstr "Emile 2"
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1760
-#: addressbook/gui/widgets/e-addressbook-view.c:359
-msgid "Email 3"
-msgstr "Emile 3"
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+msgid "Unable to open addressbook"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:360
-msgid "Web Site"
-msgstr "Waibe"
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+msgid "Error loading addressbook."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-msgid "Url"
-msgstr "Hårdêye"
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+msgid "Unable to perform search."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:361
-msgid "Department"
-msgstr "Dépårtumint"
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+msgid "Would you like to save your changes?"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-msgid "Dep"
-msgstr "Dép.."
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:362
-msgid "Office"
-msgstr "Buro"
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+#, fuzzy
+msgid "_Discard"
+msgstr "_Håynaedje"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-msgid "Off"
-msgstr "Buro"
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+msgid "Cannot move contact."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:363
-msgid "Title"
-msgstr "Tite"
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:364
-msgid "Profession"
-msgstr "Mestî"
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+msgid "Unable to save contact(s)."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:92
-msgid "Prof"
-msgstr "Mestî"
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+msgid "Error saving contacts to {0}: {1}"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:365
-msgid "Manager"
-msgstr "Manaedjeu"
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-msgid "Man"
-msgstr "Man."
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-msgid "Ass"
+#: addressbook/conduit/address-conduit.c:275
+msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:367
-msgid "Nickname"
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
+msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-msgid "Nick"
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:368
-msgid "Spouse"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:369
-msgid "Note"
-msgstr "Rawete"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Otomatike"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Hårdêye do calindrî"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Connecticut"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "CALUri"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:370
-msgid "Free-busy URL"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
-msgid "FBUrl"
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniversary"
-msgstr "Aniversaire"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Calpin d' adresses"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Anniv"
-msgstr "Aniv."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Birth Date"
-msgstr "Date di naixhance"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:104
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Categoreyes"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:105
-msgid "Family Name"
-msgstr "No d' famile"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:792
-#, c-format
-msgid "%x"
-msgstr "%x"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2677
-msgid "Multiple VCards"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:2685
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard da %s"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1727
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
-msgid "Could not initialize Bonobo"
-msgstr "Dji n' sai inicyî Bonobo"
+#: addressbook/gui/component/addressbook-component.c:93
+msgid "New Contact"
+msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:261
-#: addressbook/backend/pas/pas-backend-ldap.c:2364
-msgid "Searching..."
-msgstr "Dji cwir..."
+#: addressbook/gui/component/addressbook-component.c:94
+msgid "_Contact"
+msgstr ""
 
-#: addressbook/backend/pas/pas-backend-file.c:263
-msgid "Loading..."
-msgstr "Dji tchedje..."
+#: addressbook/gui/component/addressbook-component.c:95
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Fé on novea radjoû"
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:272
-msgid "Error in search expression."
+#: addressbook/gui/component/addressbook-component.c:101
+msgid "New Contact List"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:516
-msgid "Connecting to LDAP server..."
+#: addressbook/gui/component/addressbook-component.c:102
+msgid "Contact _List"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:526
-msgid "Unable to connect to LDAP server."
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:103
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Fé on novea radjoû"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:542
-msgid "Waiting for connection to LDAP server..."
+#: addressbook/gui/component/addressbook-component.c:109
+msgid "New Contacts Group"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:963
-msgid "Adding card to LDAP server..."
+#: addressbook/gui/component/addressbook-component.c:110
+msgid "Contacts Grou_p"
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
-msgid "Removing card from LDAP server..."
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:111
+#, fuzzy
+msgid "Create a new contacts group"
+msgstr "Fé on novea radjoû"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1174
-msgid "Modifying card from LDAP server..."
+#: addressbook/gui/component/addressbook-component.c:184
+msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2281
-msgid "Receiving LDAP search results..."
-msgstr ""
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+#, fuzzy
+msgid "Migrating..."
+msgstr "Dji tchedje..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2287
-msgid "Restarting search."
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#, c-format
+msgid "Migrating `%s':"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:293
-msgid "Default Sync Address:"
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:489
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+msgid "On This Computer"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:536
-msgid "Cursor could not be loaded\n"
+#. Create the default Person addressbook
+#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
+msgid "Personal"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:549
-msgid "EBook not loaded\n"
-msgstr ""
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:505
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "Sierveu LDAP"
 
-#: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1203
-#: calendar/conduits/todo/todo-conduit.c:889
-msgid "Could not start wombat server"
-msgstr ""
+#: addressbook/gui/component/addressbook-migrate.c:633
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "Sierveu LDAP"
 
-#: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1204
-#: calendar/conduits/todo/todo-conduit.c:890
-msgid "Could not start wombat"
+#: addressbook/gui/component/addressbook-migrate.c:753
+msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1385
-#: addressbook/conduit/address-conduit.c:1388
-msgid "Could not read pilot's Address application block"
+#: addressbook/gui/component/addressbook-migrate.c:1129
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
+#: addressbook/gui/component/addressbook-migrate.c:1143
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
+#: addressbook/gui/component/addressbook-migrate.c:1152
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-#: notes/GNOME_Evolution_Notes.oaf.in.h:1
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/component/addressbook-migrate.c:1162
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/component/addressbook-view.c:633
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-msgid "Evolution Addressbook minicard viewer"
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:714
+#, fuzzy
+msgid "New Address Book"
+msgstr "Calpin d' adresses"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Disfacer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
-msgid "Factory for the Addressbook Minicard control"
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:716
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+msgid "Properties..."
+msgstr "Prôpietés..."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the sample Addressbook control"
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366 shell/e-local-storage.c:172
-#: shell/e-shortcuts.c:1061
-msgid "Contacts"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:71
-msgid "Folder containing contact information"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "Position of the vertical pane in main view"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP Server"
-msgstr "Sierveu LDAP"
-
-#: addressbook/gui/component/addressbook-component.c:73
-msgid "LDAP server containing contact information"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:558
-msgid "New Contact"
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:558
-#: ui/evolution-addressbook.xml.h:34
-msgid "_Contact"
+#: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/im.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.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
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:561
-msgid "New Contact List"
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:561
-msgid "Contact _List"
+#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:225
-msgid "Edit Addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:1
-msgid "100"
+#: addressbook/gui/component/ldap-config.glade.h:5
+msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "389"
+#: addressbook/gui/component/ldap-config.glade.h:6
+msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:3
-msgid "A_uthenticate with server using:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "Otintifiaedje"
 
-#: addressbook/gui/component/addressbook-config.glade.h:4
-msgid "Account Name"
+#: addressbook/gui/component/ldap-config.glade.h:8
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "Håynaedje"
+
+#: addressbook/gui/component/ldap-config.glade.h:9
+msgid "<b>Downloading</b>"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Add Addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:10
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "Dji cwir"
+
+#: addressbook/gui/component/ldap-config.glade.h:11
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Informåcion"
+
+#: addressbook/gui/component/ldap-config.glade.h:12
+msgid "<b>Type:</b>"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "Addressbook Sources"
+#: addressbook/gui/component/ldap-config.glade.h:13
+msgid "Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:7
-msgid "Advanced"
-msgstr "Sipepieus"
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "Address Book Properties"
+msgstr "Prôpietés"
 
-#: addressbook/gui/component/addressbook-config.glade.h:8
-msgid "Base"
-msgstr "Båze"
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "Always"
+msgstr "Alaska"
 
-#: addressbook/gui/component/addressbook-config.glade.h:9
-#: calendar/gui/dialogs/task-editor.c:178
+#: addressbook/gui/component/ldap-config.glade.h:16
+#, fuzzy
+msgid "Anonymously"
+msgstr "Anonime"
+
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Basic"
 msgstr "Di båze"
 
-#: addressbook/gui/component/addressbook-config.glade.h:10
-msgid "Check this if the server requires you to authenticate."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Detays"
 
-#: addressbook/gui/component/addressbook-config.glade.h:11
-msgid "De_lete"
+#: addressbook/gui/component/ldap-config.glade.h:19
+msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:12
-msgid "Distinguished name (DN)"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:20
+#, fuzzy
+msgid "Download limit:"
+msgstr "Limite d' _aberwetaedje"
 
-#: addressbook/gui/component/addressbook-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this Distinquished Name (DN) to authenticate you with the "
-"server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:15
-msgid ""
-"Evolution will use this email address to authenticate you with the server"
+#: addressbook/gui/component/ldap-config.glade.h:23
+msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:16
-msgid "One"
-msgstr "Onk"
+#: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
+msgid "General"
+msgstr "Djenerå"
 
-#: addressbook/gui/component/addressbook-config.glade.h:17
-msgid "Search _base:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
+#, fuzzy
+msgid "Never"
+msgstr "tofer"
 
-#: addressbook/gui/component/addressbook-config.glade.h:18
-msgid "Search s_cope: "
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:19
-msgid "Server Name"
-msgstr "No do sierveu"
-
-#: addressbook/gui/component/addressbook-config.glade.h:20
-msgid "Sub"
+#: addressbook/gui/component/ldap-config.glade.h:27
+msgid "Search _base:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:21
-msgid "The information below is required in order to add an addressbook.  "
+#: addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:22
-msgid "This information is not required for most ldap servers. "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Search base:"
+msgstr "Cweri"
 
-#: addressbook/gui/component/addressbook-config.glade.h:23
-msgid ""
-"This information is used by your ldap server to specify which nodes are used "
-"in a search. Contact your server administrator for more information."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search scope:"
+msgstr "Cweri"
 
-#: addressbook/gui/component/addressbook-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
-"This is the base node for all your searches on the ldap server. Contact your "
-"server administrator for more information."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
-"This is the maximum number of cards to download.  Setting this number too "
-"large will slow down this addressbook."
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:33
 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."
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:27
-msgid "This is the name of the server where your addressbook is located."
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:28
-msgid "This is the port that your ldap server uses."
+#: addressbook/gui/component/ldap-config.glade.h:35
+msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"This name will be used to identify your account. It is for display purposes "
-"only."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.glade.h:30
-msgid "_Account name:"
-msgstr "No do _conte:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:31
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:100
-msgid "_Add"
-msgstr "_Radjouter"
-
-#: addressbook/gui/component/addressbook-config.glade.h:32
-msgid "_Distinguished Name:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:33
-msgid "_Download Limit"
-msgstr "Limite d' _aberwetaedje"
-
-#: addressbook/gui/component/addressbook-config.glade.h:34
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:109
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:39
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
-msgid "_Edit"
-msgstr "_Candjî"
-
-#: addressbook/gui/component/addressbook-config.glade.h:35
-#: mail/mail-config.glade.h:110
-msgid "_Email address:"
-msgstr "Adresse _emile:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:36
-msgid "_Port:"
-msgstr "_Pôrt:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:37
-msgid "_Server name:"
-msgstr "No do _sierveu:"
-
-#: addressbook/gui/component/addressbook-factory.c:70
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:134
-msgid "Could not initialize gnome-vfs"
+#: addressbook/gui/component/ldap-config.glade.h:37
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "Unable to open addressbook"
+#: addressbook/gui/component/ldap-config.glade.h:39
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+"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/addressbook.c:539
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:655
-#: addressbook/gui/component/addressbook.c:658
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "Timeout:"
+msgstr "Cogne di l' eure:"
 
-#: addressbook/gui/component/addressbook.c:836
-#: calendar/gui/cal-search-bar.c:55
-msgid "Any field contains"
+#: addressbook/gui/component/ldap-config.glade.h:44
+msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:837
-msgid "Name contains"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:45
+#, fuzzy
+msgid "Using email address"
+msgstr "Adresse _emile:"
 
-#: addressbook/gui/component/addressbook.c:838
-msgid "Email contains"
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
+msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:839
-#: calendar/gui/cal-search-bar.c:59
-msgid "Category is"
+#: addressbook/gui/component/ldap-config.glade.h:47
+msgid "_Add Contacts Group"
 msgstr ""
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:840 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
-msgid "Advanced..."
-msgstr "Po les spepieus..."
+#: addressbook/gui/component/ldap-config.glade.h:48
+#, fuzzy
+msgid "_Download limit:"
+msgstr "Limite d' _aberwetaedje"
 
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1082
-#: calendar/gui/cal-search-bar.c:412
-msgid "Any Category"
-msgstr "Tot l' minme kéne categoreye"
+#: addressbook/gui/component/ldap-config.glade.h:49
+msgid "_Email address:"
+msgstr "Adresse _emile:"
 
-#: addressbook/gui/component/addressbook.c:1167
-msgid "The URI that the Folder Browser will display"
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
 msgstr ""
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-msgid "(none)"
-msgstr "(nouk)"
-
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
-msgid "Primary Email"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:587
-msgid "Select an Action"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
 
-#: addressbook/gui/component/e-address-popup.c:593
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
+msgstr "_No:"
 
-#: addressbook/gui/component/e-address-popup.c:605
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
+msgstr "_Pôrt:"
 
-#: addressbook/gui/component/e-address-popup.c:891
-msgid "Querying Addressbook..."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Cweri"
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
-msgid "Edit Contact Info"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:56
+#, fuzzy
+msgid "_Server:"
+msgstr "No do _sierveu:"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
-msgid "Add to Contacts"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Cogne di l' eure:"
 
-#: addressbook/gui/component/e-address-popup.c:1046
-msgid "Merge E-Mail Address"
+#: addressbook/gui/component/ldap-config.glade.h:58
+msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Disable Queries"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:59
+#, fuzzy
+msgid "cards"
+msgstr "Barbades"
 
-#: addressbook/gui/component/e-address-widget.c:364
-msgid "Enable Queries (Dangerous!)"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
+#: mail/mail-config.glade.h:183
+msgid "minutes"
+msgstr "munutes"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Oister ttafwait"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:849
-#: composer/e-msg-composer-attachment-bar.c:505 filter/filter-filter.c:437
-#: filter/filter-rule.c:638 shell/e-shortcuts-view.c:180
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Oister"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
-msgid "Remove All"
-msgstr "Oister ttafwait"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
-msgid "Send HTML Mail?"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
+msgid "View Contact List"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
+msgid "View Contact Info"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
-msgid "Unnamed Contact List"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
+msgid "Send HTML Mail?"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
-#, c-format
-msgid "(%d not shown)"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
+#: addressbook/gui/widgets/eab-popup-control.c:982
+msgid "Add to Contacts"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:600
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"This may have been caused by the evolution-addressbook component crashing.\n"
-"To help us better understand and ultimately resolve this problem,\n"
-"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-"detailed description of the circumstances under which this error\n"
-"occurred.  Thank you."
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:608
-msgid ""
-"Evolution is unable to get the addressbook local storage.\n"
-"Under normal circumstances, this should never happen.\n"
-"You may need to exit and restart Evolution in order to\n"
-"correct this problem."
-msgstr ""
+#: 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 "No"
 
-#: addressbook/gui/component/select-names/e-select-names.c:690
-msgid "Select Contacts from Addressbook"
-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
+#: addressbook/gui/widgets/e-addressbook-view.c:228
+msgid "Source"
+msgstr "Sourdant"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "C_ontaining:"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "F_ind"
-msgstr "_Trover"
+msgid "<b>Contacts</b>"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
+msgid "<b>Show Contacts</b>"
 msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Show contacts matching the following criteria:"
-msgstr ""
+#, fuzzy
+msgid "Address _Book:"
+msgstr "Adresse _2:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "_Category:"
+#, fuzzy
+msgid "C_ategory:"
 msgstr "_Categoreye:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "_Folder:"
-msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Find"
+msgstr "_Trover"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "A_ssistant's name:"
-msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Cweri"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "Add_ress..."
-msgstr "_Adresse..."
+msgid "<b>Email</b>"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "Anni_versary:"
+msgid "<b>Home</b>"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "Birthda_y:"
+msgid "<b>Instant Messaging</b>"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "<b>Job</b>"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Miscellaneous</b>"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
+msgid "<b>Other</b>"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "_Categoreyes..."
+msgid "<b>Telephone</b>"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "Collaboration"
+msgid "<b>Web Addresses</b>"
 msgstr ""
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1365
-msgid "Contact Editor"
+msgid "<b>Work</b>"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-msgid "D_epartment:"
-msgstr "_Dépårtumint:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "AIM"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:183
-msgid "Details"
-msgstr "Detays"
+#, fuzzy
+msgid "Address:"
+msgstr "_Adresse:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "F_ree/Busy URL:"
-msgstr ""
+#, fuzzy
+msgid "Anniversary:"
+msgstr "Aniversaire"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "File A_s:"
+msgid "Assistant:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:15
-msgid "Full _Name..."
-msgstr "_No en etir..."
+#, fuzzy
+msgid "Birthday:"
+msgstr "Date di naixhance"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid "General"
-msgstr "Djenerå"
+#, fuzzy
+msgid "Calendar:"
+msgstr "Calindrî"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#, fuzzy
+msgid "City:"
+msgstr "_Veye:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
+#, fuzzy
+msgid "Company:"
+msgstr "Eterprijhe"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
+#, fuzzy
+msgid "Contact"
+msgstr "Connecticut"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
+msgid "Contact Editor"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "New phone type"
-msgstr ""
+#, fuzzy
+msgid "Country:"
+msgstr "Pa_yis:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "No_tes:"
-msgstr ""
+#, fuzzy
+msgid "Department:"
+msgstr "_Dépårtumint:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "Organi_zation:"
+msgid "Free/Busy:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "P_rofession:"
-msgstr ""
+msgid "Full _Name..."
+msgstr "_No en etir..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr ""
+#, fuzzy
+msgid "Home Page:"
+msgstr "Telefone al måjhon"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#, fuzzy
+msgid "MSN Messenger"
+msgstr "Messaedje shuvant"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "S_pouse:"
-msgstr ""
+#, fuzzy
+msgid "Mailing Address"
+msgstr "Adresse _emile:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "This is the _mailing address"
-msgstr ""
+#, fuzzy
+msgid "Manager:"
+msgstr "Manaedjeu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "Wants to receive _HTML mail"
-msgstr ""
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "No:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#, fuzzy
+msgid "Notes:"
+msgstr "Rawete"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:707 filter/filter.glade.h:8
-#: mail/folder-browser.c:1492 mail/mail-config.glade.h:107
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:17 ui/evolution.xml.h:35
-msgid "_Delete"
-msgstr "_Disfacer"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Job title:"
-msgstr ""
+#, fuzzy
+msgid "Office:"
+msgstr "Buro"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Manager's Name:"
-msgstr ""
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Boesse poståle:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Nickname:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#, fuzzy
+msgid "Personal Information"
+msgstr "Informåcions sol conte"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "Profession:"
+msgstr "Mestî"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Sourdant"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#, fuzzy
+msgid "State/Province:"
+msgstr "_Estat/Province:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tite:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Office:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+msgid "Wants to receive HTML mail"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_Public Calendar URL:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "Web Log:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Web page address:"
+#. red
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
+msgid "Work"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:128
-#: my-evolution/Locations.h:2343
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr "_Côde postå:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "Categoreyes"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "No do fitchî:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#, fuzzy
+msgid "_Where:"
+msgstr "_Meteyo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
+#, fuzzy
+msgid "Address"
+msgstr "_Adresse:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: addressbook/gui/widgets/e-addressbook-model.c:309
+#: 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:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
+#, fuzzy
+msgid "Editable"
+msgstr "Mete en alaedje"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "Etats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:129
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:42
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Albaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
-#: my-evolution/Locations.h:54
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Aldjereye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Samowa amerikinne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Andore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Anguila"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Antartike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Antigwa eyet Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
-#: my-evolution/Locations.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Årdjintene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Årmeneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
-#: my-evolution/Locations.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Ôstraleye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
-#: my-evolution/Locations.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Ôtriche"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Azerbaydjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
-#: my-evolution/Locations.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
-#: my-evolution/Locations.h:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Bahreyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Barbades"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Belarus"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
-#: my-evolution/Locations.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Beldjike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
-#: my-evolution/Locations.h:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Bermude"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Boutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
-#: my-evolution/Locations.h:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Boliveye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Bosneye eyet Herzegovine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Iye Bouvet"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
-#: my-evolution/Locations.h:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Braezi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Teritweres britanikes di l' Oceyan Indyin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Bruney"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
-#: my-evolution/Locations.h:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "Bulgåreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Bourkina Fasso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Bouroundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Cambodje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Camrone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
-#: my-evolution/Locations.h:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Cap Vert"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
-#: my-evolution/Locations.h:389
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Iyes Cayman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Cintrafrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Tchad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
-#: my-evolution/Locations.h:438
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Tchili"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Chine"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
-#: my-evolution/Locations.h:451
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Iye Christmas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Iyes Cocos (Keeling)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
-#: my-evolution/Locations.h:483
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Colombeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Comores"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Congo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#, fuzzy
+msgid "Congo, The Democratic Republic Of The"
+msgstr "Corêye (bijhrece)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Iyes Cook"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
-#: my-evolution/Locations.h:517
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Coisse d' Ivwere"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: my-evolution/Locations.h:528
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Crowåceye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
-#: my-evolution/Locations.h:532
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Cuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
-#: my-evolution/Locations.h:545
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Chipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
-#: my-evolution/Locations.h:546
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Tchekeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
-#: my-evolution/Locations.h:580
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Daenmåtche"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Dominike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
-#: my-evolution/Locations.h:608
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Republike Dominikinne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "East Timor"
-msgstr "Timor Esse"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
-#: my-evolution/Locations.h:641
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 msgid "Ecuador"
 msgstr "Ecwåteur"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
-#: my-evolution/Locations.h:650
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 msgid "Egypt"
 msgstr "Edjipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
-#: my-evolution/Locations.h:666
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
 msgid "Equatorial Guinea"
 msgstr "Guineye Ecwåtoriåle"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
-#: my-evolution/Locations.h:684
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Estonia"
 msgstr "Estoneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Falkland Islands"
 msgstr "Iyes Malouwines"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Faroe Islands"
 msgstr "Iyes Faeroyé"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fidji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:201
-#: my-evolution/Locations.h:716
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Finland"
 msgstr "Finlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
-#: my-evolution/Locations.h:766
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "France"
 msgstr "France"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
 msgid "French Guiana"
 msgstr "Guyane francesse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
 msgid "French Polynesia"
 msgstr "Polineseye francesse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Southern Territories"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
-#: my-evolution/Locations.h:811
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Georgia"
 msgstr "Djeordjeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
-#: my-evolution/Locations.h:812
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Germany"
 msgstr "Almagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Gana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
-#: my-evolution/Locations.h:815
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Gibraltar"
 msgstr "Djibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
-#: my-evolution/Locations.h:846
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Greece"
 msgstr "Grece"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Groenlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenade"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Gwadeloupe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Gwam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
-#: my-evolution/Locations.h:867
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 msgid "Guatemala"
 msgstr "Gwatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guernsey"
+msgstr "Guernsey"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Guineye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Guyane"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
-#: my-evolution/Locations.h:888
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Hayti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
-#: my-evolution/Locations.h:945
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
-#: my-evolution/Locations.h:946
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
-#: my-evolution/Locations.h:966
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Hongreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
-#: my-evolution/Locations.h:978
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Izlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#: my-evolution/Locations.h:991
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Inde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Indoneseye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
-#: my-evolution/Locations.h:1007
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
+msgid "Iran"
+msgstr "Oran"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Iraq"
+msgstr "Israyel"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Irlande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Israyel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
-#: my-evolution/Locations.h:1016
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Itåleye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
-#: my-evolution/Locations.h:1031
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Djamayike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
-#: my-evolution/Locations.h:1035
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Djapon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
-#: my-evolution/Locations.h:1046
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Jersey"
+msgstr "Djersey"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Djordaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Kazaxhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Korea, Democratic People's Republic Of"
+msgstr "Corêye (bijhrece)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Coreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
-#: my-evolution/Locations.h:1146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Kuweyt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Kirguizstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Lawos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
-#: my-evolution/Locations.h:1190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Letoneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
-#: my-evolution/Locations.h:1198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Liban"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Lessoto"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
-#: my-evolution/Locations.h:1218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Libya"
+msgstr "Libeye"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Lîchtensteyn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
-#: my-evolution/Locations.h:1234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Litwaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
-#: my-evolution/Locations.h:1268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Lucsimbork"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Macao"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Macedoneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Malaiseye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Maldives"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-#: my-evolution/Locations.h:1297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Male"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Iyes Marshall"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Martinike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Moritanreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Iye Môrice"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Mayote"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
-#: my-evolution/Locations.h:1387
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Mecsike"
 
 #
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Micronezeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Mongoleye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
-#: my-evolution/Locations.h:1470
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Marok"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Mozambike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Birmaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Namibeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Nawouro"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
-#: my-evolution/Locations.h:1531
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Olande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Antiyes neyerlandesses"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Nouve Caledonreye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
-#: my-evolution/Locations.h:1560
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Nouve Zelande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
-#: my-evolution/Locations.h:1562
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Nicaragwa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Nidjer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Nidjeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Niuwé"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
-#: my-evolution/Locations.h:1574
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Iye Norfolk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Iyes Marianes bijhreces"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1587
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Norvedje"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1632
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1673
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Pakistan"
 
 #
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Palawou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1683
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Papouwazeye Nouve Guinêye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1688
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Paragway"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1723
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Perou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Filipenes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
-#: my-evolution/Locations.h:1764
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Pologne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1791
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1824
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Porto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1836
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Katar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Reyunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1912
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Roumaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "Russeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Samowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "Sint Marin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
-#: my-evolution/Locations.h:2035
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Arabeye Sawoudite"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Secheles"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Siera Leyone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
-#: my-evolution/Locations.h:2090
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Singapour"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
-#: my-evolution/Locations.h:2103
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Eslovakeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2104
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Esloveneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Iyes Solomon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Somaleye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
-#: my-evolution/Locations.h:2119
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Nonne Afrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2127
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Espagne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "Sinte Helene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Soudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Suriname"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr ""
 
 #
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Suwazilande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Suwede"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
-#: my-evolution/Locations.h:2183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Swisse"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2205
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "Syria"
+msgstr "Suriname"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Tadjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzaneye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Taylande"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+msgid "Timor-Leste"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Tunizeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
-#: my-evolution/Locations.h:2321
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Turkeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Turcmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Touvalou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Ouganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
-#: my-evolution/Locations.h:2334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Ucrinne"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Emirats Arabes Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Rweyåme Uni"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Iyes mineures des Estats Unis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Ourougway"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Ouzbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Vanouatou"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2380
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Venezwela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
-#: my-evolution/Locations.h:2392
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Iyes Viedjes britanikes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Iyes Viedjes etazunyinnes"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Sara Coûtchantrece"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
-#: my-evolution/Locations.h:2512
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Yemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2524
-msgid "Yugoslavia"
-msgstr "Yugoslaveye"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Zambeye"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Zimbawè"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:823
-msgid "Category editor not available."
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
+msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:830
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Cweri"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Informåcion"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "No d' _uzeu:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
+msgid "Home"
+msgstr "Måjhon"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
+msgid "Other"
+msgstr "Ôte"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Idaho"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Groupe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#, fuzzy
+msgid "Source Book"
+msgstr "Sourdant"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
+msgid "Target Book"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
+msgid "Is New Contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
+msgid "Writable Fields"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
+#, fuzzy
+msgid "Changed"
+msgstr "Tchad"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1044
-msgid "Save Contact as VCard"
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
+msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
+#, fuzzy
+msgid "No image"
+msgstr "Nidjer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2415
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
+msgid ""
+"The contact data is invalid:\n"
+"\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
-msgid "Contact Quick-Add"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Nén valåbe"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:300
-msgid "Edit Full"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:333
-msgid "Full Name"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
+msgid "Contact Quick-Add"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#, fuzzy
+msgid "_Edit Full"
+msgstr "_Candjî"
+
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:166
+#, fuzzy
+msgid "_Full Name:"
 msgstr "No etir"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:332
-msgid "E-mail"
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
+#, fuzzy
+msgid "E-_mail:"
 msgstr "Emile"
 
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:106
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:170
-msgid "list"
-msgstr "djivêye"
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:201
-#, c-format
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
+"Are you sure you want\n"
+"to delete this contact?"
 msgstr ""
-"%s egzisteye dedja\n"
-"El voloz spotchî?"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Check Address"
-msgstr "Verifyî adresse"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "Pa_yis:"
+#, fuzzy
+msgid "Ci_ty:"
+msgstr "_Veye:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "_Address:"
-msgstr "_Adresse:"
+msgid "Countr_y:"
+msgstr "Pa_yis:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_City:"
-msgstr "_Veye:"
+#, fuzzy
+msgid "Full Address"
+msgstr "_Adresse:"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:6
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Boesse poståle:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Estat/Province:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_Côde postå:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Check Full Name"
-msgstr "Verifyî li no etir"
-
 #: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Dr."
@@ -2159,469 +2272,1011 @@ msgid "Esq."
 msgstr ""
 
 #: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Full Name"
+msgstr "No etir"
+
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Mle"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "M."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Mme"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Mme"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Prumî:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Dierin:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mitan:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Betchete:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tite:"
 
+#: addressbook/gui/contact-editor/im.glade.h:2
+#, fuzzy
+msgid "Add IM Account"
+msgstr "Conte"
+
+#: addressbook/gui/contact-editor/im.glade.h:3
+msgid "_Account name:"
+msgstr "No do _conte:"
+
+#: addressbook/gui/contact-editor/im.glade.h:4
+#, fuzzy
+msgid "_IM Service:"
+msgstr "_Estat/Province:"
+
+#: addressbook/gui/contact-editor/im.glade.h:5
+#, fuzzy
+msgid "_Location:"
+msgstr "Seccions:"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "List _name:"
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "Insert email adresses from Adress Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Mimbes"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Type an email address or drag a contact into the list below:"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+msgid "Remove an email address from the List"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Tchoezi totafwait"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-#: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:10
-msgid "_Remove"
-msgstr "_Oister"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
+#, fuzzy
+msgid "_List name:"
+msgstr "No d' _uzeu:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "contact-list-editor"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+msgid "_Type an email address or drag a contact into the list below:"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
 msgstr ""
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:234
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: addressbook/gui/widgets/e-addressbook-model.c:295
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:221
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
+msgid "Book"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+msgid "Is New List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:428
-msgid "Save List as VCard"
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-msgid "Add Anyway"
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+#: 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/e-card-duplicate-detected.glade.h:3
+#: 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 ""
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+#: 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?"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Change Anyway"
+#. FIXME: get the toplevel window...
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
+#: widgets/misc/e-filter-bar.c:156
+msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-msgid "Changed Contact:"
-msgstr ""
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Nouve Sicôsse"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
-msgid "Conflicting Contact:"
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d segondes"
+msgstr[1] "%d segondes"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+#, fuzzy
+msgid "Query"
+msgstr "Guernsey"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
 msgstr ""
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:5
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+#, fuzzy
+msgid "Model"
+msgstr "Bodjî"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
-#: widgets/misc/e-filter-bar.c:238
-msgid "Advanced Search"
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Cweri"
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:136
-msgid "No cards"
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:139
-msgid "1 card"
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:142
-#, c-format
-msgid "%d cards"
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Po les spepieus..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Sôre"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Calpin d' adresses"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Schaper et rlomer..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#, fuzzy
+msgid "New Contact..."
+msgstr "Novea..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:369
-msgid "Error getting book view"
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#, fuzzy
+msgid "Go to Folder..."
+msgstr "Potchî a enute"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+#, fuzzy
+msgid "Import..."
+msgstr "Abaguer"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:145
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:313
-#: addressbook/gui/widgets/e-addressbook-view.c:910
-#: addressbook/gui/widgets/e-addressbook-view.c:1024
-#: addressbook/gui/widgets/e-addressbook-view.c:1646
-#: ui/evolution-addressbook.xml.h:22
-msgid "Save as VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:312
-#: ui/evolution-message-composer.xml.h:13
-msgid "Open"
-msgstr "Drovi"
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#, fuzzy
+msgid "Pilot Settings..."
+msgstr "Apontiaedjes"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:314
-#: addressbook/gui/widgets/e-addressbook-view.c:1025
-#: ui/evolution-addressbook.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:315
-#: addressbook/gui/widgets/e-addressbook-view.c:1026
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:316
-#: addressbook/gui/widgets/e-addressbook-view.c:1027
-#: ui/evolution-addressbook.xml.h:19 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
-#: ui/my-evolution.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimer"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:318
-#: addressbook/gui/widgets/e-addressbook-view.c:1029
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:322
-#: addressbook/gui/widgets/e-addressbook-view.c:1033
-msgid "Copy to folder..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:323
-#: addressbook/gui/widgets/e-addressbook-view.c:1034
-msgid "Move to folder..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:1037
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-tasks.xml.h:7
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Côper"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:327
-#: addressbook/gui/widgets/e-addressbook-view.c:1038
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:7
-#: ui/evolution-tasks.xml.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copyî"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:328
-#: addressbook/gui/widgets/e-addressbook-view.c:1039
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-tasks.xml.h:12
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Claper"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:329
-#: addressbook/gui/widgets/e-addressbook-view.c:1040 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:295 ui/evolution-addressbook.xml.h:10
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:19
-msgid "Delete"
-msgstr "Disfacer"
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+#, fuzzy
+msgid "Current View"
+msgstr "Håyner a vosse môde"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:140
-#: addressbook/gui/widgets/e-addressbook-util.c:87
-#: addressbook/gui/widgets/e-minicard.c:475
-msgid "Error modifying card"
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Tot l' minme kéne categoreye"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Facs å buro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Telefone å buro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr ""
+
+#: 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:3
+msgid "Categories"
+msgstr "Categoreyes"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Emile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Emile 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Emile 3"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "No d' famile"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#, fuzzy
+msgid "Given Name"
+msgstr "Vietnam"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Facs al måjhon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Telefone al måjhon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefone al måjhon"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Djordaneye"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Manaedjeu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefone axhlåve"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Rawete"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Buro"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Organizåcion"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Ôte facs"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Pådjeu"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: 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:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Tite"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Sins tite"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Waibe"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+#, fuzzy
+msgid "Width"
+msgstr "Lårdjeu:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+#, fuzzy
+msgid "Height"
+msgstr "Hôteu:"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+#, fuzzy
+msgid "Field"
+msgstr "Finlande"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+#, fuzzy
+msgid "Field Name"
+msgstr "No d' famile"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1020
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+#, fuzzy
+msgid "Adapter"
+msgstr "Papî"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Disfacé"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "Mimbes"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Emile"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "Mestî"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "Fwait"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#, fuzzy
+msgid "Fax"
+msgstr "Facs å buro"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "Noû York"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "Tite"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "Facs al måjhon"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Succès"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:275
-#: camel/providers/imap/camel-imap-command.c:363 shell/e-shell.c:1941
-#: shell/e-storage.c:528 shell/evolution-shell-component.c:1057
-msgid "Unknown error"
-msgstr "Aroke nén cnoxhowe"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:516
-#: shell/evolution-shell-component.c:1048
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Address Book does not exist"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "No Self Contact defined"
+msgstr ""
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
-msgid "Card not found"
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-msgid "Card ID already exists"
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:763 calendar/gui/calendar-model.c:1197
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:482 calendar/gui/print.c:2255
-#: camel/camel-service.c:610 camel/camel-service.c:646
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Otintifiaedje"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Otintifiaedje"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:59
-#: calendar/gui/dialogs/save-comp.c:50
-msgid "Do you want to save changes?"
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-util.c:288
-msgid "Error adding card"
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:87
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-msgid "Error removing list"
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:246
-#: addressbook/gui/widgets/e-addressbook-view.c:1444
-msgid "Error removing card"
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:204
-msgid "Display Cards?"
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:205
-msgid "Display Cards"
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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/e-addressbook-util.c:209
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
-"You have requested that %d cards be cards. This will cause %d new windows to "
-"be\n"
-"displayed on your screen. Do you really want to display all of these cards?"
+"%s already exists\n"
+"Do you want to overwrite it?"
 msgstr ""
+"%s egzisteye dedja\n"
+"El voloz spotchî?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:342
-msgid "Move card to"
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:344
-msgid "Copy card to"
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "djivêye"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:347
-msgid "Move cards to"
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:349
-msgid "Copy cards to"
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:331
-msgid "* Click here to add a contact *"
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:335
-msgid "Primary Phone"
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:336
-msgid "Assistant Phone"
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:337
-msgid "Business Phone"
-msgstr "Telefone å buro"
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard da %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
-msgid "Callback Phone"
-msgstr ""
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(nouk)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
-msgid "Company Phone"
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
-msgid "Home Phone"
-msgstr "Telefone al måjhon"
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
-msgid "Business Address"
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
-msgid "Home Address"
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:344
-msgid "Mobile Phone"
-msgstr "Telefone axhlåve"
+#: addressbook/gui/widgets/eab-popup-control.c:869
+msgid "Querying Address Book..."
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
-msgid "Car Phone"
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
-msgid "Business Phone 2"
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:349
-msgid "Home Phone 2"
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "Såvlon dins l' vijhnaedje"
+msgstr[1] "Såvlon dins l' vijhnaedje"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Mostrer tot"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
-msgid "Other Phone"
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:357
-msgid "Other Address"
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
+msgid "Card View"
 msgstr ""
 
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:580
-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"
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+#, fuzzy
+msgid "GTK Tree View"
+msgstr "Vey samwinne"
+
+#: addressbook/gui/widgets/test-reflow.c:106
+msgid "Reflow Test"
 msgstr ""
 
-#. 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:585
-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"
+#: 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/e-minicard-control.c:185
-#, c-format
-msgid "and %d other cards."
+#: addressbook/gui/widgets/test-reflow.c:109
+msgid "This should test the reflow canvas item"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
-msgid "and one other card."
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
-msgid "Save in addressbook"
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:158
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:161
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
 msgstr ""
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
-msgid "Card View"
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
 msgid "Print envelope"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1115
-msgid "Print cards"
+#: addressbook/printing/e-contact-print.c:1000
+msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
-msgid "Print card"
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
+msgid "Print contact"
 msgstr ""
 
 #: addressbook/printing/e-contact-print.glade.h:1
@@ -2721,7 +3376,6 @@ msgid "Orientation"
 msgstr "Plaeçmint"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1672
 msgid "Page"
 msgstr "Pådje"
 
@@ -2793,636 +3447,1032 @@ msgstr "Lårdjeu:"
 msgid "_Font..."
 msgstr "_Fonte..."
 
-#: calendar/cal-util/cal-component.c:1207
-msgid "Untitled appointment"
+#: addressbook/printing/test-contact-print-style-editor.c:53
+msgid "Contact Print Style Editor Test"
 msgstr ""
 
-#: calendar/cal-util/cal-util.c:498 calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:406 mail/message-list.c:653
-msgid "High"
-msgstr "Hôte"
+#: addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
-#: calendar/gui/calendar-model.c:1711
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:407 mail/message-list.c:652
-msgid "Normal"
-msgstr "Normåle"
+#: addressbook/printing/test-print.c:52
+msgid "Contact Print Test"
+msgstr ""
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:408 mail/message-list.c:651
-msgid "Low"
-msgstr "Basse"
+#: addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
 
-#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:518
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:409
-msgid "Undefined"
-msgstr "Nén defineye"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Drovi on fitchî"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1150
-#: calendar/conduits/todo/todo-conduit.c:835
-msgid "Error while communicating with calendar server"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/calendar/calendar-conduit.c:1300
-msgid "Could not read pilot's Calendar application block"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:206
-msgid "Default Priority:"
-msgstr "Prumiristé prémetowe:"
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
-msgid "Could not read pilot's ToDo application block"
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A Bonobo control which displays a task list."
+#: addressbook/tools/evolution-addressbook-export.c:58
+msgid "List local addressbook folders"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-msgid "A sample Bonobo control which displays an calendar."
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-msgid "Evolution calendar executive summary component."
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "[vcard|csv]"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution calendar iTip/iMip viewer"
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-msgid "Evolution component for handling the calendar."
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Calendar Summary component."
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-msgid "Factory for the Evolution Tasks control"
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the calendar iTip view control"
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the sample Calendar control"
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory to centralize calendar component editor dialogs"
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
-msgid "Factory to create a component editor factory"
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Divintrinne aroke"
+
+#: addressbook/tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
+#: addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Fitchî d' intrêye"
+
+#: addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
 msgstr ""
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-msgid "Factory for the alarm notification service"
+#: addressbook/util/e-destination.c:577
+msgid "Unnamed List"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
-msgid "Starting:"
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
-msgid "Ending:"
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
-msgid "invalid time"
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+msgid "Don't Send"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
-msgid "Evolution Alarm"
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+msgid "Send Notice"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
-#, c-format
-msgid "Alarm on %s"
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+msgid "Are you sure you want to delete this meeting?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+msgid "Are you sure you want to delete this task?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:675
-msgid "No description available."
-msgstr "Nou discrijhaedje"
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:735
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
 msgid ""
-"Evolution does not support calendar reminders with\n"
-"email notifications yet, but this reminder was\n"
-"configured to send an email.  Evolution will display\n"
-"a normal reminder dialog box instead."
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:753
-#: calendar/gui/tasks-control.c:419 mail/mail-callbacks.c:2573
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Adviertixhmint"
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+msgid "Are you sure you want to delete this journal entry?"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:758
-#, c-format
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
+"All information on this journal entry will be deleted and can not be "
+"restored."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:772
-msgid "Do not ask me about this program again."
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:166 calendar/gui/main.c:57
-msgid "Could not initialize GNOME"
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:181
-msgid "Could not create the alarm notify service"
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+msgid "Are you sure you want to delete this appointment?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:186
-msgid "Could not create the alarm notify service factory"
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+msgid "Are you sure you want to delete the '{0}' task?"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-msgid "Summary contains"
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:57
-msgid "Description contains"
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:58
-msgid "Comment contains"
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+msgid "Are you sure you want to delete these {0} appointments?"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1117
-msgid "Unmatched"
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:457
-msgid "%A %d %B %Y"
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+msgid "Are you sure you want to delete these {0} tasks?"
 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:460 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1403 calendar/gui/e-week-view-main-item.c:333
-msgid "%a %d %b"
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:469
-msgid "%a %d %b %Y"
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:480 calendar/gui/calendar-commands.c:487
-#: calendar/gui/calendar-commands.c:493 calendar/gui/calendar-commands.c:495
-msgid "%d %B %Y"
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
 msgstr ""
 
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:485
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1445
-msgid "%d %B"
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Radjoû"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+msgid "Would you like to save your changes to this appointment?"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:834
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+msgid "You have made changes to this appointment, but not yet saved them."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:418 calendar/gui/calendar-model.c:988
-#: calendar/gui/e-calendar-table.c:385
-msgid "Private"
-msgstr "Privé"
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:421 calendar/gui/calendar-model.c:990
-#: calendar/gui/e-calendar-table.c:386
-msgid "Confidential"
-msgstr "Catchimint"
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Schaper et rlomer..."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/e-calendar-table.c:384
-msgid "Public"
-msgstr "Publike"
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:536
-msgid "N"
-msgstr "N"
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:536
-msgid "S"
-msgstr "S"
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Evoyî"
 
-#: calendar/gui/calendar-model.c:538
-msgid "E"
-msgstr "E"
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:538
-msgid "W"
-msgstr "O"
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
-#: calendar/gui/e-calendar-table.c:458
-msgid "Free"
-msgstr "Libe"
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:459
-#: calendar/gui/e-meeting-time-sel.c:435
-#: shell/evolution-shell-component.c:1042
-msgid "Busy"
-msgstr "Ocupé"
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:754 calendar/gui/calendar-model.c:1191
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/print.c:2246
-msgid "Not Started"
-msgstr "Nén co enondé"
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:757 calendar/gui/calendar-model.c:1193
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:480 calendar/gui/print.c:2249
-msgid "In Progress"
-msgstr "En alaedje"
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:760 calendar/gui/calendar-model.c:1195
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:481 calendar/gui/e-meeting-model.c:326
-#: calendar/gui/e-meeting-model.c:349 calendar/gui/print.c:2252
-msgid "Completed"
-msgstr "Tot fwait"
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1052
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
 msgstr ""
 
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:312
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1512
-#: mail/mail-accounts.c:148 mail/mail-accounts.c:404
-#: mail/mail-config.glade.h:56
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:202
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
-msgid "None"
-msgstr "Nouk"
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1713
-msgid "Recurring"
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1715
-msgid "Assigned"
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
+#, fuzzy
+msgid "Enter password"
+msgstr "Tapez li scret"
+
+#: calendar/conduits/calendar/calendar-conduit.c:223
+msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:537
-#: calendar/gui/e-meeting-model.c:821
-msgid "Yes"
-msgstr "Oyi"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+msgid "Could not start evolution-data-server"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:1721 calendar/gui/e-meeting-model.c:310
-#: calendar/gui/e-meeting-model.c:822
-msgid "No"
-msgstr "Neni"
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
 
-#. No time range is set, so don't start a query
-#: calendar/gui/calendar-model.c:1984 calendar/gui/e-day-view.c:1677
-#: calendar/gui/e-week-view.c:1188
-msgid "Searching"
-msgstr "Dji cwir"
+#: calendar/conduits/todo/todo-conduit.c:209
+msgid "Default Priority:"
+msgstr "Prumiristé prémetowe:"
 
-#: calendar/gui/calendar-view-factory.c:148 views/calendar/galview.xml.h:1
-msgid "Day View"
-msgstr "Vey djoû"
+#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:151 views/calendar/galview.xml.h:4
-msgid "Work Week View"
-msgstr "Vey samwinne d' ovraedje"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:154 views/calendar/galview.xml.h:3
-msgid "Week View"
-msgstr "Vey samwinne"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
 
-#: calendar/gui/calendar-view-factory.c:157 views/calendar/galview.xml.h:2
-msgid "Month View"
-msgstr "Vey moes"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Calindrî"
 
-#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:171 shell/e-shortcuts.c:1055
-msgid "Calendar"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
 msgstr "Calindrî"
 
-#: calendar/gui/component-factory.c:65
-msgid "Folder containing appointments and events"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
 msgstr ""
 
-#: calendar/gui/component-factory.c:69 calendar/gui/print.c:1733
-#: my-evolution/e-summary-tasks.c:250 my-evolution/e-summary-tasks.c:267
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1058
-#: views/tasks/galview.xml.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Bouyes"
 
-#: calendar/gui/component-factory.c:70
-msgid "Folder containing to-do items"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calindrî"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "Bouyes"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
 msgstr ""
 
-#: calendar/gui/component-factory.c:683
-msgid "New meeting"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+msgid "Starting:"
 msgstr ""
 
-#: calendar/gui/component-factory.c:683
-msgid "_Meeting"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+msgid "Ending:"
 msgstr ""
 
-#: calendar/gui/component-factory.c:687
-msgid "New task"
-msgstr "Novele bouye"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
+msgid "Evolution Alarm"
+msgstr ""
 
-#: calendar/gui/component-factory.c:687 ui/evolution-tasks.xml.h:21
-msgid "_Task"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
+#, c-format
+msgid "Alarm on %s"
 msgstr ""
 
-#: calendar/gui/component-factory.c:691
-msgid "New appointment"
-msgstr "Novea radjoû"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+msgid "Snooze _time (minutes):"
+msgstr ""
 
-#: calendar/gui/component-factory.c:691
-msgid "_Appointment"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+msgid "_Edit appointment"
 msgstr ""
 
-#: calendar/gui/control-factory.c:120
-msgid "The URI that the calendar will display"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:359
-msgid "Audio Alarm Options"
+#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Drovi"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:883
+msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:368
-msgid "Message Alarm Options"
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/alarm-notify/alarm-queue.c:949
+msgid "No description available."
+msgstr "Nou discrijhaedje"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:969
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:386
-msgid "Program Alarm Options"
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
+msgid "Warning"
+msgstr "Adviertixhmint"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email.  Evolution will display\n"
+"a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:395
-msgid "Unknown Alarm Options"
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
+#, c-format
+msgid ""
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
+"\n"
+"        %s\n"
+"\n"
+"Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
-msgid "Alarm Repeat"
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
+msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Message to Display"
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
+msgstr "Dji n' sai inicyî Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:150
+msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Play sound:"
-msgstr "Djower son:"
+#: calendar/gui/alarm-notify/util.c:37
+msgid "invalid time"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Repeat the alarm"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Run program:"
-msgstr "Enonder programe:"
+#: 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 "List of urls for free/busy publishing"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "Show where events end in week and month views"
+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 or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+msgid "Whether to hide completed tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "contént"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
+msgid "Calendar"
+msgstr "Calindrî"
+
+#: calendar/gui/calendar-commands.c:352
 msgid ""
-"This is an email reminder, but Evolution does not yet support this kind of "
-"reminders.  You will not be able to edit the options for this reminder."
+"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/dialogs/alarm-options.glade.h:7
-msgid "With these arguments:"
+#: calendar/gui/calendar-commands.c:358
+msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "djoûs"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "extra times every"
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
+msgid "%A %d %B %Y"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
-msgid "hours"
-msgstr "eures"
+#. 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:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-week-view-main-item.c:329
+msgid "%a %d %b"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: executive-summary/test-service/rdf-summary.c:806
-#: filter/filter-datespec.c:85
-msgid "minutes"
-msgstr "munutes"
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
+msgid "%a %d %b %Y"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:309
-#, c-format
-msgid "%d days"
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
+msgid "%d %B %Y"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:312
-msgid "1 day"
+#. 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:465 calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:317
+#: calendar/gui/calendar-component.c:370
 #, c-format
-msgid "%d weeks"
+msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:320
-msgid "1 week"
+#: calendar/gui/calendar-component.c:426
+#, fuzzy
+msgid "New Calendar"
+msgstr "Nouve Caledonreye"
+
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:325
+#: calendar/gui/calendar-component.c:917
 #, c-format
-msgid "%d hours"
+msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:328
-msgid "1 hour"
+#: calendar/gui/calendar-component.c:929
+msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:333
-#, c-format
-msgid "%d minutes"
-msgstr "%d munutes"
+#: calendar/gui/calendar-component.c:1224
+msgid "New appointment"
+msgstr "Novea radjoû"
 
-#: calendar/gui/dialogs/alarm-page.c:336
-msgid "1 minute"
-msgstr "1 munute"
+#: calendar/gui/calendar-component.c:1225
+msgid "_Appointment"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:341
-#, c-format
-msgid "%d seconds"
-msgstr "%d segondes"
+#: calendar/gui/calendar-component.c:1226
+msgid "Create a new appointment"
+msgstr "Fé on novea radjoû"
 
-#: calendar/gui/dialogs/alarm-page.c:344
-msgid "1 second"
+#: calendar/gui/calendar-component.c:1232
+msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:373
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Djouwer on son"
+#: calendar/gui/calendar-component.c:1233
+#, fuzzy
+msgid "M_eeting"
+msgstr "Raploû"
 
-#: calendar/gui/dialogs/alarm-page.c:377
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
+#: calendar/gui/calendar-component.c:1234
+msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:381
-msgid "Send an email"
-msgstr ""
+#: calendar/gui/calendar-component.c:1240
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Novea radjoû"
 
-#: calendar/gui/dialogs/alarm-page.c:385
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Enonder on programe"
+#: calendar/gui/calendar-component.c:1241
+#, fuzzy
+msgid "All _Day Appointment"
+msgstr "Novea _radjoû"
 
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Unknown action to be performed"
-msgstr ""
+#: calendar/gui/calendar-component.c:1242
+#, fuzzy
+msgid "Create a new all-day appointment"
+msgstr "Fé on novea radjoû"
+
+#: calendar/gui/calendar-component.c:1248
+#, fuzzy
+msgid "New calendar"
+msgstr "Nouve Caledonreye"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Calindrî"
+
+#: calendar/gui/calendar-component.c:1250
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Fé on novea ridant"
+
+#: calendar/gui/calendar-offline-handler.c:192
 #, c-format
-msgid "%s %s before the start of the appointment"
+msgid "backend_go_offline(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/calendar-offline-handler.c:215
 #, c-format
-msgid "%s %s after the start of the appointment"
+msgid "backend_go_online(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:411
-#, c-format
-msgid "%s at the start of the appointment"
+#: calendar/gui/calendar-view-factory.c:118
+msgid "Day View"
+msgstr "Vey djoû"
+
+#: calendar/gui/calendar-view-factory.c:121
+msgid "Work Week View"
+msgstr "Vey samwinne d' ovraedje"
+
+#: calendar/gui/calendar-view-factory.c:124
+msgid "Week View"
+msgstr "Vey samwinne"
+
+#: calendar/gui/calendar-view-factory.c:127
+msgid "Month View"
+msgstr "Vey moes"
+
+#: calendar/gui/comp-editor-factory.c:409
+msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:420
-#, c-format
-msgid "%s %s before the end of the appointment"
+#: calendar/gui/comp-editor-factory.c:420
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:423
-#, c-format
-msgid "%s %s after the end of the appointment"
+#: calendar/gui/comp-editor-factory.c:426
+msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/comp-editor-factory.c:474
 #, c-format
-msgid "%s at the end of the appointment"
+msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:452
-#, c-format
-msgid "%s at %s"
-msgstr "%s a %s"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+msgid "<b>Alarm</b>\t"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:458
-#, c-format
-msgid "%s for an unknown trigger type"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Tchuzes"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+msgid "<b>Repeat</b>"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Abranles"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Håyner a vosse môde"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Messaedje"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Djouwer on son"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
-msgid "Reminders"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Enonder on programe"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "Evoyî"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:758 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Rascourti:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Dépårtumint:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Enonder programe:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+msgid "_Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Dimegne"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "djoû(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "eure(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:131
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "eures"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "munutes(s)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Radjouter"
+
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Abranles"
+
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+msgid "Enabled"
+msgstr "En alaedje"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+msgid "Are you sure you want to remove this URL?"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#, fuzzy
+msgid "Don't Remove"
+msgstr "Oister"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Disable"
+msgstr "Dismete"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Enable"
+msgstr "Mete en alaedje"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr ""
@@ -3444,359 +4494,476 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Calendar and Tasks Settings"
+msgid "<b>Alerts</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Color for overdue tasks"
-msgstr ""
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Djenerå"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Color for tasks due today"
+msgid "<b>Task List</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Create new appointments with a default _reminder"
+msgid "<b>Time</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Days"
-msgstr "Djoûs"
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Vey samwinne d' ovraedje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "First day of wee_k:"
+msgid "Calendar and Tasks Settings"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:963
-msgid "Friday"
-msgstr "Vinrdi"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Hours"
-msgstr "Eures"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Minutes"
-msgstr "Munutes"
+msgid "Day _ends:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:959
-msgid "Monday"
-msgstr "Londi"
+msgid "Days"
+msgstr "Djoûs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "O_verdue tasks:"
-msgstr ""
+msgid "Display"
+msgstr "Håynaedje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:964
-msgid "Saturday"
-msgstr "Semdi"
+#: mail/mail-config.glade.h:76
+msgid "E_nable"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Show appointment _end times in week and month views"
+msgid "Free/Busy Publishing"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Show week _numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Sta_rt of day:"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:556
+msgid "Friday"
+msgstr "Vinrdi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Su_n"
-msgstr ""
+msgid "Hours"
+msgstr "Eures"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:965
-msgid "Sunday"
-msgstr "Dimegne"
+msgid "Minutes"
+msgstr "Munutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "T_hu"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:552
+msgid "Monday"
+msgstr "Londi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "T_ue"
-msgstr ""
+#, fuzzy
+msgid "S_un"
+msgstr "Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Tas_ks due today:"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:557
+msgid "Saturday"
+msgstr "Semdi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:962
-msgid "Thursday"
-msgstr "Djudi"
+msgid "Sh_ow a reminder"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time"
-msgstr "Eure"
+msgid "Show week _numbers in date navigator"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time _zone:"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1040
+#: calendar/gui/e-itip-control.c:551
+msgid "Sunday"
+msgstr "Dimegne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Time di_visions:"
+msgid "T_asks due today:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Time format:"
-msgstr "Cogne di l' eure:"
+msgid "T_hu"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:960
-msgid "Tuesday"
-msgstr "Mårdi"
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:555
+msgid "Thursday"
+msgstr "Djudi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:961
-msgid "Wednesday"
-msgstr "Merkidi"
+msgid "Time _zone:"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ui/evolution-calendar.xml.h:33
-msgid "Work Week"
-msgstr ""
+msgid "Time format:"
+msgstr "Cogne di l' eure:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "_12 hour (AM/PM)"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:553
+msgid "Tuesday"
+msgstr "Mårdi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "_24 hour"
+msgid "W_eek starts:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "_Ask for confirmation when deleting items"
-msgstr ""
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:554
+msgid "Wednesday"
+msgstr "Merkidi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "_Compress weekends in month view"
+msgid "Work days:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "_Display"
-msgstr "_Håynaedje"
+msgid "_12 hour (AM/PM)"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "_End of day:"
+msgid "_24 hour"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Fri"
-msgstr ""
+#, fuzzy
+msgid "_Add URL"
+msgstr "_Radjouter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "_General"
-msgstr "_Djenerå"
+msgid "_Ask for confirmation when deleting items"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Hide completed tasks after"
+msgid "_Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-msgid "_Mon"
+msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_Other"
-msgstr "_Ôte"
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 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:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Candjî"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "_Sat"
+msgid "_Fri"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "_Task List"
+msgid "_Hide completed tasks after"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Wed"
+msgid "_Mon"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "before the start of the appointment"
+msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:51
-msgid "The meeting status has changed. Send an updated version?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid "Are you sure you want to cancel and delete this meeting?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+msgid "_Show appointment end times in week and month views"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:62
-msgid "Are you sure you want to cancel and delete this task?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#, fuzzy
+msgid "_Time divisions:"
+msgstr "divizions di %02i munutes"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#, fuzzy
+msgid "_Tue"
+msgstr "Mår"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:67
-msgid "Are you sure you want to cancel and delete this journal entry?"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#, fuzzy
+msgid "before every appointment"
+msgstr "Fé on novea radjoû"
+
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Calindrî"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Colorado"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Tchoezixhoz ene coleur"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Calindrî"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "Groupe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Sôre:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "Hårdêye:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "samwinnes"
+
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:77
 #, 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:79
 #, 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:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:101
 #, 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:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:188 calendar/gui/print.c:2164
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2168
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2170
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2175
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2177
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:321
-msgid "Could not update object!"
-msgstr ""
+#: calendar/gui/dialogs/comp-editor.c:264
+#, fuzzy
+msgid "Could not update object"
+msgstr "Dji n' sai inicyî Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:692
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:697
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:700
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:703
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:717
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1077 mail/mail-callbacks.c:2226
-#: mail/mail-display.c:113
-msgid "Overwrite file?"
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
+msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1081 mail/mail-callbacks.c:2233
-#: mail/mail-display.c:117
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: calendar/gui/dialogs/comp-editor.c:1387
+msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1127 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
-msgid "Save As..."
-msgstr "Schaper et rlomer..."
+#: calendar/gui/dialogs/copy-source-dialog.c:57
+msgid "Could not open source"
+msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1277
-msgid "Unable to obtain current version!"
+#: calendar/gui/dialogs/copy-source-dialog.c:65
+#, fuzzy
+msgid "Could not open destination"
+msgstr "Dji n' sai inicyî Bonobo"
+
+#: calendar/gui/dialogs/copy-source-dialog.c:74
+msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:96
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
+#: calendar/gui/dialogs/delete-error.c:54
+msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:99
-msgid "Are you sure you want to delete this untitled appointment?"
+#: calendar/gui/dialogs/delete-error.c:57
+msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:105
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
+#: calendar/gui/dialogs/delete-error.c:60
+msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:108
-msgid "Are you sure you want to delete this untitled task?"
+#: calendar/gui/dialogs/delete-error.c:63
+msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:114
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
+#: calendar/gui/dialogs/delete-error.c:70
+msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:117
-msgid "Are you sure want to delete this untitled journal entry?"
+#: calendar/gui/dialogs/delete-error.c:73
+msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:132
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
+#: calendar/gui/dialogs/delete-error.c:76
+msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:137
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
+#: calendar/gui/dialogs/delete-error.c:79
+msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:142
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
+#: calendar/gui/dialogs/delete-error.c:86
+msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
+#: calendar/gui/dialogs/delete-error.c:89
+msgid "The task could not be deleted due to an error"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-error.c:92
+msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
+#: calendar/gui/dialogs/delete-error.c:95
+msgid "The item could not be deleted due to an error"
+msgstr ""
+
+#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#, fuzzy
+msgid "Contacts..."
+msgstr "_Fonte..."
+
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
 msgstr ""
@@ -3805,505 +4972,1134 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:185 calendar/gui/print.c:2203
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Radjoû"
 
-#: calendar/gui/dialogs/event-editor.c:190
-msgid "Reminder"
-msgstr "A s' rapinser"
-
-#: calendar/gui/dialogs/event-editor.c:195
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Recurince"
 
-#: calendar/gui/dialogs/event-editor.c:202
-#: calendar/gui/dialogs/event-editor.c:260
-#: calendar/gui/dialogs/event-editor.c:365
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
-#: calendar/gui/dialogs/event-editor.c:263
-#: calendar/gui/dialogs/event-editor.c:368
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informåcion"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Raploû"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
-msgid "A_ll day event"
+#: calendar/gui/dialogs/event-page.c:692
+msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:2
-msgid "B_usy"
+#: calendar/gui/dialogs/event-page.c:695
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
+msgid "Start date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:865
+msgid "End date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:888
+msgid "Start time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:895
+msgid "End time is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:1605
+#, c-format
+msgid "Unable to open the calendar '%s'."
 msgstr ""
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "Fé on novea radjoû"
+msgstr[1] "Fé on novea radjoû"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "Novea radjoû"
+msgstr[1] "Novea radjoû"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "Fé on novea radjoû"
+msgstr[1] "Fé on novea radjoû"
+
+#: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "Fé on novea radjoû"
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "Novea radjoû"
+
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
-msgid "Classification"
-msgstr "Clasmint"
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "Fé on novea radjoû"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Con_fidential"
+msgid "<b>Basics</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Date & Time"
+#, fuzzy
+msgid "<b>Date and Time</b>"
 msgstr "Date & eure"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "F_ree"
-msgstr "_Libe"
+msgid "A_ll day event"
+msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-msgid "L_ocation:"
-msgstr ""
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Håyner a vosse môde"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
-msgid "Pri_vate"
-msgstr "Pri_vé"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "_Categoreyes..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Pu_blic"
-msgstr ""
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Calindrî"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Show Time As"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Clasmint"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Su_mmary:"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Catchimint"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
-msgid "_Contacts..."
+msgid "L_ocation:"
 msgstr ""
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Privé"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publike"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+msgid "Show time as _busy"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:17
+#: calendar/gui/dialogs/task-page.glade.h:11
+msgid "Su_mmary:"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Abranles"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Discrijhaedje:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:425
-msgid "An organizer is required."
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+msgid "None"
+msgstr "Nouk"
+
+#: calendar/gui/dialogs/meeting-page.c:443
+msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:446
-msgid "At least one attendee is required."
+#: calendar/gui/dialogs/meeting-page.c:449
+msgid "An organizer is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:626
-msgid "That person is already attending the meeting!"
+#: calendar/gui/dialogs/meeting-page.c:464
+msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:701
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr ""
 
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Oister"
+
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Common Name"
+msgid "Click here to add an attendee"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Delegated From"
+msgid "Common Name"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated To"
+msgid "Delegated From"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Language"
-msgstr "Lingaedje"
+msgid "Delegated To"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Member"
-msgstr "Mimbe"
+msgid "Language"
+msgstr "Lingaedje"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-itip-control.c:853
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "RSVP"
-msgstr ""
+msgid "Member"
+msgstr "Mimbe"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "Role"
+msgid "RSVP"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:31
-#: mail/message-list.etspec.h:11
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estat"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:95
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Sôre"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+msgid "<b>Attendees</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "_Change Organizer"
+msgid "<b>Organizer</b>"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:453
-msgid "_Invite Others..."
+msgid "Change Or_ganizer"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Other Organizer"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "_Fonte..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Organizåcion"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:2
+msgid "<b>Calendar options</b>"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:571
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: calendar/gui/dialogs/new-calendar.glade.h:3
+#, fuzzy
+msgid "Add New Calendar"
+msgstr "Nouve Caledonreye"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "Calindrî"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:5
+#, fuzzy
+msgid "Calendar Location"
+msgstr "Calindrî"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:6
+#, fuzzy
+msgid "Calendar Name"
+msgstr "Calindrî"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:932
-msgid "on"
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+msgid "Add New Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:958 filter/filter-datespec.c:83
-msgid "day"
-msgstr "djoû"
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+msgid "Task List Group"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1088
-msgid "on the"
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "Bouyes "
+
+#: calendar/gui/dialogs/recur-comp.c:50
+msgid "You are modifying a recurring event, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1096
-msgid "th"
+#: calendar/gui/dialogs/recur-comp.c:54
+msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1269
-msgid "occurrences"
+#: calendar/gui/dialogs/recur-comp.c:58
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Radjouter"
+#: calendar/gui/dialogs/recur-comp.c:72
+msgid "This Instance Only"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Tchaeke"
+#: calendar/gui/dialogs/recur-comp.c:76
+msgid "This and Prior Instances"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
-msgstr "Disrûlêyes"
+#: calendar/gui/dialogs/recur-comp.c:82
+msgid "This and Future Instances"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "Vey divant"
+#: calendar/gui/dialogs/recur-comp.c:87
+msgid "All Instances"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
+#: calendar/gui/dialogs/recurrence-page.c:511
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Candjî"
+#: calendar/gui/dialogs/recurrence-page.c:917
+msgid "on"
+msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
+#: calendar/gui/dialogs/recurrence-page.c:978
+#, fuzzy
+msgid "first"
+msgstr "_Prumî:"
+
+#: calendar/gui/dialogs/recurrence-page.c:979
+msgid "second"
+msgstr "segonde"
+
+#: calendar/gui/dialogs/recurrence-page.c:980
+#, fuzzy
+msgid "third"
+msgstr "Ôte"
+
+#: calendar/gui/dialogs/recurrence-page.c:981
+#, fuzzy
+msgid "fourth"
+msgstr "Nôr"
+
+#: calendar/gui/dialogs/recurrence-page.c:982
+#, fuzzy
+msgid "last"
+msgstr "djivêye"
+
+#: calendar/gui/dialogs/recurrence-page.c:1005
+#, fuzzy
+msgid "Other Date"
+msgstr "Ôte facs"
+
+#: calendar/gui/dialogs/recurrence-page.c:1033
+msgid "day"
+msgstr "djoû"
+
+#: calendar/gui/dialogs/recurrence-page.c:1170
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
+#: calendar/gui/dialogs/recurrence-page.c:1356
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.c:2309
+#, fuzzy
+msgid "Date/Time"
+msgstr "Date & eure"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
+msgstr "Disrûlêyes"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Vey divant"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Recurince"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Tchaeke"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "Nou radjoû"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "tofer"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "moes"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "samwinne(s)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "anêye(s)"
 
-#: calendar/gui/dialogs/send-comp.c:56
-msgid "The meeting information has been created. Send it?"
-msgstr ""
+#: calendar/gui/dialogs/select-source-dialog.c:84
+#, fuzzy
+msgid "Select destination"
+msgstr "Tchuze:"
 
-#: calendar/gui/dialogs/send-comp.c:59
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
+#: calendar/gui/dialogs/select-source-dialog.c:106
+#, fuzzy
+msgid "_Destination"
+msgstr "Discrijhaedje:"
 
-#: calendar/gui/dialogs/send-comp.c:66
-msgid "The task assignment information has been created. Send it?"
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#, fuzzy
+msgid "Task List"
+msgstr "Bouyes"
+
+#: calendar/gui/dialogs/task-details-page.c:427
+msgid "Completed date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:70
-msgid "The task information has changed. Send an updated version?"
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+msgid "<span weight=\"bold\">Status</span>"
 msgstr ""
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
+msgid "Completed"
+msgstr "Tot fwait"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
+msgid "High"
+msgstr "Hôte"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
+#: calendar/gui/print.c:2343
+msgid "In Progress"
+msgstr "En alaedje"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
+msgid "Low"
+msgstr "Basse"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
+msgid "Normal"
+msgstr "Normåle"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+msgid "Not Started"
+msgstr "Nén co enondé"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+msgid "P_ercent complete:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
-msgid "Progress"
-msgstr "Avançmint"
+#: calendar/gui/e-calendar-table.c:377
+msgid "Undefined"
+msgstr "Nén defineye"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:755
-msgid "URL:"
-msgstr "Hårdêye:"
+#, fuzzy
+msgid "_Date completed:"
+msgstr "Tot fwait"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Prumiristé:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:190
-#: calendar/gui/dialogs/task-editor.c:227
-#: calendar/gui/dialogs/task-editor.c:325
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "Date ki li bouye doet esse _fwaite:"
+
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Bouye"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:801
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:32
+#: calendar/gui/dialogs/task-page.c:496
+msgid "Due date is wrong"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.c:831
+#, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr ""
+
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Discrijhaedje:"
 
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-page.glade.h:10
+msgid "Sta_rt date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:11
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:12
+#, fuzzy
+msgid "_Due date:"
 msgstr "Date ki li bouye doet esse _fwaite:"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "Groupe"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "Otintifiaedje"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+msgid "Free/Busy Editor"
+msgstr ""
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
+msgid "_Daily"
+msgstr "Djoû"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#, fuzzy
+msgid "_Manual"
+msgstr "Managua"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#, fuzzy
+msgid "_Password:"
+msgstr "Sicret"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#, fuzzy
+msgid "_Remember password"
+msgstr "Si rmimbrer di ci scret chal"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#, fuzzy
+msgid "_Username:"
+msgstr "No d' _uzeu:"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+#, fuzzy
+msgid "_Weekly"
+msgstr "Samwinne"
+
+#: calendar/gui/e-alarm-list.c:395
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "djoû"
+msgstr[1] "djoû"
+
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "samwinne"
+msgstr[1] "samwinne"
+
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "eure"
+msgstr[1] "eure"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d munutes"
+msgstr[1] "%d munutes"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segondes"
+msgstr[1] "%d segondes"
+
+#: calendar/gui/e-alarm-list.c:462
+msgid "Unknown action to be performed"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
-msgid "0%"
+msgid "%s %s before the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
-msgid "10%"
+msgid "%s %s after the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
-msgid "20%"
+msgid "%s at the start of the appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
-msgid "30%"
+msgid "%s %s before the end of the appointment"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
-msgid "40%"
+msgid "%s %s after the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:499
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr ""
+
+#: calendar/gui/e-alarm-list.c:521
+#, c-format
+msgid "%s at %s"
+msgstr "%s a %s"
+
+#: calendar/gui/e-alarm-list.c:527
+#, c-format
+msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
+msgid "Click to open %s"
+msgstr ""
+
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Sins tite"
+
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Rascourti:"
+
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Date di naixhance"
+
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Date ki li bouye doet esse _fwaite:"
+
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:956
+msgid "Status:"
+msgstr "Sitatut:"
+
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prumiristé:"
+
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Pådje"
+
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr ""
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr ""
+
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Rascourti"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libe"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Ocupé"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Oyi"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Neni"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Nén cnoxhou"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:396
+msgid "0%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:397
+msgid "10%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:398
+msgid "20%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:399
+msgid "30%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:400
+msgid "40%"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:434
-#, c-format
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:435
-#, c-format
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:436
-#, c-format
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:437
-#, c-format
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:438
-#, c-format
+#: calendar/gui/e-calendar-table.c:406
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:741 calendar/gui/e-day-view.c:2726
-#: calendar/gui/e-week-view.c:1828
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3546
-#: calendar/gui/e-week-view.c:3433 mail/folder-browser.c:1463
-#: shell/e-shortcuts-view.c:384 ui/evolution-addressbook.xml.h:41
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
+msgid "Updating objects"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Drovi"
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3555
-#: calendar/gui/e-week-view.c:3442 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:1020
+msgid "Open _Web Page"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "Schaper et r_lomer..."
+
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: ui/evolution-tasks.xml.h:25
+msgid "_Print..."
+msgstr "_Imprimer..."
+
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Cô_per"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3557
-#: calendar/gui/e-week-view.c:3444 ui/evolution-addressbook.xml.h:36
-#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copyî"
 
-#: calendar/gui/e-calendar-table.c:968 calendar/gui/e-day-view.c:3532
-#: calendar/gui/e-day-view.c:3559 calendar/gui/e-week-view.c:3420
-#: calendar/gui/e-week-view.c:3446 ui/evolution-addressbook.xml.h:42
-#: ui/evolution-calendar.xml.h:41 ui/evolution-mail-list.xml.h:29
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "C_laper"
 
-#: calendar/gui/e-calendar-table.c:973
-msgid "_Mark as Complete"
+#: calendar/gui/e-calendar-table.c:1032
+msgid "_Assign Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:975
-msgid "_Delete this Task"
+#: calendar/gui/e-calendar-table.c:1033
+msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:978
-msgid "_Mark Tasks as Complete"
+#: calendar/gui/e-calendar-table.c:1034
+msgid "_Mark as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:980
-msgid "_Delete Selected Tasks"
+#: calendar/gui/e-calendar-table.c:1035
+msgid "_Mark Selected Tasks as Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1164 calendar/gui/e-day-view.c:7140
-#: calendar/gui/e-week-view.c:3930
-msgid "Updating objects"
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Disfacer"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
+msgid "_Delete Selected Tasks"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1247
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Schaper et rlomer..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Abranles"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:924
-#: camel/camel-filter-driver.c:1026
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr ""
 
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Completion date"
+msgstr "Tot fwait"
+
 #: calendar/gui/e-calendar-table.etspec.h:7
-msgid "Completion Date"
-msgstr ""
+#, fuzzy
+msgid "Due date"
+msgstr "Date ki li bouye doet esse fwaite"
 
 #: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Due Date"
-msgstr "Date ki li bouye doet esse fwaite"
+msgid "Priority"
+msgstr "Prumiristé"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-msgid "End Date"
+#, fuzzy
+msgid "Start date"
+msgstr "Date di naixhance"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "Geographical Position"
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Munutes"
+
+#: calendar/gui/e-calendar-view.c:1158
+msgid "Copying items"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Priority"
-msgstr "Prumiristé"
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
+msgid "New _Appointment..."
+msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:13
-msgid "Start Date"
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
+msgid "New All Day _Event"
 msgstr ""
 
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:44 shell/e-shortcuts.c:1049
-#: shell/e-storage-set-view.c:1498 shell/e-summary-storage.c:79
-msgid "Summary"
-msgstr "Rascourti"
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
+#, fuzzy
+msgid "New Meeting"
+msgstr "Raploû"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-msgid "Task sort"
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
+#, fuzzy
+msgid "New Task"
+msgstr "Novele bouye"
+
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Tchoezi ridant"
+
+#: calendar/gui/e-calendar-view.c:1330
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Tchoezi on fitchî"
+
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1353
+msgid "Cop_y to Calendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "Hårdêye"
+#: calendar/gui/e-calendar-view.c:1354
+msgid "Mo_ve to Calendar..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1355
+msgid "_Schedule Meeting..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1356
+msgid "_Forward as iCalendar..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
+msgid "Delete this _Occurrence"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
+msgid "Delete _All Occurrences"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1396
+msgid "Go to _Today"
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1398
+msgid "_Go to Date..."
+msgstr ""
+
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
+#, fuzzy
+msgid "_Settings..."
+msgstr "Apontiaedjes"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
+#: calendar/gui/e-cell-date-edit-text.c: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:158
-#: e-util/e-time-utils.c:366
+#: 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"
@@ -4311,410 +6107,417 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:532
 #, c-format
 msgid "%02i minute divisions"
 msgstr "divizions di %02i munutes"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1389
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1461
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d di %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1416
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
+#: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:350
-#: calendar/gui/print.c:768
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
 msgid "am"
 msgstr "AM"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:617 calendar/gui/e-week-view.c:353
-#: calendar/gui/print.c:770
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
 msgid "pm"
 msgstr "PM"
 
-#: calendar/gui/e-day-view.c:3525
-msgid "New _Appointment"
-msgstr "Novea _radjoû"
-
-#: calendar/gui/e-day-view.c:3527 calendar/gui/e-week-view.c:3415
-msgid "New All Day _Event"
+#: calendar/gui/e-itip-control.c:585
+msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3537 calendar/gui/e-week-view.c:3425
-#: ui/evolution-calendar.xml.h:19
-msgid "Go to _Today"
-msgstr ""
+#: calendar/gui/e-itip-control.c:596
+#, fuzzy, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Tchaeke"
+msgstr[1] "Tchaeke"
 
-#: calendar/gui/e-day-view.c:3539 calendar/gui/e-week-view.c:3427
-msgid "_Go to Date..."
-msgstr ""
+#: calendar/gui/e-itip-control.c:601
+#, fuzzy, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Tchaeke"
+msgstr[1] "Tchaeke"
 
-#: calendar/gui/e-day-view.c:3548 calendar/gui/e-week-view.c:3435
-msgid "_Delete this Appointment"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3567 calendar/gui/e-week-view.c:3460
-msgid "Make this Occurrence _Movable"
-msgstr ""
-
-#: calendar/gui/e-day-view.c:3569 calendar/gui/e-week-view.c:3462
-msgid "Delete this _Occurrence"
-msgstr ""
+#: calendar/gui/e-itip-control.c:603
+#, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-day-view.c:3571 calendar/gui/e-week-view.c:3464
-msgid "Delete _All Occurrences"
-msgstr ""
+#: calendar/gui/e-itip-control.c:611
+#, fuzzy
+msgid " and "
+msgstr "Såvlon"
 
-#: calendar/gui/e-itip-control.c:545
-msgid "Meeting begins: <b>"
+#: calendar/gui/e-itip-control.c:618
+#, c-format
+msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-msgid "Task begins: <b>"
+#: calendar/gui/e-itip-control.c:631
+#, c-format
+msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:555
-msgid "Free/Busy info begins: <b>"
-msgstr ""
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "Vermont"
+msgstr[1] "Vermont"
 
-#: calendar/gui/e-itip-control.c:559
-msgid "Begins: <b>"
-msgstr ""
+#: calendar/gui/e-itip-control.c:642
+#, fuzzy, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Tchaeke"
+msgstr[1] "Tchaeke"
 
-#: calendar/gui/e-itip-control.c:571
-msgid "Meeting ends: <b>"
-msgstr ""
+#: calendar/gui/e-itip-control.c:653
+#, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:574
-msgid "Free/Busy info ends: <b>"
+#: calendar/gui/e-itip-control.c:662
+msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:578
-msgid "Ends: <b>"
-msgstr ""
+#: calendar/gui/e-itip-control.c:686
+#, fuzzy
+msgid "Starts"
+msgstr "Estat"
 
-#: calendar/gui/e-itip-control.c:592
-msgid "Task Completed: <b>"
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:602
-msgid "Task Due: <b>"
-msgstr ""
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Dép.."
 
-#: calendar/gui/e-itip-control.c:639 calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:719 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:742
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:758
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:770
-msgid "Status:"
-msgstr "Sitatut:"
+#: calendar/gui/e-itip-control.c:942
+#, fuzzy
+msgid "Location:"
+msgstr "Seccions:"
 
-#: calendar/gui/e-itip-control.c:775 calendar/gui/e-meeting-model.c:318
-#: calendar/gui/e-meeting-model.c:341 calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:779
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:783 calendar/gui/e-meeting-model.c:320
-#: calendar/gui/e-meeting-model.c:343 calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:787 calendar/gui/e-itip-control.c:986
-#: calendar/gui/e-itip-control.c:1057 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:289 calendar/gui/e-meeting-model.c:354
-#: calendar/gui/e-meeting-model.c:793 calendar/gui/e-meeting-model.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:171
-#: camel/providers/smtp/camel-smtp-transport.c:226 mail/folder-browser.c:317
-#: mail/mail-display.c:827 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:442
-msgid "Unknown"
-msgstr "Nén cnoxhou"
-
-#: calendar/gui/e-itip-control.c:833 calendar/gui/e-itip-control.c:849
-#: calendar/gui/e-itip-control.c:865 calendar/gui/e-itip-control.c:878
-#: calendar/gui/e-itip-control.c:891 calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:834
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Mete a djoû"
 
-#: calendar/gui/e-itip-control.c:835 calendar/gui/e-itip-control.c:854
-#: calendar/gui/e-itip-control.c:867 calendar/gui/e-itip-control.c:880
-#: calendar/gui/e-itip-control.c:893 calendar/gui/e-itip-control.c:906
-#: shell/e-shell.c:1931 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "I Va"
 
-#: calendar/gui/e-itip-control.c:850
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:851
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:866
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:879
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:905 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: calendar/gui/e-itip-control.c:953
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:954
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1204
+#, c-format
+msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:968
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:992
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:993
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:997
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1002 calendar/gui/e-itip-control.c:1073
-#: calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1003
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1024
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1028
+#: calendar/gui/e-itip-control.c:1272
+#, c-format
+msgid "<b>%s</b> requests %s to perform a task."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1033
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1034
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1038
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1039
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1063
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1064
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1068
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1069
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1074
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1093
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1098
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1099
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1104
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
-msgid "Unable to find any of your identities in the attendees list!\n"
+#: calendar/gui/e-itip-control.c:1775
+msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1369
-msgid "Calendar file could not be updated!\n"
+#: calendar/gui/e-itip-control.c:1803
+msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1371
-msgid "Update complete\n"
+#: calendar/gui/e-itip-control.c:1813
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1424
-msgid "Attendee status could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1845
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1456
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1486 calendar/gui/e-itip-control.c:1536
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1488 calendar/gui/e-itip-control.c:1540
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -4743,6 +6546,10 @@ msgstr ""
 msgid "Loading calendar..."
 msgstr ""
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr ""
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr ""
@@ -4755,201 +6562,212 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:82 calendar/gui/e-meeting-model.c:1640
-msgid "Required Participants"
-msgstr ""
-
-#: calendar/gui/e-meeting-model.c:83
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:84
-msgid "Non-Participants"
-msgstr ""
+#: calendar/gui/e-meeting-list-view.c:62
+#, fuzzy
+msgid "Resources"
+msgstr "Rissource"
 
-#: calendar/gui/e-meeting-model.c:229 calendar/gui/e-meeting-model.c:246
-#: calendar/gui/e-meeting-model.c:533 calendar/gui/e-meeting-model.c:789
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:231 calendar/gui/e-meeting-model.c:248
-#: calendar/gui/e-meeting-model.c:790
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Groupe"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:791
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Rissource"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:792
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:264 calendar/gui/e-meeting-model.c:281
-#: calendar/gui/e-meeting-model.c:805
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:266 calendar/gui/e-meeting-model.c:283
-#: calendar/gui/e-meeting-model.c:535 calendar/gui/e-meeting-model.c:806
+#: calendar/gui/e-meeting-list-view.c:133 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 ""
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:807
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:808
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
-#: calendar/gui/e-meeting-model.c:543 calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-list-view.c:157 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 ""
 
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:345
-#: calendar/gui/e-meeting-model.c:837 calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-list-view.c:160 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 ""
 
-#: calendar/gui/e-meeting-model.c:324 calendar/gui/e-meeting-model.c:347
-#: calendar/gui/e-meeting-model.c:838
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:471
-#: calendar/gui/e-meeting-time-sel.c:2088
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
 msgid "%A, %B %d, %Y"
 msgstr ""
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2118 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 ""
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:436
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:473
-msgid "_Options"
-msgstr "_Tchuzes"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "Tchuzes"
 
-#: calendar/gui/e-meeting-time-sel.c:490
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:449
+msgid "Show _only working hours"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:503
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:459
+msgid "Show _zoomed out"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:521
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:474
+msgid "_Update free/busy"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:539
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:570
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:587
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:539
+msgid "_All people and resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:600
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:548
+msgid "All _people and one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:557
+msgid "_Required people"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:626
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:566
+msgid "Required people and _one resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-time-sel.c:649
-msgid "Meeting _start time:"
-msgstr ""
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Tapez li scret"
 
-#: calendar/gui/e-meeting-time-sel.c:668
-msgid "Meeting _end time:"
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
+#, c-format
+msgid ""
+"Error on %s:\n"
+" %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:351
+#: calendar/gui/e-tasks.c:755
+#, fuzzy
+msgid "Loading tasks"
+msgstr "Dji tchedje..."
+
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:381
-#, c-format
-msgid "Could not load the tasks in `%s'"
+#: calendar/gui/e-tasks.c:962
+msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:393
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/e-tasks.c:985
+msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:643
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3413 calendar/gui/e-week-view.c:3451
-msgid "New _Appointment..."
-msgstr ""
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Mete a djoû"
 
-#: calendar/gui/gnome-cal.c:1499
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr ""
+#: calendar/gui/gnome-cal.c:2006
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Nou radjoû"
 
-#: calendar/gui/gnome-cal.c:1510
+#: calendar/gui/gnome-cal.c:2025
 #, c-format
-msgid "The method required to open `%s' is not supported"
+msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1872
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
-msgid "Opening calendar at %s"
+msgid "Opening %s"
 msgstr ""
 
+#: calendar/gui/gnome-cal.c:3003
+#, fuzzy
+msgid "Purging"
+msgstr "Rexhowe"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Avri"
@@ -4967,495 +6785,501 @@ msgid "February"
 msgstr "Fevrî"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr ""
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Djanvî"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Djulete"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Djun"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Måss"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "May"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Nôvimbe"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Octôbe"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Tchoezi on fitchî"
+
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Setimbe"
 
-#: calendar/gui/itip-utils.c:243
-msgid "At least one attendee is necessary"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Select Today"
+msgstr "Tchoezi ridant"
 
-#: calendar/gui/itip-utils.c:274
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr ""
 
-#: calendar/gui/itip-utils.c:313 calendar/gui/itip-utils.c:346
+#: calendar/gui/itip-utils.c:306
+msgid "At least one attendee is necessary"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:315 calendar/gui/itip-utils.c:348
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:317 calendar/gui/itip-utils.c:350
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:319 calendar/gui/itip-utils.c:367
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:321
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:361
+#: calendar/gui/itip-utils.c:438
+#, fuzzy
+msgid "Updated"
+msgstr "Mete a djoû"
+
+#: calendar/gui/itip-utils.c:446
+msgid "Refresh"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:450
+msgid "Counter-proposal"
+msgstr ""
+
+#: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:373
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:582
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr ""
 
-#: calendar/gui/main.c:91
-msgid "Could not create the component editor factory"
+#: calendar/gui/migration.c:146
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:150
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:376
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the Webcal source group
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+msgid "On The Web"
+msgstr ""
+
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:889
+#, c-format
+msgid "Unable to migrate tasks `%s'"
 msgstr ""
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1î"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:489
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:489
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:489
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:489
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:490
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:490
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:490
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:490
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:490
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:491
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:491
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:491
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:491
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:491
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:492
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:492
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:492
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:492
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:492
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:493
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:493
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:493
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:493
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:429
+#: calendar/gui/print.c:493
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:494
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:494
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:494
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:494
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:430
+#: calendar/gui/print.c:494
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:431
+#: calendar/gui/print.c:495
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:570
 msgid "Su"
 msgstr "Dim"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:570
 msgid "Mo"
 msgstr "Lon"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:570
 msgid "Tu"
 msgstr "Mår"
 
-#: calendar/gui/print.c:498
+#: calendar/gui/print.c:570
 msgid "We"
 msgstr "Mer"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:571
 msgid "Th"
 msgstr "Dju"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:571
 msgid "Fr"
 msgstr "Vin"
 
-#: calendar/gui/print.c:499
+#: calendar/gui/print.c:571
 msgid "Sa"
 msgstr "Sem"
 
 #. Day
-#: calendar/gui/print.c:1819
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1844 calendar/gui/print.c:1848
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a %d di %b"
 
-#: calendar/gui/print.c:1845
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1849 calendar/gui/print.c:1851
-#: calendar/gui/print.c:1852
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a %d di %b %Y"
 
-#: calendar/gui/print.c:1856
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1864
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1871
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:2205
-msgid "Task"
-msgstr "Bouye"
-
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2280
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2294
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr ""
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "Hårdêye: %s"
 
-#: calendar/gui/print.c:2320
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr ""
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr ""
 
-#: calendar/gui/print.c:2386
-msgid "Print Calendar"
-msgstr ""
-
-#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
-#: mail/mail-callbacks.c:2882 my-evolution/e-summary.c:605
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-mail-message.xml.h:67
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Vey divant"
 
-#: calendar/gui/print.c:2506
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr ""
 
-#: calendar/gui/print.c:2587
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Apontiaedje del sicrirece"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-
-#: calendar/gui/tasks-control.c:137
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:427
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:434 mail/mail-callbacks.c:2359
-#: mail/mail-callbacks.c:2587
-msgid "Do not ask me again."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-
-#: calendar/gui/tasks-migrate.c:120
+#: calendar/gui/tasks-component.c:313
 #, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
+#: calendar/gui/tasks-component.c:371
+#, fuzzy
+msgid "New Task List"
+msgstr "Novele bouye"
 
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
-msgid "SMTWTFS"
-msgstr ""
+#: calendar/gui/tasks-component.c:408
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "Novele bouye"
+msgstr[1] "Novele bouye"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
-msgid "Factory to import iCalendar files into Evolution"
-msgstr ""
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d segondes"
+msgstr[1] "%d segondes"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
-msgid "Imports iCalendar files into Evolution"
+#: calendar/gui/tasks-component.c:457
+msgid "Failed upgrading tasks."
 msgstr ""
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
-msgid "Imports vCalendar files into Evolution"
-msgstr ""
-
-#: calendar/pcs/query.c:246
-msgid "time-now expects 0 arguments"
+#: calendar/gui/tasks-component.c:749
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/pcs/query.c:270
-msgid "make-time expects 1 argument"
+#: calendar/gui/tasks-component.c:761
+msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/pcs/query.c:275
-msgid "make-time expects argument 1 to be a string"
-msgstr ""
+#: calendar/gui/tasks-component.c:1030
+msgid "New task"
+msgstr "Novele bouye"
 
-#: calendar/pcs/query.c:283
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
+#: calendar/gui/tasks-component.c:1031
+msgid "_Task"
 msgstr ""
 
-#: calendar/pcs/query.c:312
-msgid "time-add-day expects 2 arguments"
+#: calendar/gui/tasks-component.c:1032
+msgid "Create a new task"
 msgstr ""
 
-#: calendar/pcs/query.c:317
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
+#: calendar/gui/tasks-component.c:1038
+#, fuzzy
+msgid "New tasks group"
+msgstr "Novele bouye"
 
-#: calendar/pcs/query.c:324
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
+msgstr "Bouyes "
 
-#: calendar/pcs/query.c:351
-msgid "time-day-begin expects 1 argument"
-msgstr ""
+#: calendar/gui/tasks-component.c:1040
+#, fuzzy
+msgid "Create a new tasks group"
+msgstr "Fé on novea ridant"
 
-#: calendar/pcs/query.c:356
-msgid "time-day-begin expects argument 1 to be a time_t"
+#: calendar/gui/tasks-control.c:367
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
 msgstr ""
 
-#: calendar/pcs/query.c:383
-msgid "time-day-end expects 1 argument"
+#: calendar/gui/tasks-control.c:370
+msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/pcs/query.c:388
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
+#: calendar/gui/tasks-control.c:428
+#, fuzzy
+msgid "Print Tasks"
+msgstr "Imprimer"
 
-#: calendar/pcs/query.c:424
-msgid "get-vtype expects 0 arguments"
+#: calendar/gui/weekday-picker.c:326
+msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/pcs/query.c:520
-msgid "occur-in-time-range? expects 2 arguments"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
+msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: calendar/pcs/query.c:525
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
+msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: calendar/pcs/query.c:532
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
+msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: calendar/pcs/query.c:662
-msgid "contains? expects 2 arguments"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:4
+msgid "iCalendar files (.ics)"
 msgstr ""
 
-#: calendar/pcs/query.c:667
-msgid "contains? expects argument 1 to be a string"
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:5
+msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/pcs/query.c:674
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
+#: calendar/importers/icalendar-importer.c:78
+#, fuzzy
+msgid "Appointments and Meetings"
+msgstr "Radjoû"
 
-#: calendar/pcs/query.c:691
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
+#: calendar/importers/icalendar-importer.c:490
+#, fuzzy
+msgid "Reminder!!"
+msgstr "A s' rapinser"
 
-#: calendar/pcs/query.c:733
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
+#: calendar/importers/icalendar-importer.c:698
+#, fuzzy
+msgid "Calendar Events"
+msgstr "Calindrî"
 
-#: calendar/pcs/query.c:745
+#: calendar/importers/icalendar-importer.c:723
 msgid ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-msgstr ""
-
-#: calendar/pcs/query.c:833
-msgid "is-completed? expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:878
-msgid "completed-before? expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:883
-msgid "completed-before? expects argument 1 to be a time_t"
+"Evolution has found Gnome Calendar files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/pcs/query.c:1160
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
+#: calendar/importers/icalendar-importer.c:730
+#, fuzzy
+msgid "Gnome Calendar"
+msgstr "Calindrî"
 
 #.
 #. * These are the timezone names from the Olson timezone data.
@@ -6355,651 +8179,673 @@ msgid "Asia/Macao"
 msgstr ""
 
 #: calendar/zones.h:230
+#, fuzzy
+msgid "Asia/Macau"
+msgstr "Macao"
+
+#: calendar/zones.h:231
 msgid "Asia/Magadan"
 msgstr ""
 
-#: calendar/zones.h:231
+#: calendar/zones.h:232
+msgid "Asia/Makassar"
+msgstr ""
+
+#: calendar/zones.h:233
 msgid "Asia/Manila"
 msgstr ""
 
-#: calendar/zones.h:232
+#: calendar/zones.h:234
 msgid "Asia/Muscat"
 msgstr ""
 
-#: calendar/zones.h:233
+#: calendar/zones.h:235
 msgid "Asia/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:234
+#: calendar/zones.h:236
 msgid "Asia/Novosibirsk"
 msgstr ""
 
-#: calendar/zones.h:235
+#: calendar/zones.h:237
 msgid "Asia/Omsk"
 msgstr ""
 
-#: calendar/zones.h:236
+#: calendar/zones.h:238
+#, fuzzy
+msgid "Asia/Oral"
+msgstr "Azeye"
+
+#: calendar/zones.h:239
 msgid "Asia/Phnom_Penh"
 msgstr ""
 
-#: calendar/zones.h:237
+#: calendar/zones.h:240
 msgid "Asia/Pontianak"
 msgstr ""
 
-#: calendar/zones.h:238
+#: calendar/zones.h:241
 msgid "Asia/Pyongyang"
 msgstr ""
 
-#: calendar/zones.h:239
+#: calendar/zones.h:242
 msgid "Asia/Qatar"
 msgstr ""
 
-#: calendar/zones.h:240
+#: calendar/zones.h:243
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+#: calendar/zones.h:244
 msgid "Asia/Rangoon"
 msgstr ""
 
-#: calendar/zones.h:241
+#: calendar/zones.h:245
 msgid "Asia/Riyadh"
 msgstr ""
 
-#: calendar/zones.h:242
+#: calendar/zones.h:246
 msgid "Asia/Saigon"
 msgstr ""
 
-#: calendar/zones.h:243
+#: calendar/zones.h:247
 msgid "Asia/Sakhalin"
 msgstr ""
 
-#: calendar/zones.h:244
+#: calendar/zones.h:248
 msgid "Asia/Samarkand"
 msgstr ""
 
-#: calendar/zones.h:245
+#: calendar/zones.h:249
 msgid "Asia/Seoul"
 msgstr ""
 
-#: calendar/zones.h:246
+#: calendar/zones.h:250
 msgid "Asia/Shanghai"
 msgstr ""
 
-#: calendar/zones.h:247
+#: calendar/zones.h:251
 msgid "Asia/Singapore"
 msgstr ""
 
-#: calendar/zones.h:248
+#: calendar/zones.h:252
 msgid "Asia/Taipei"
 msgstr ""
 
-#: calendar/zones.h:249
+#: calendar/zones.h:253
 msgid "Asia/Tashkent"
 msgstr ""
 
-#: calendar/zones.h:250
+#: calendar/zones.h:254
 msgid "Asia/Tbilisi"
 msgstr ""
 
-#: calendar/zones.h:251
+#: calendar/zones.h:255
 msgid "Asia/Tehran"
 msgstr ""
 
-#: calendar/zones.h:252
+#: calendar/zones.h:256
 msgid "Asia/Thimphu"
 msgstr ""
 
-#: calendar/zones.h:253
+#: calendar/zones.h:257
 msgid "Asia/Tokyo"
 msgstr ""
 
-#: calendar/zones.h:254
+#: calendar/zones.h:258
 msgid "Asia/Ujung_Pandang"
 msgstr ""
 
-#: calendar/zones.h:255
+#: calendar/zones.h:259
 msgid "Asia/Ulaanbaatar"
 msgstr ""
 
-#: calendar/zones.h:256
+#: calendar/zones.h:260
 msgid "Asia/Urumqi"
 msgstr ""
 
-#: calendar/zones.h:257
+#: calendar/zones.h:261
 msgid "Asia/Vientiane"
 msgstr ""
 
-#: calendar/zones.h:258
+#: calendar/zones.h:262
 msgid "Asia/Vladivostok"
 msgstr ""
 
-#: calendar/zones.h:259
+#: calendar/zones.h:263
 msgid "Asia/Yakutsk"
 msgstr ""
 
-#: calendar/zones.h:260
+#: calendar/zones.h:264
 msgid "Asia/Yekaterinburg"
 msgstr ""
 
-#: calendar/zones.h:261
+#: calendar/zones.h:265
 msgid "Asia/Yerevan"
 msgstr ""
 
-#: calendar/zones.h:262
+#: calendar/zones.h:266
 msgid "Atlantic/Azores"
 msgstr ""
 
-#: calendar/zones.h:263
+#: calendar/zones.h:267
 msgid "Atlantic/Bermuda"
 msgstr ""
 
-#: calendar/zones.h:264
+#: calendar/zones.h:268
 msgid "Atlantic/Canary"
 msgstr ""
 
-#: calendar/zones.h:265
+#: calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
 msgstr ""
 
-#: calendar/zones.h:266
+#: calendar/zones.h:270
 msgid "Atlantic/Faeroe"
 msgstr ""
 
-#: calendar/zones.h:267
+#: calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
 msgstr ""
 
-#: calendar/zones.h:268
+#: calendar/zones.h:272
 msgid "Atlantic/Madeira"
 msgstr ""
 
-#: calendar/zones.h:269
+#: calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
 msgstr ""
 
-#: calendar/zones.h:270
+#: calendar/zones.h:274
 msgid "Atlantic/South_Georgia"
 msgstr ""
 
-#: calendar/zones.h:271
+#: calendar/zones.h:275
 msgid "Atlantic/St_Helena"
 msgstr ""
 
-#: calendar/zones.h:272
+#: calendar/zones.h:276
 msgid "Atlantic/Stanley"
 msgstr ""
 
-#: calendar/zones.h:273
+#: calendar/zones.h:277
 msgid "Australia/Adelaide"
 msgstr ""
 
-#: calendar/zones.h:274
+#: calendar/zones.h:278
 msgid "Australia/Brisbane"
 msgstr ""
 
-#: calendar/zones.h:275
+#: calendar/zones.h:279
 msgid "Australia/Broken_Hill"
 msgstr ""
 
-#: calendar/zones.h:276
+#: calendar/zones.h:280
 msgid "Australia/Darwin"
 msgstr ""
 
-#: calendar/zones.h:277
+#: calendar/zones.h:281
 msgid "Australia/Hobart"
 msgstr ""
 
-#: calendar/zones.h:278
+#: calendar/zones.h:282
 msgid "Australia/Lindeman"
 msgstr ""
 
-#: calendar/zones.h:279
+#: calendar/zones.h:283
 msgid "Australia/Lord_Howe"
 msgstr ""
 
-#: calendar/zones.h:280
+#: calendar/zones.h:284
 msgid "Australia/Melbourne"
 msgstr ""
 
-#: calendar/zones.h:281
+#: calendar/zones.h:285
 msgid "Australia/Perth"
 msgstr ""
 
-#: calendar/zones.h:282
+#: calendar/zones.h:286
 msgid "Australia/Sydney"
 msgstr ""
 
-#: calendar/zones.h:283
+#: calendar/zones.h:287
 msgid "Europe/Amsterdam"
 msgstr ""
 
-#: calendar/zones.h:284
+#: calendar/zones.h:288
 msgid "Europe/Andorra"
 msgstr ""
 
-#: calendar/zones.h:285
+#: calendar/zones.h:289
 msgid "Europe/Athens"
 msgstr ""
 
-#: calendar/zones.h:286
+#: calendar/zones.h:290
 msgid "Europe/Belfast"
 msgstr ""
 
-#: calendar/zones.h:287
+#: calendar/zones.h:291
 msgid "Europe/Belgrade"
 msgstr "Urope/Belgråde"
 
-#: calendar/zones.h:288
+#: calendar/zones.h:292
 msgid "Europe/Berlin"
 msgstr "Urope/Berlin"
 
-#: calendar/zones.h:289
+#: calendar/zones.h:293
 msgid "Europe/Bratislava"
 msgstr ""
 
-#: calendar/zones.h:290
+#: calendar/zones.h:294
 msgid "Europe/Brussels"
 msgstr "Urope/Brussele"
 
-#: calendar/zones.h:291
+#: calendar/zones.h:295
 msgid "Europe/Bucharest"
 msgstr ""
 
-#: calendar/zones.h:292
+#: calendar/zones.h:296
 msgid "Europe/Budapest"
 msgstr ""
 
-#: calendar/zones.h:293
+#: calendar/zones.h:297
 msgid "Europe/Chisinau"
 msgstr ""
 
-#: calendar/zones.h:294
+#: calendar/zones.h:298
 msgid "Europe/Copenhagen"
 msgstr ""
 
-#: calendar/zones.h:295
+#: calendar/zones.h:299
 msgid "Europe/Dublin"
 msgstr ""
 
-#: calendar/zones.h:296
+#: calendar/zones.h:300
 msgid "Europe/Gibraltar"
 msgstr ""
 
-#: calendar/zones.h:297
+#: calendar/zones.h:301
 msgid "Europe/Helsinki"
 msgstr ""
 
-#: calendar/zones.h:298
+#: calendar/zones.h:302
 msgid "Europe/Istanbul"
 msgstr ""
 
-#: calendar/zones.h:299
+#: calendar/zones.h:303
 msgid "Europe/Kaliningrad"
 msgstr ""
 
-#: calendar/zones.h:300
+#: calendar/zones.h:304
 msgid "Europe/Kiev"
 msgstr "Urope/Kiyev"
 
-#: calendar/zones.h:301
+#: calendar/zones.h:305
 msgid "Europe/Lisbon"
 msgstr "Urope/Lisbone"
 
-#: calendar/zones.h:302
+#: calendar/zones.h:306
 msgid "Europe/Ljubljana"
 msgstr ""
 
-#: calendar/zones.h:303
+#: calendar/zones.h:307
 msgid "Europe/London"
 msgstr "Urobe/Londe"
 
-#: calendar/zones.h:304
+#: calendar/zones.h:308
 msgid "Europe/Luxembourg"
 msgstr "Urope/Lussimbork-veye"
 
-#: calendar/zones.h:305
+#: calendar/zones.h:309
 msgid "Europe/Madrid"
 msgstr "Urope/Madrid"
 
-#: calendar/zones.h:306
+#: calendar/zones.h:310
 msgid "Europe/Malta"
 msgstr ""
 
-#: calendar/zones.h:307
+#: calendar/zones.h:311
 msgid "Europe/Minsk"
 msgstr "Urope/Minsk"
 
-#: calendar/zones.h:308
+#: calendar/zones.h:312
 msgid "Europe/Monaco"
 msgstr "Urope/Monaco"
 
-#: calendar/zones.h:309
+#: calendar/zones.h:313
 msgid "Europe/Moscow"
 msgstr "Urope/Moscou"
 
-#: calendar/zones.h:310
+#: calendar/zones.h:314
 msgid "Europe/Nicosia"
 msgstr ""
 
-#: calendar/zones.h:311
+#: calendar/zones.h:315
 msgid "Europe/Oslo"
 msgstr ""
 
-#: calendar/zones.h:312
+#: calendar/zones.h:316
 msgid "Europe/Paris"
 msgstr "Urope/Paris"
 
-#: calendar/zones.h:313
+#: calendar/zones.h:317
 msgid "Europe/Prague"
 msgstr ""
 
-#: calendar/zones.h:314
+#: calendar/zones.h:318
 msgid "Europe/Riga"
 msgstr ""
 
-#: calendar/zones.h:315
+#: calendar/zones.h:319
 msgid "Europe/Rome"
 msgstr ""
 
-#: calendar/zones.h:316
+#: calendar/zones.h:320
 msgid "Europe/Samara"
 msgstr ""
 
-#: calendar/zones.h:317
+#: calendar/zones.h:321
 msgid "Europe/San_Marino"
 msgstr ""
 
-#: calendar/zones.h:318
+#: calendar/zones.h:322
 msgid "Europe/Sarajevo"
 msgstr ""
 
-#: calendar/zones.h:319
+#: calendar/zones.h:323
 msgid "Europe/Simferopol"
 msgstr ""
 
-#: calendar/zones.h:320
+#: calendar/zones.h:324
 msgid "Europe/Skopje"
 msgstr ""
 
-#: calendar/zones.h:321
+#: calendar/zones.h:325
 msgid "Europe/Sofia"
 msgstr ""
 
-#: calendar/zones.h:322
+#: calendar/zones.h:326
 msgid "Europe/Stockholm"
 msgstr ""
 
-#: calendar/zones.h:323
+#: calendar/zones.h:327
 msgid "Europe/Tallinn"
 msgstr ""
 
-#: calendar/zones.h:324
+#: calendar/zones.h:328
 msgid "Europe/Tirane"
 msgstr ""
 
-#: calendar/zones.h:325
+#: calendar/zones.h:329
 msgid "Europe/Uzhgorod"
 msgstr ""
 
-#: calendar/zones.h:326
+#: calendar/zones.h:330
 msgid "Europe/Vaduz"
 msgstr ""
 
-#: calendar/zones.h:327
+#: calendar/zones.h:331
 msgid "Europe/Vatican"
 msgstr ""
 
-#: calendar/zones.h:328
+#: calendar/zones.h:332
 msgid "Europe/Vienna"
 msgstr ""
 
-#: calendar/zones.h:329
+#: calendar/zones.h:333
 msgid "Europe/Vilnius"
 msgstr ""
 
-#: calendar/zones.h:330
+#: calendar/zones.h:334
 msgid "Europe/Warsaw"
 msgstr ""
 
-#: calendar/zones.h:331
+#: calendar/zones.h:335
 msgid "Europe/Zagreb"
 msgstr ""
 
-#: calendar/zones.h:332
+#: calendar/zones.h:336
 msgid "Europe/Zaporozhye"
 msgstr ""
 
-#: calendar/zones.h:333
+#: calendar/zones.h:337
 msgid "Europe/Zurich"
 msgstr ""
 
-#: calendar/zones.h:334
+#: calendar/zones.h:338
 msgid "Indian/Antananarivo"
 msgstr ""
 
-#: calendar/zones.h:335
+#: calendar/zones.h:339
 msgid "Indian/Chagos"
 msgstr ""
 
-#: calendar/zones.h:336
+#: calendar/zones.h:340
 msgid "Indian/Christmas"
 msgstr ""
 
-#: calendar/zones.h:337
+#: calendar/zones.h:341
 msgid "Indian/Cocos"
 msgstr ""
 
-#: calendar/zones.h:338
+#: calendar/zones.h:342
 msgid "Indian/Comoro"
 msgstr ""
 
-#: calendar/zones.h:339
+#: calendar/zones.h:343
 msgid "Indian/Kerguelen"
 msgstr ""
 
-#: calendar/zones.h:340
+#: calendar/zones.h:344
 msgid "Indian/Mahe"
 msgstr ""
 
-#: calendar/zones.h:341
+#: calendar/zones.h:345
 msgid "Indian/Maldives"
 msgstr ""
 
-#: calendar/zones.h:342
+#: calendar/zones.h:346
 msgid "Indian/Mauritius"
 msgstr ""
 
-#: calendar/zones.h:343
+#: calendar/zones.h:347
 msgid "Indian/Mayotte"
 msgstr ""
 
-#: calendar/zones.h:344
+#: calendar/zones.h:348
 msgid "Indian/Reunion"
 msgstr ""
 
-#: calendar/zones.h:345
+#: calendar/zones.h:349
 msgid "Pacific/Apia"
 msgstr ""
 
-#: calendar/zones.h:346
+#: calendar/zones.h:350
 msgid "Pacific/Auckland"
 msgstr ""
 
-#: calendar/zones.h:347
+#: calendar/zones.h:351
 msgid "Pacific/Chatham"
 msgstr ""
 
-#: calendar/zones.h:348
+#: calendar/zones.h:352
 msgid "Pacific/Easter"
 msgstr ""
 
-#: calendar/zones.h:349
+#: calendar/zones.h:353
 msgid "Pacific/Efate"
 msgstr ""
 
-#: calendar/zones.h:350
+#: calendar/zones.h:354
 msgid "Pacific/Enderbury"
 msgstr ""
 
-#: calendar/zones.h:351
+#: calendar/zones.h:355
 msgid "Pacific/Fakaofo"
 msgstr ""
 
-#: calendar/zones.h:352
+#: calendar/zones.h:356
 msgid "Pacific/Fiji"
 msgstr ""
 
-#: calendar/zones.h:353
+#: calendar/zones.h:357
 msgid "Pacific/Funafuti"
 msgstr ""
 
-#: calendar/zones.h:354
+#: calendar/zones.h:358
 msgid "Pacific/Galapagos"
 msgstr ""
 
-#: calendar/zones.h:355
+#: calendar/zones.h:359
 msgid "Pacific/Gambier"
 msgstr ""
 
-#: calendar/zones.h:356
+#: calendar/zones.h:360
 msgid "Pacific/Guadalcanal"
 msgstr ""
 
-#: calendar/zones.h:357
+#: calendar/zones.h:361
 msgid "Pacific/Guam"
 msgstr ""
 
-#: calendar/zones.h:358
+#: calendar/zones.h:362
 msgid "Pacific/Honolulu"
 msgstr ""
 
-#: calendar/zones.h:359
+#: calendar/zones.h:363
 msgid "Pacific/Johnston"
 msgstr ""
 
-#: calendar/zones.h:360
+#: calendar/zones.h:364
 msgid "Pacific/Kiritimati"
 msgstr ""
 
-#: calendar/zones.h:361
+#: calendar/zones.h:365
 msgid "Pacific/Kosrae"
 msgstr ""
 
-#: calendar/zones.h:362
+#: calendar/zones.h:366
 msgid "Pacific/Kwajalein"
 msgstr ""
 
-#: calendar/zones.h:363
+#: calendar/zones.h:367
 msgid "Pacific/Majuro"
 msgstr ""
 
-#: calendar/zones.h:364
+#: calendar/zones.h:368
 msgid "Pacific/Marquesas"
 msgstr ""
 
-#: calendar/zones.h:365
+#: calendar/zones.h:369
 msgid "Pacific/Midway"
 msgstr ""
 
-#: calendar/zones.h:366
+#: calendar/zones.h:370
 msgid "Pacific/Nauru"
 msgstr ""
 
-#: calendar/zones.h:367
+#: calendar/zones.h:371
 msgid "Pacific/Niue"
 msgstr ""
 
-#: calendar/zones.h:368
+#: calendar/zones.h:372
 msgid "Pacific/Norfolk"
 msgstr ""
 
-#: calendar/zones.h:369
+#: calendar/zones.h:373
 msgid "Pacific/Noumea"
 msgstr ""
 
-#: calendar/zones.h:370
+#: calendar/zones.h:374
 msgid "Pacific/Pago_Pago"
 msgstr ""
 
-#: calendar/zones.h:371
+#: calendar/zones.h:375
 msgid "Pacific/Palau"
 msgstr ""
 
-#: calendar/zones.h:372
+#: calendar/zones.h:376
 msgid "Pacific/Pitcairn"
 msgstr ""
 
-#: calendar/zones.h:373
+#: calendar/zones.h:377
 msgid "Pacific/Ponape"
 msgstr ""
 
-#: calendar/zones.h:374
+#: calendar/zones.h:378
 msgid "Pacific/Port_Moresby"
 msgstr ""
 
-#: calendar/zones.h:375
+#: calendar/zones.h:379
 msgid "Pacific/Rarotonga"
 msgstr ""
 
-#: calendar/zones.h:376
+#: calendar/zones.h:380
 msgid "Pacific/Saipan"
 msgstr ""
 
-#: calendar/zones.h:377
+#: calendar/zones.h:381
 msgid "Pacific/Tahiti"
 msgstr ""
 
-#: calendar/zones.h:378
+#: calendar/zones.h:382
 msgid "Pacific/Tarawa"
 msgstr ""
 
-#: calendar/zones.h:379
+#: calendar/zones.h:383
 msgid "Pacific/Tongatapu"
 msgstr ""
 
-#: calendar/zones.h:380
+#: calendar/zones.h:384
 msgid "Pacific/Truk"
 msgstr ""
 
-#: calendar/zones.h:381
+#: calendar/zones.h:385
 msgid "Pacific/Wake"
 msgstr ""
 
-#: calendar/zones.h:382
+#: calendar/zones.h:386
 msgid "Pacific/Wallis"
 msgstr ""
 
-#: calendar/zones.h:383
+#: calendar/zones.h:387
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
-msgid "Clearsigning is not supported by this cipher"
-msgstr ""
-
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-data-cache.c:166
+#: camel/camel-cipher-context.c:254
+msgid "You may not import keys with this cipher"
+msgstr ""
+
+#: camel/camel-cipher-context.c:284
+msgid "You may not export keys with this cipher"
+msgstr ""
+
+#: camel/camel-data-cache.c:133
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:438
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:180
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -7007,7 +8853,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:243
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -7015,412 +8861,455 @@ msgid ""
 "Changes made to this folder will not be resynchronized."
 msgstr ""
 
-#: camel/camel-disco-diary.c:277
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr ""
 
-#: camel/camel-disco-store.c:343
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:103
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:466
+#, c-format
+msgid "Preparing folder '%s' for offline"
+msgstr ""
+
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:689 camel/camel-filter-driver.c:698
+#: camel/camel-filter-driver.c:669 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:713 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:756
+#, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr ""
+
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr ""
 
-#: camel/camel-filter-driver.c:789 camel/camel-filter-driver.c:1169
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:798 camel/camel-filter-driver.c:1175
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:865
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:874
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:889
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr ""
 
-#: camel/camel-filter-driver.c:893
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr ""
 
-#: camel/camel-filter-driver.c:894 camel/camel-filter-driver.c:906
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:920 camel/camel-filter-driver.c:1021
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr ""
 
-#: camel/camel-filter-driver.c:988
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-driver.c:1003
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr ""
 
-#: camel/camel-filter-search.c:126
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr ""
 
-#: camel/camel-filter-search.c:543 camel/camel-filter-search.c:551
+#: camel/camel-filter-search.c:386
+msgid "Invalid arguments to (system-flag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:401
+msgid "Invalid arguments to (user-tag)"
+msgstr ""
+
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:332
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:342
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-folder-search.c:559 camel/camel-folder-search.c:587
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 msgid "(match-all) requires a single bool result"
 msgstr ""
 
-#: camel/camel-folder-search.c:638
-#, c-format
-msgid "Performing query on unknown header: %s"
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
+
+#: camel/camel-folder-search.c:784
+msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:750 camel/camel-folder-search.c:794
-msgid "Invalid type in body-contains, expecting string"
+#: camel/camel-folder-search.c:790
+msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder.c:471
+#: camel/camel-folder-search.c:879
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1040
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1080
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1262
+#: camel/camel-folder.c:1416
 msgid "Moving messages"
 msgstr ""
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-lock-client.c:124
-#, c-format
-msgid "Cannot fork locking helper: %s"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Adviertixhmint"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-lock-client.c:215
+#: camel/camel-gpg-context.c:722
 #, c-format
-msgid "Could not lock '%s'"
+msgid ""
+"Unexpected GnuPG status message encountered:\n"
+"\n"
+"%s"
 msgstr ""
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:91 camel/camel-lock.c:110
-#, c-format
-msgid "Could not create lock file for %s: %s"
+#: camel/camel-gpg-context.c:736
+msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-lock.c:150
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+#: camel/camel-gpg-context.c:760
+msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-lock.c:204
+#: camel/camel-gpg-context.c:774
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid ""
+"You need a passphrase to unlock the key for\n"
+"user: \"%s\""
 msgstr ""
 
-#: camel/camel-lock.c:266
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: mail/mail-send-recv.c:611
+msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-movemail.c:107
-#, c-format
-msgid "Could not check mail file %s: %s"
+#: camel/camel-gpg-context.c:809
+msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-movemail.c:121
+#: camel/camel-gpg-context.c:815
 #, c-format
-msgid "Could not open mail file %s: %s"
+msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:129
-#, c-format
-msgid "Could not open temporary mail file %s: %s"
+#: camel/camel-gpg-context.c:867
+msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-movemail.c:158
+#: camel/camel-gpg-context.c:1144
 #, c-format
-msgid "Failed to store mail in temp file %s: %s"
+msgid ""
+"Failed to GPG %s: %s\n"
+"\n"
+"%s"
 msgstr ""
 
-#: camel/camel-movemail.c:188
+#: camel/camel-gpg-context.c:1149
 #, c-format
-msgid "Could not create pipe: %s"
+msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-movemail.c:200
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, c-format
-msgid "Could not fork: %s"
+msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:238
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
-msgid "Movemail program failed: %s"
+msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:239
-msgid "(Unknown error)"
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
+msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-movemail.c:262
-#, c-format
-msgid "Error reading mail file: %s"
+#: camel/camel-gpg-context.c:1319
+msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-movemail.c:273
-#, c-format
-msgid "Error writing mail temp file: %s"
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
+msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-gpg-context.c:1420
 #, c-format
-msgid "Error copying mail temp file: %s"
+msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:193
+#: camel/camel-gpg-context.c:1508
 #, c-format
-msgid "Please enter your %s passphrase for %s"
+msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:196
-#, c-format
-msgid "Please enter your %s passphrase"
+#: camel/camel-gpg-context.c:1566
+msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-pgp-context.c:575
-msgid "Cannot sign this message: no plaintext to sign"
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
+msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-pgp-context.c:582 camel/camel-pgp-context.c:763
-msgid "Cannot sign this message: no password provided"
+#: camel/camel-gpg-context.c:1682
+msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-pgp-context.c:588 camel/camel-pgp-context.c:769
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:756
-msgid "Cannot sign this message: no plaintext to clearsign"
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:955
-msgid "Cannot verify this message: no plaintext to verify"
+#: 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 ""
 
-#: camel/camel-pgp-context.c:961
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
-#: camel/camel-pgp-context.c:972
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot verify this message: couldn't create temp file: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1145
-msgid "Cannot encrypt this message: no plaintext to encrypt"
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1155
-msgid "Cannot encrypt this message: no password provided"
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1162
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1171
-msgid "Cannot encrypt this message: no recipients specified"
+#: camel/camel-movemail.c:107
+#, c-format
+msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1340
-msgid "Cannot decrypt this message: no ciphertext to decrypt"
+#: camel/camel-movemail.c:120
+#, c-format
+msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1348
-msgid "Cannot decrypt this message: no password provided"
+#: camel/camel-movemail.c:128
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1355
+#: camel/camel-movemail.c:157
 #, c-format
-msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-pgp-mime.c:310
-msgid "This is a digitally signed message part"
+#: camel/camel-movemail.c:187
+#, c-format
+msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:197 camel/camel-smime-context.c:173
+#: camel/camel-movemail.c:199
 #, c-format
-msgid "Please enter your password for %s"
+msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:213
-msgid "Error hashing password."
+#: camel/camel-movemail.c:237
+#, c-format
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:222
-msgid "Invalid password."
+#: camel/camel-movemail.c:238
+msgid "(Unknown error)"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:329
+#: camel/camel-movemail.c:261
 #, c-format
-msgid "Could not sign: certificate not found for \"%s\"."
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:378
+#: camel/camel-movemail.c:272
 #, c-format
-msgid "Could not clearsign: certificate not found for \"%s\"."
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:567
-msgid "Could not encrypt: failed to create enveloped data."
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
+#, c-format
+msgid "Error copying mail temp file: %s"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:590
-msgid "Could not encrypt: failed to create encryption context."
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
+msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:620
-#, c-format
-msgid "Could not encrypt data: invalid user key: \"%s\"."
+#: camel/camel-multipart-encrypted.c:257
+msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:626
-msgid "Could not encrypt: encoding failed."
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+#, fuzzy
+msgid "parse error"
+msgstr "Nole aroke"
+
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-pkcs7-context.c:677
-msgid "Failed to decrypt: Unknown"
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-provider.c:130
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 
-#: camel/camel-provider.c:139
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr ""
 
-#: camel/camel-provider.c:147
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:203
-#, c-format
-msgid "%s server %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:207
-#, c-format
-msgid "%s service for %s on %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:264
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr ""
-
-#: camel/camel-remote-store.c:268
-msgid "(unknown host)"
-msgstr ""
-
-#: camel/camel-remote-store.c:358 camel/camel-remote-store.c:420
-#: camel/camel-remote-store.c:481
-#: camel/providers/imap/camel-imap-command.c:228
-#: camel/providers/imap/camel-imap-command.c:409
-msgid "Operation cancelled"
-msgstr "Operåcion rinonceye"
-
-#: camel/camel-remote-store.c:484
-#: camel/providers/imap/camel-imap-command.c:274
+#: camel/camel-provider.c:356 camel/camel-session.c:160
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:33
+#: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonime"
 
-#: 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 ""
 
-#: 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 ""
 
-#: camel/camel-sasl-anonymous.c:119
+#: camel/camel-sasl-anonymous.c:121
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:131
+#: camel/camel-sasl-anonymous.c:133
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-sasl-anonymous.c:143
+#: camel/camel-sasl-anonymous.c:145
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -7437,16439 +9326,8089 @@ msgid ""
 "the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:50
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr ""
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:40
-msgid "Kerberos 4"
+#: camel/camel-sasl-gssapi.c:48
+msgid "GSSAPI"
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:42
-msgid "This option will connect to the server using Kerberos 4 authentication."
+#: camel/camel-sasl-gssapi.c:50
+msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 
-#: camel/camel-sasl-kerberos4.c:161
-#, c-format
+#: camel/camel-sasl-gssapi.c:148
 msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:495
-msgid "Bad authentication response from server."
-msgstr ""
-
-#: camel/camel-sasl-login.c:32
-msgid "Login"
-msgstr "Login"
-
-#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
-msgid "This option will connect to the server using a simple password."
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
 msgstr ""
 
-#: camel/camel-sasl-login.c:127
-msgid "Unknown authentication state."
+#: camel/camel-sasl-gssapi.c:153
+msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:149
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:61
-msgid "Password"
-msgstr "Sicret"
-
-#: camel/camel-sasl-popb4smtp.c:34
-msgid "POP before SMTP"
-msgstr ""
-
-#: camel/camel-sasl-popb4smtp.c:36
-msgid "This option will authorise a POP connection before attempting SMTP"
-msgstr ""
-
-#: camel/camel-sasl-popb4smtp.c:107
-msgid "POP Source URI"
-msgstr ""
-
-#: camel/camel-sasl-popb4smtp.c:111
-msgid "POP Before SMTP auth using an unknown transport"
+#: camel/camel-sasl-gssapi.c:156
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:116
-msgid "POP Before SMTP auth using a non-pop source"
+#: camel/camel-sasl-gssapi.c:160
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
 msgstr ""
 
-#: camel/camel-search-private.c:113
-#, c-format
-msgid "Regular expression compilation failed: %s: %s"
+#: camel/camel-sasl-gssapi.c:165
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
 msgstr ""
 
-#: camel/camel-service.c:157
-#, c-format
-msgid "URL '%s' needs a username component"
+#: camel/camel-sasl-gssapi.c:169
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
 
-#: camel/camel-service.c:165
-#, c-format
-msgid "URL '%s' needs a host component"
+#: camel/camel-sasl-gssapi.c:174
+msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 
-#: camel/camel-service.c:173
-#, c-format
-msgid "URL '%s' needs a path component"
+#: camel/camel-sasl-gssapi.c:177
+msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 
-#: camel/camel-service.c:614
-#, c-format
-msgid "Resolving: %s"
+#: camel/camel-sasl-gssapi.c:180
+msgid "The consistency checks performed on the credential failed."
 msgstr ""
 
-#: camel/camel-service.c:641
-#, c-format
-msgid "Failure in name lookup: %s"
+#: camel/camel-sasl-gssapi.c:183
+msgid "The referenced credentials have expired."
 msgstr ""
 
-#: camel/camel-service.c:666
-#, c-format
-msgid "Host lookup failed: %s: host not found"
+#: 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:1236
+msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/camel-service.c:668
+#: camel/camel-sasl-gssapi.c:213
 #, c-format
-msgid "Host lookup failed: %s: unknown reason"
+msgid "Failed to resolve host `%s': %s"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
+#: camel/camel-sasl-gssapi.c:299
+#, fuzzy
+msgid "Unsupported security layer."
+msgstr "Operåcion nén sopoirtêye"
 
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
+#: camel/camel-sasl-kerberos4.c:41
+msgid "Kerberos 4"
 msgstr ""
 
-#: camel/camel-session.c:346 camel/camel-session.c:415
-#, c-format
-msgid "No provider available for protocol `%s'"
+#: camel/camel-sasl-kerberos4.c:43
+msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/camel-session.c:532
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
-"Could not create directory %s:\n"
+"Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/camel-smime-context.c:203
-msgid "Please indicate the nickname of a certificate to sign with."
-msgstr ""
-
-#: camel/camel-smime-context.c:209
-#, c-format
-msgid "The signature certificate for \"%s\" does not exist."
-msgstr ""
-
-#: camel/camel-smime-context.c:249
-#, c-format
-msgid "The encryption certificate for \"%s\" does not exist."
-msgstr ""
-
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
-#, c-format
-msgid "Failed to find certificate for \"%s\"."
-msgstr ""
+#: camel/camel-sasl-login.c:32
+msgid "Login"
+msgstr "Login"
 
-#: camel/camel-smime-context.c:556
-msgid "Failed to find a common bulk algorithm."
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
+msgid "This option will connect to the server using a simple password."
 msgstr ""
 
-#: camel/camel-smime-context.c:810
-msgid "Failed to decode message."
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
 msgstr ""
 
-#: camel/camel-smime-context.c:855
-msgid "Failed to verify certificates."
+#: camel/camel-sasl-ntlm.c:31
+msgid "NTLM / SPA"
 msgstr ""
 
-#: camel/camel-store.c:220
-msgid "Cannot get folder: Invalid operation on this store"
+#: camel/camel-sasl-ntlm.c:33
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
 msgstr ""
 
-#: camel/camel-store.c:282
-msgid "Cannot create folder: Invalid operation on this store"
+#: camel/camel-sasl-plain.c:32
+msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:519
-#, c-format
-msgid ""
-"Issuer: %s\n"
-"Subject: %s"
+#: camel/camel-sasl-popb4smtp.c:36
+msgid "POP before SMTP"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:524
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
+#: camel/camel-sasl-popb4smtp.c:38
+msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr ""
 
-#. issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &cert->derIssuer);
-#. valid_cert = issuer && CERT_VerifySignedData (&cert->signatureWrap, issuer, PR_Now (), NULL);
-#: camel/camel-tcp-stream-ssl.c:438
-#, c-format
-msgid ""
-"Issuer:            %s\n"
-"Subject:           %s\n"
-"Fingerprint:       %s\n"
-"Signature:         %s"
+#: camel/camel-sasl-popb4smtp.c:103
+msgid "POP Source URI"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
-msgid "GOOD"
+#: camel/camel-sasl-popb4smtp.c:106
+msgid "POP Before SMTP auth using an unknown transport"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:444
-msgid "BAD"
+#: camel/camel-sasl-popb4smtp.c:111
+msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
-#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:447
+#: camel/camel-search-private.c:114
 #, c-format
-msgid ""
-"SSL Certificate check for %s:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept?"
+msgid "Regular expression compilation failed: %s: %s"
 msgstr ""
 
-#: camel/camel-url.c:288
+#: camel/camel-service.c:271
 #, c-format
-msgid "Could not parse URL `%s'"
+msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-vee-folder.c:588
+#: camel/camel-service.c:275
 #, c-format
-msgid "No such message %s in %s"
+msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-vee-folder.c:749
+#: camel/camel-service.c:279
 #, c-format
-msgid "No such message: %s"
+msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-vee-store.c:258
+#: camel/camel-service.c:729
 #, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
+msgid "Resolving: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:293
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
-msgid "Cannot delete folder: %s: No such folder"
+msgid "Failure in name lookup: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:306
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
+msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-vee-store.c:314
+#: camel/camel-service.c:794
 #, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr ""
-
-#: camel/camel-vtrash-folder.c:117
-msgid "You cannot copy messages from this trash folder."
+msgid "Host lookup failed: %s: host not found"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:352
+#: camel/camel-service.c:797
 #, c-format
-msgid "Unexpected response from IMAP server: %s"
+msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:362
-#, c-format
-msgid "IMAP command failed: %s"
+#: camel/camel-service.c:851
+msgid "Resolving address"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:417
-msgid "Server response ended too soon."
+#: camel/camel-service.c:920
+msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:610
-#, c-format
-msgid "IMAP server response did not contain %s information"
+#: camel/camel-service.c:923
+msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:646
+#: camel/camel-session.c:282
 #, c-format
-msgid "Unexpected OK response from IMAP server: %s"
+msgid ""
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:197
+#: camel/camel-smime-context.c:104
 #, c-format
-msgid "Could not create directory %s: %s"
+msgid "Enter security pass-phrase for `%s'"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/camel-smime-context.c:261
 #, c-format
-msgid "Could not load summary for %s"
+msgid "Cannot find certificate for '%s'"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:282
-msgid "Folder was destroyed and recreated on server."
+#: camel/camel-smime-context.c:267
+msgid "Cannot create CMS message"
 msgstr ""
 
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:466
-msgid "Scanning for changed messages"
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1632
-#: camel/providers/imap/camel-imap-folder.c:2108
-msgid "This message is not currently available"
+#: camel/camel-smime-context.c:278
+msgid "Cannot attach CMS signedData"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1787
-#: camel/providers/imap/camel-imap-folder.c:1861
-msgid "Fetching summary information for new messages"
+#: camel/camel-smime-context.c:285
+msgid "Cannot attach CMS data"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1793
-msgid "Scanning for new messages"
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2145
-msgid "Could not find message body in FETCH response."
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:154
-#, c-format
-msgid "Could not open cache directory: %s"
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-message-cache.c:256
-#: camel/providers/imap/camel-imap-message-cache.c:313
-#: camel/providers/imap/camel-imap-message-cache.c:344
-#: camel/providers/imap/camel-imap-message-cache.c:376
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
 #, c-format
-msgid "Failed to cache message %s: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for new mail"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:45
-msgid "Check for new messages in all folders"
+msgid "Encryption cert for '%s' does not exist"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:925
-msgid "Folders"
-msgstr "Ridants"
-
-#: camel/providers/imap/camel-imap-provider.c:50
-msgid "Show only subscribed folders"
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:52
-msgid "Override server-supplied folder namespace"
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:54
-msgid "Namespace"
+#: camel/camel-smime-context.c:354
+msgid "Cannot add encryption certificate"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Apply filters to new messages in INBOX on this server"
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAP"
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
+msgid "Cannot create encoder context"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:65
-msgid "For reading and storing mail on IMAP servers."
+#: camel/camel-smime-context.c:436
+msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:82
-msgid "This option will connect to the IMAP server using a plaintext password."
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+msgid "Failed to encode data"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:518
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr ""
+#: camel/camel-smime-context.c:514
+#, fuzzy
+msgid "Unverified"
+msgstr "Nén defineye"
 
-#: camel/providers/imap/camel-imap-store.c:528
-#: camel/providers/smtp/camel-smtp-transport.c:393
-#, c-format
-msgid "No support for authentication type %s"
+#: camel/camel-smime-context.c:516
+msgid "Good signature"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:552
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
+#: camel/camel-smime-context.c:518
+msgid "Bad signature"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/smtp/camel-smtp-transport.c:434
-msgid "You didn't enter a password."
+#: camel/camel-smime-context.c:520
+msgid "Content tampered with or altered in transit"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:596
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
+#: camel/camel-smime-context.c:522
+msgid "Signing certificate not found"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:900
-#, c-format
-msgid "No such folder %s"
+#: camel/camel-smime-context.c:524
+msgid "Signing certificate not trusted"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
-msgid "The parent folder is not allowed to contain subfolders"
+#: camel/camel-smime-context.c:526
+msgid "Signature algorithm unknown"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:43
-msgid "MH-format mail directories"
+#: camel/camel-smime-context.c:528
+msgid "Signature algorithm unsupported"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:44
-msgid "For storing local mail in MH-like mail directories."
+#: camel/camel-smime-context.c:530
+msgid "Malformed signature"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:53
-msgid "Local delivery"
-msgstr ""
+#: camel/camel-smime-context.c:532
+#, fuzzy
+msgid "Processing error"
+msgstr "Mestî"
 
-#: camel/providers/local/camel-local-provider.c:54
-msgid "For retrieving local mail from standard mbox formated spools."
+#: camel/camel-smime-context.c:569
+msgid "No signedData in signature"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:63
-msgid "Apply filters to new messages in INBOX"
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:69
-msgid "Maildir-format mail directories"
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+msgid "Cannot calculate digests"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:70
-msgid "For storing local mail in maildir directories."
+#: camel/camel-smime-context.c:604
+msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:80
-msgid "Standard Unix mbox spools"
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+msgid "Certificate import failed"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:81
-msgid "For reading and storing local mail in standard mbox spool files."
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:91
-msgid "Directory tree of mbox files"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:92
-msgid ""
-"For accessing mail storedin an external tree of mbox files.\n"
-"This will allow you to directly access pine and elm folders.\n"
-"NOTE: This provider is still experimental so ensure you backup any mail "
-"folders first."
+#: camel/camel-smime-context.c:635
+msgid "Cannot find signature digests"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:109
+#: camel/camel-smime-context.c:651
 #, c-format
-msgid "Store root %s is not an absolute path"
+msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
-#, c-format
-msgid "Store root %s is not a regular directory"
+#: camel/camel-smime-context.c:752
+msgid "Decoder failed"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:153
-#: camel/providers/local/camel-local-store.c:169
-#: camel/providers/local/camel-local-store.c:235
+#: camel/camel-smime-context.c:804
 #, c-format
-msgid "Cannot get folder: %s: %s"
+msgid "Cannot find certificate for `%s'"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:184
-msgid "Local stores do not have an inbox"
+#: camel/camel-smime-context.c:811
+msgid "Cannot find common bulk encryption algorithm"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:196
-#, c-format
-msgid "Local mail file %s"
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:820
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:300 mail/mail-local.c:864
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
+#: camel/camel-smime-context.c:831
+msgid "Cannot create CMS Message"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:374
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
+#: camel/camel-smime-context.c:837
+msgid "Cannot create CMS EnvelopedData"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:384
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
+#: camel/camel-smime-context.c:843
+msgid "Cannot attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:367
-#, c-format
-msgid "Could not save summary: %s: %s"
+#: camel/camel-smime-context.c:849
+msgid "Cannot attach CMS data object"
 msgstr ""
 
-#: camel/providers/local/camel-local-summary.c:423
-#: camel/providers/local/camel-spool-summary.c:1157
-msgid "Unable to add message to summary: unknown reason"
+#: camel/camel-smime-context.c:858
+msgid "Cannot create CMS RecipientInfo"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:181
-msgid "Maildir append message cancelled"
+#: camel/camel-smime-context.c:863
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:184
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
+#: camel/camel-smime-context.c:888
+msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:221
-#: camel/providers/local/camel-maildir-folder.c:230
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-mh-folder.c:207
-#: camel/providers/local/camel-mh-folder.c:215
-#: camel/providers/local/camel-spool-folder.c:582
+#: camel/camel-smime-context.c:974
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-mbox-folder.c:331
-#: camel/providers/local/camel-mh-folder.c:198
-#: camel/providers/local/camel-spool-folder.c:582
-msgid "No such message"
+#: camel/camel-smime-context.c:981
+msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:231
-#: camel/providers/local/camel-mh-folder.c:216
-msgid "Invalid message contents"
+#: camel/camel-smime-context.c:1008
+msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:89
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
+#: camel/camel-smime-context.c:1016
+msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:109
-#: camel/providers/local/camel-mbox-store.c:100
-#: camel/providers/local/camel-mh-store.c:96
-#, c-format
-msgid "Folder `%s' does not exist."
+#: camel/camel-store.c:213
+msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:116
-#: camel/providers/local/camel-mh-store.c:102
+#: camel/camel-store.c:243
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:131
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/camel-store.c:297
+msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:166
-#: camel/providers/local/camel-maildir-store.c:203
-#: camel/providers/local/camel-mh-store.c:126
+#: camel/camel-store.c:325
 #, c-format
-msgid "Could not delete folder `%s': %s"
+msgid "Cannot create folder: %s: folder exists"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:167
-msgid "not a maildir directory"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:331
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
-msgid "Could not scan folder `%s': %s"
+msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:405
-#: camel/providers/local/camel-maildir-summary.c:526
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
-msgid "Cannot open maildir directory path: %s: %s"
+msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:151
-#: camel/providers/local/camel-spool-folder.c:277
-#, c-format
-msgid "Cannot create folder lock on %s: %s"
-msgstr ""
+#: camel/camel-store.c:777
+msgid "Trash"
+msgstr "Batch"
 
-#: camel/providers/local/camel-mbox-folder.c:208
-#: camel/providers/local/camel-spool-folder.c:459
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr ""
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Junk"
+msgstr "Djun"
 
-#: camel/providers/local/camel-mbox-folder.c:265
-msgid "Mail append cancelled"
+#: camel/camel-tcp-stream-openssl.c:568
+msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:268
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:570
+msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:347
-#: camel/providers/local/camel-mbox-folder.c:379
-#: camel/providers/local/camel-mbox-folder.c:391
-#: camel/providers/local/camel-spool-folder.c:598
-#: camel/providers/local/camel-spool-folder.c:630
-#: camel/providers/local/camel-spool-folder.c:642
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
+#: camel/camel-tcp-stream-openssl.c:572
+msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-spool-folder.c:631
-msgid "The folder appears to be irrecoverably corrupted."
+#: camel/camel-tcp-stream-openssl.c:574
+msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:392
-#: camel/providers/local/camel-spool-folder.c:643
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/camel-tcp-stream-openssl.c:576
+msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:93
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+#: camel/camel-tcp-stream-openssl.c:578
+msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:109
-#, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
+#: camel/camel-tcp-stream-openssl.c:580
+msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:118
-#: camel/providers/local/camel-mbox-store.c:145
-#, c-format
-msgid "`%s' is not a regular file."
+#: camel/camel-tcp-stream-openssl.c:582
+msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:137
-#: camel/providers/local/camel-mbox-store.c:160
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
+#: camel/camel-tcp-stream-openssl.c:584
+msgid "Certificate has expired"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:152
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
+#: camel/camel-tcp-stream-openssl.c:586
+msgid "CRL not yet valid"
 msgstr ""
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
-#: camel/providers/local/camel-mbox-summary.c:497
-#: camel/providers/local/camel-mbox-summary.c:698
-#: camel/providers/local/camel-spool-summary.c:378
-#: camel/providers/local/camel-spool-summary.c:643
-#: camel/providers/local/camel-spool-summary.c:935
-msgid "Storing folder"
+#: camel/camel-tcp-stream-openssl.c:588
+msgid "CRL has expired"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:253
-#: camel/providers/local/camel-spool-summary.c:383
-#, c-format
-msgid "Could not open folder: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:593
+msgid "Error in CRL"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:295
-#: camel/providers/local/camel-spool-summary.c:425
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-summary.c:370
-#: camel/providers/local/camel-spool-summary.c:497
-#, c-format
-msgid "Cannot check folder: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:595
+msgid "Out of memory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:648
-#, c-format
-msgid "Could not open file: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:597
+msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:519
-#: camel/providers/local/camel-spool-summary.c:672
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
+#: camel/camel-tcp-stream-openssl.c:599
+msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:544
-#: camel/providers/local/camel-mbox-summary.c:552
-#: camel/providers/local/camel-mbox-summary.c:741
-#: camel/providers/local/camel-mbox-summary.c:749
-#: camel/providers/local/camel-spool-summary.c:697
-#: camel/providers/local/camel-spool-summary.c:705
-#: camel/providers/local/camel-spool-summary.c:978
-#: camel/providers/local/camel-spool-summary.c:986
-msgid "Summary and folder mismatch, even after a sync"
+#: camel/camel-tcp-stream-openssl.c:601
+msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-spool-summary.c:749
-#, c-format
-msgid "Error writing to temp mailbox: %s"
+#: camel/camel-tcp-stream-openssl.c:603
+msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-spool-summary.c:771
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:605
+msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:630
-#: camel/providers/local/camel-mbox-summary.c:799
-#: camel/providers/local/camel-spool-summary.c:1036
-#, c-format
-msgid "Could not close source folder %s: %s"
+#: camel/camel-tcp-stream-openssl.c:607
+msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:639
-#, c-format
-msgid "Could not close temp folder: %s"
+#: camel/camel-tcp-stream-openssl.c:609
+msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not rename folder: %s"
+#: camel/camel-tcp-stream-openssl.c:611
+msgid "Path length exceeded"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:873
-#: camel/providers/local/camel-spool-summary.c:544
-#: camel/providers/local/camel-spool-summary.c:1110
-#, c-format
-msgid "Unknown error: %s"
-msgstr ""
+#: camel/camel-tcp-stream-openssl.c:613
+#, fuzzy
+msgid "Invalid purpose"
+msgstr "Nén valåbe"
 
-#: camel/providers/local/camel-mh-folder.c:172
-msgid "MH append message cancelled"
+#: camel/camel-tcp-stream-openssl.c:615
+msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/providers/local/camel-mh-folder.c:175
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:617
+msgid "Certificate rejected"
 msgstr ""
 
-#: camel/providers/local/camel-mh-store.c:109
-#, c-format
-msgid "`%s' is not a directory."
+#: camel/camel-tcp-stream-openssl.c:620
+msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/providers/local/camel-mh-summary.c:218
-#, c-format
-msgid "Cannot open MH directory path: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:622
+msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/providers/local/camel-spool-folder.c:515
-#, c-format
-msgid "Cannot append message to spool file: %s: %s"
+#: camel/camel-tcp-stream-openssl.c:624
+msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:115
-#, c-format
-msgid "Spool `%s' does not exist or is not a regular file"
+#: camel/camel-tcp-stream-openssl.c:626
+msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:141
-#, c-format
-msgid "Folder `%s/%s' does not exist."
+#: camel/camel-tcp-stream-openssl.c:629
+msgid "Error in application verification"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:163
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
-msgid "Spool mail file %s"
+msgid ""
+"Issuer:            %s\n"
+"Subject:           %s\n"
+"Fingerprint:       %s\n"
+"Signature:         %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:209
-msgid "Spool folders cannot be renamed"
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+msgid "GOOD"
 msgstr ""
 
-#: camel/providers/local/camel-spool-store.c:217
-msgid "Spool folders cannot be deleted"
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
+msgid "BAD"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:788
-#: camel/providers/local/camel-spool-summary.c:797
-#: camel/providers/local/camel-spool-summary.c:806
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:821
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+msgid ""
+"SSL Certificate check for %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept?"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:851
-#: camel/providers/local/camel-spool-summary.c:869
-#: camel/providers/local/camel-spool-summary.c:881
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
-"Folder may be corrupt, copy saved in `%s'"
+"Certificate problem: %s\n"
+"Issuer: %s"
 msgstr ""
 
-#: camel/providers/local/camel-spool-summary.c:940
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
-msgid "Could not file: %s: %s"
+msgid ""
+"Bad certificate domain: %s\n"
+"Issuer: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
+msgid ""
+"Certificate expired: %s\n"
+"Issuer: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:112
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
-msgid "Internal error: uid in invalid format: %s"
+msgid ""
+"Certificate revocation list expired: %s\n"
+"Issuer: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:153
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:439
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:502
-#: camel/providers/pop3/camel-pop3-folder.c:512
+#: camel/camel-url.c:292
 #, c-format
-msgid "Cannot get message %s: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/pop3/camel-pop3-folder.c:278
-#: camel/providers/pop3/camel-pop3-folder.c:437
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:510
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
+msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/camel-vee-folder.c:633
 #, c-format
-msgid "Unable to load grouplist file for %s: %s"
+msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/camel-vee-folder.c:675
 #, c-format
-msgid "Unable to save grouplist file for %s: %s"
+msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "USENET news"
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
+msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:144
+#: camel/camel-vee-store.c:374
 #, c-format
-msgid "USENET News via %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:151
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
+#: camel/camel-vee-store.c:396
 #, c-format
-msgid "No such folder: %s"
+msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
-#, c-format
-msgid "Could not get group: %s"
+#: camel/camel-vtrash-folder.c:44
+msgid "Cannot copy messages to the Trash folder"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
-#, c-format
-msgid "NNTP Command failed: %s"
+#: camel/camel-vtrash-folder.c:46
+msgid "Cannot copy messages to the Junk folder"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
-#, c-format
-msgid "%s: Scanning new messages"
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
+msgid "Checking for new mail"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
-#, c-format
-msgid "Unknown server response: %s"
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
+msgid "Check for new messages in all folders"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
-msgid "Use cancel"
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+msgid "Apply filters to new messages in Inbox on this server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
-#, c-format
-msgid "Operation failed: %s"
+#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Automatically synchronize remote mail locally"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:265
-msgid "Retrieving POP summary"
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:280
-#, c-format
-msgid "Cannot get POP summary: %s"
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:316
-msgid "Expunging deleted messages"
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
+msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:411
-#, c-format
-msgid "No message with uid %s"
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
+msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#. Sigh, most of the crap in this function is so that the cancel button
-#. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:418
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr ""
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+msgid "Password"
+msgstr "Sicret"
 
-#: camel/providers/pop3/camel-pop3-folder.c:502
-msgid "Unknown reason"
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/imap/camel-imap-provider.c:95
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr ""
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
+#, fuzzy
+msgid "Checklist"
+msgstr "djivêye"
 
-#: camel/providers/pop3/camel-pop3-provider.c:40
-msgid "Leave messages on server"
-msgstr ""
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3190
+msgid "Operation cancelled"
+msgstr "Operåcion rinonceye"
 
-#: camel/providers/pop3/camel-pop3-provider.c:43
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
-msgid "Delete after %s day(s)"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:60
-msgid "POP"
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "For connecting to and downloading mail from POP servers."
+msgid "Server unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:71
-msgid ""
-"This option will connect to the POP server using a plaintext password. This "
-"is the only option supported by many POP servers."
-msgstr ""
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Aroke nén cnoxhowe"
 
-#: camel/providers/pop3/camel-pop3-provider.c:81
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
+#, c-format
 msgid ""
-"This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that "
-"claim to support it."
+"Alert from IMAP server %s@%s:\n"
+"%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:172
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
-msgid "Could not connect to POP server on %s."
-msgstr ""
-
-#: camel/providers/pop3/camel-pop3-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:316
-msgid ""
-"Unable to connect to POP server.\n"
-"No support for requested authentication mechanism."
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:229
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
-msgid "SASL `%s' Login failed: %s"
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:240
-msgid "SASL Protocol error"
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:255
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
-msgid "I/O Error: %s"
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:276
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
-msgid "%sPlease enter the POP password for %s@%s"
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:327
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
-msgid ""
-"Unable to connect to POP server.\n"
-"Error sending password: %s"
+msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
-msgid "No such folder `%s'."
+msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:82
-msgid "Sendmail"
-msgstr "Sendmail"
-
-#: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid ""
-"For delivering mail by passing it to the \"sendmail\" program on the local "
-"system."
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:107
-#, c-format
-msgid "Could not create pipe to sendmail: %s: mail not sent"
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:124
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
-msgid "Could not fork sendmail: %s: mail not sent"
+msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:150
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
-msgid "Could not send message: %s"
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:163
-#, c-format
-msgid "sendmail exited with signal %s: mail not sent."
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:244
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
+msgid "No such message"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:170
-#, c-format
-msgid "Could not execute %s: mail not sent."
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
+msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:175
-#, c-format
-msgid "sendmail exited with status %d: mail not sent."
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
+msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:194
-msgid "Could not find 'From' address in message"
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:226
-msgid "Could not parse recipient list"
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:259
-msgid "sendmail"
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "Mail delivery via the sendmail program"
+#: camel/providers/imap/camel-imap-folder.c:2660
+msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:75
-msgid "SMTP"
-msgstr "SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, c-format
+msgid "Could not open cache directory: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
-msgid "Syntax error, command unrecognized"
+#: camel/providers/imap/camel-imap-message-cache.c:252
+#: camel/providers/imap/camel-imap-message-cache.c:309
+#: camel/providers/imap/camel-imap-message-cache.c:340
+#: camel/providers/imap/camel-imap-message-cache.c:372
+#, c-format
+msgid "Failed to cache message %s: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
-msgid "Syntax error in parameters or arguments"
+#: camel/providers/imap/camel-imap-message-cache.c:417
+#, c-format
+msgid "Failed to cache %s: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
-msgid "Command not implemented"
+#: camel/providers/imap/camel-imap-provider.c:43
+msgid "Checking for New Mail"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
-msgid "Command parameter not implemented"
+#: camel/providers/imap/camel-imap-provider.c:48
+msgid "Connection to Server"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
-msgid "System status, or system help reply"
+#: camel/providers/imap/camel-imap-provider.c:50
+msgid "Use custom command to connect to server"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
-msgid "Help message"
-msgstr ""
+#: camel/providers/imap/camel-imap-provider.c:52
+#, fuzzy
+msgid "Command:"
+msgstr "Eterprijhe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
-msgid "Service ready"
-msgstr ""
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Ridants"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
-msgid "Service closing transmission channel"
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
-msgid "Service not available, closing transmission channel"
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
-msgid "Requested mail action okay, completed"
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
-msgid "User not local; will forward to <forward-path>"
+#: camel/providers/imap/camel-imap-provider.c:64
+msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
-msgid "Requested mail action not taken: mailbox unavailable"
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
-msgid "Requested action not taken: mailbox unavailable"
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
-msgid "Requested action aborted: error in processing"
+#: camel/providers/imap/camel-imap-provider.c:76
+msgid "IMAP"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
-msgid "User not local; please try <forward-path>"
+#: camel/providers/imap/camel-imap-provider.c:78
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
-msgid "Requested action not taken: insufficient system storage"
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "Sierveu LDAP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
-msgid "Requested mail action aborted: exceeded storage allocation"
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
-msgid "Requested action not taken: mailbox name not allowed"
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
-msgid "Start mail input; end with <CRLF>.<CRLF>"
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
-msgid "Transaction failed"
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
-msgid "A password transition is needed"
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
-msgid "Authentication mechanism is too weak"
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
+msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
-msgid "Encryption required for requested authentication mechanism"
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
+msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
-msgid "Temporary authentication failure"
+#: camel/providers/imap/camel-imap-store.c:844
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
-msgid "Authentication required"
+#: camel/providers/imap/camel-imap-store.c:1268
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:320
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
-msgid "Welcome response error: %s: possibly non-fatal"
+msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:383
+#: camel/providers/imap/camel-imap-store.c:1301
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
-msgid "SMTP server %s does not support requested authentication type %s"
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:421
-#, c-format
-msgid "%sPlease enter the SMTP password for %s@%s"
+#: camel/providers/imap/camel-imap-store.c:1315
+msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:442
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
-"Unable to authenticate to SMTP server.\n"
+"Unable to authenticate to IMAP server.\n"
 "%s\n"
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:565
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
-msgid "SMTP server %s"
+msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:567
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
 #, c-format
-msgid "SMTP mail delivery via %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:591
-msgid "Cannot send message: sender address not defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:598
-msgid "Cannot send message: sender address not valid."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:603 mail/mail-ops.c:603
-msgid "Sending message"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:614
-msgid "Cannot send message: no recipients defined."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:624
-msgid "Cannot send message: one or more invalid recipients"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
-msgid "SMTP Greeting"
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:820
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
 #, c-format
-msgid "HELO request timed out: %s: non-fatal"
+msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:840
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
-msgid "HELO response error: %s: non-fatal"
+msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:884
-msgid "SMTP Authentication"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:890
-msgid "Error creating SASL authentication object."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:905
-#: camel/providers/smtp/camel-smtp-transport.c:917
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
 #, c-format
-msgid "AUTH request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:926
-msgid "AUTH request failed."
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:974
-msgid "Bad authentication response from server.\n"
+msgid "Failed sending command to IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1000
+#: camel/providers/imap4/camel-imap4-command.c:656
 #, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1014
-msgid "MAIL FROM response error"
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/imap4/camel-imap4-engine.c:232
 #, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
+msgid "Unexpected greeting from IMAP server %s."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/imap4/camel-imap4-engine.c:416
 #, c-format
-msgid "RCPT TO <%s> failed"
+msgid "Cannot select folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1091
+#: camel/providers/imap4/camel-imap4-engine.c:422
 #, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
-
-#. we should have gotten instructions on how to use the DATA command:
-#. * 354 Enter mail, end with "." on a line by itself
-#.
-#: camel/providers/smtp/camel-smtp-transport.c:1105
-msgid "DATA response error"
+msgid "Cannot select folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#: camel/providers/smtp/camel-smtp-transport.c:1163
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
 #, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1177
-msgid "DATA termination response error"
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1200
+#: camel/providers/imap4/camel-imap4-folder.c:359
 #, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1214
-msgid "RSET response error"
+msgid "Cannot sync flags to folder `%s': Unknown"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/imap4/camel-imap4-folder.c:365
 #, c-format
-msgid "QUIT request timed out: %s: non-fatal"
+msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
-msgid "QUIT response error"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:101
-msgid "1 byte"
-msgstr "1 octet"
-
-#: composer/e-msg-composer-attachment-bar.c:103
+#: camel/providers/imap4/camel-imap4-folder.c:502
 #, c-format
-msgid "%u bytes"
-msgstr "%u octets"
-
-#: composer/e-msg-composer-attachment-bar.c:110
-#, c-format
-msgid "%.1fK"
+msgid "Cannot expunge folder `%s': Unknown"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:114
+#: camel/providers/imap4/camel-imap4-folder.c:507
 #, c-format
-msgid "%.1fM"
+msgid "Cannot expunge folder `%s': Bad command"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:118
+#: camel/providers/imap4/camel-imap4-folder.c:697
 #, c-format
-msgid "%.1fG"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:361 mail/mail-display.c:147
-msgid "attachment"
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:506
-msgid "Remove selected items from the attachment list"
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:537
-msgid "Add attachment..."
-msgstr ""
-
-#: composer/e-msg-composer-attachment-bar.c:538
-msgid "Attach a file to the message"
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: camel/providers/imap4/camel-imap4-folder.c:827
 #, c-format
-msgid "Cannot attach file %s: %s"
+msgid "Cannot append message to folder `%s': Unknown error"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:176
+#: camel/providers/imap4/camel-imap4-folder.c:856
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
+msgid "Cannot append message to folder `%s': Bad command"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:1
-msgid "Attachment properties"
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "File name:"
-msgstr "No do fitchî:"
-
-#: composer/e-msg-composer-attachment.glade.h:4
-msgid "MIME type:"
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:180
-msgid "Suggest automatic display of attachment"
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
-msgid "Click here for the address book"
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:356
-msgid "From:"
-msgstr "Di:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:362
-msgid "Reply-To:"
-msgstr "Responde a:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:373
-msgid "Subject:"
-msgstr "Sudjet:"
-
-#: composer/e-msg-composer-hdrs.c:387
-msgid "To:"
-msgstr "A:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the recipients of the message"
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid "Enter the addresses that will receive a carbon copy of the message"
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:395
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:396
+#: camel/providers/imap4/camel-imap4-provider.c:72
 msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-
-#: composer/e-msg-composer-select-file.c:291
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 
-#: composer/e-msg-composer.c:710
+#: camel/providers/imap4/camel-imap4-store.c:271
 #, c-format
 msgid ""
-"Error while reading file %s:\n"
-"%s"
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr ""
 
-#: composer/e-msg-composer.c:927
-msgid "Save as..."
-msgstr "Schaper et rlomer..."
-
-#: composer/e-msg-composer.c:936
-msgid "Warning!"
-msgstr ""
-
-#: composer/e-msg-composer.c:940
-msgid "File exists, overwrite?"
-msgstr "Li fitchî egzisteye dedja, el sipotchî?"
-
-#: composer/e-msg-composer.c:962
+#: camel/providers/imap4/camel-imap4-store.c:383
 #, c-format
-msgid "Error saving file: %s"
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 
-#: composer/e-msg-composer.c:981
+#: camel/providers/imap4/camel-imap4-store.c:428
 #, c-format
-msgid "Error loading file: %s"
+msgid "%sPlease enter the IMAP password for %s on host %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1012
+#: camel/providers/imap4/camel-imap4-store.c:502
 #, c-format
-msgid "Error accessing file: %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1020
-msgid "Unable to retrieve message from editor"
+msgid "Cannot authenticate to IMAP server %s using %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1027
+#: camel/providers/imap4/camel-imap4-store.c:733
 #, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
-#: composer/e-msg-composer.c:1034
+#: camel/providers/imap4/camel-imap4-store.c:847
 #, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
+msgid "Cannot create folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: composer/e-msg-composer.c:1043
+#: camel/providers/imap4/camel-imap4-store.c:853
 #, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
-msgstr ""
-
-#: composer/e-msg-composer.c:1145
-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:1303
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1310
-msgid "Warning: Modified Message"
-msgstr ""
-
-#: composer/e-msg-composer.c:1333
-msgid "Open file"
-msgstr "Drovi on fitchî"
-
-#: composer/e-msg-composer.c:1482
-msgid "Insert File"
-msgstr "Sititchî on fitchî"
-
-#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2462
-msgid "Compose a message"
-msgstr ""
-
-#: composer/e-msg-composer.c:2479
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-
-#: composer/e-msg-composer.c:2502 composer/e-msg-composer.c:2557
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-
-#: composer/evolution-composer.c:383
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:398
-msgid "Cannot initialize Evolution's composer."
-msgstr ""
-
-#: data/evolution.desktop.in.h:1
-msgid "The Evolution groupware suite"
-msgstr ""
-
-#: data/evolution.desktop.in.h:2
-msgid "Ximian Evolution"
-msgstr ""
-
-#: data/evolution.keys.in.h:1
-msgid "address card"
+msgid "Cannot create folder `%s': Bad command"
 msgstr ""
 
-#: data/evolution.keys.in.h:2
-msgid "calendar information"
-msgstr ""
-
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr ""
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr ""
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr ""
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr ""
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr ""
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr ""
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr ""
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr ""
-
-#. Remember the password?
-#: e-util/e-passwords.c:360 mail/mail-session.c:269
-msgid "Remember this password"
-msgstr "Si rmimbrer di ci scret chal"
-
-#: e-util/e-passwords.c:362 mail/mail-session.c:270
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: e-util/e-pilot-settings.c:96
-msgid "Sync Private Records:"
-msgstr ""
-
-#: e-util/e-pilot-settings.c:105
-msgid "Sync Categories:"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
-msgid "%a %m/%d/%Y %H:%M"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:178
-msgid "%a %m/%d/%Y %I %p"
-msgstr ""
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:183
-msgid "%a %m/%d/%Y %H"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:194
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:198
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:203
-msgid "%m/%d/%Y %I:%M %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:208
-msgid "%m/%d/%Y %H:%M"
-msgstr ""
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: e-util/e-time-utils.c:213
-msgid "%m/%d/%Y %I %p"
-msgstr ""
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: e-util/e-time-utils.c:218
-msgid "%m/%d/%Y %H"
-msgstr ""
-
-#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:320
-msgid "%I %p"
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr ""
-
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:125
-msgid "Select a service"
-msgstr ""
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
+#: camel/providers/imap4/camel-imap4-store.c:884
 #, c-format
-msgid "Open %s with the default GNOME application"
+msgid "Cannot delete folder `%s': Special folder"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
+#: camel/providers/imap4/camel-imap4-store.c:943
 #, c-format
-msgid "Open %s with the default GNOME web browser"
+msgid "Cannot delete folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:71
+#: camel/providers/imap4/camel-imap4-store.c:948
 #, c-format
-msgid "Send an email to %s"
+msgid "Cannot delete folder `%s': Bad command"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:72
+#: camel/providers/imap4/camel-imap4-store.c:968
 #, c-format
-msgid "Change the view to %s"
+msgid "Cannot rename folder `%s' to `%s': Special folder"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:73
+#: camel/providers/imap4/camel-imap4-store.c:1000
 #, c-format
-msgid "Run %s"
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:75
+#: camel/providers/imap4/camel-imap4-store.c:1005
 #, c-format
-msgid "Close %s"
+msgid "Cannot rename folder `%s' to `%s': Bad command"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:76
+#: camel/providers/imap4/camel-imap4-store.c:1253
 #, c-format
-msgid "Move %s to the left"
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:78
+#: camel/providers/imap4/camel-imap4-store.c:1331
 #, c-format
-msgid "Move %s into the previous row"
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:79
+#: camel/providers/imap4/camel-imap4-store.c:1336
 #, c-format
-msgid "Move %s into the next row"
+msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:80
+#: camel/providers/imap4/camel-imap4-store.c:1396
 #, c-format
-msgid "Configure %s"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr ""
 
-#: executive-summary/component/e-summary.c:925
+#: camel/providers/imap4/camel-imap4-store.c:1401
 #, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
+msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr ""
 
-#: executive-summary/component/e-summary.c:939
+#: camel/providers/imap4/camel-imap4-utils.c:250
 #, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
+msgid "Unexpected token in response from IMAP server %s: "
 msgstr ""
 
-#: executive-summary/component/main.c:61
-msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
-msgstr ""
-
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Dakota bijhrece"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
-msgid "RDF Summary"
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
-msgid "Factory for the test bonobo component."
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
-msgid "Factory for the test component."
+#: camel/providers/imapp/camel-imapp-provider.c:47
+msgid "IMAP+"
 msgstr ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
+#: 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 ""
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
+#: camel/providers/imapp/camel-imapp-store.c:328
+#, c-format
+msgid "Could not connect to POP server on %s"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
-msgid "Error"
-msgstr "Aroke"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
+#: camel/providers/local/camel-local-folder.c:179
+msgid "Index message body data"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr ""
+#. $HOME relative path + protocol string
+#: camel/providers/local/camel-local-folder.c:388
+#, fuzzy, c-format
+msgid "~%s (%s)"
+msgstr "%s a %s"
 
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
+#. /var/spool/mail relative path + protocol
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
+#, c-format
+msgid "mailbox:%s (%s)"
 msgstr ""
 
-#: filter/filter-datespec.c:80
-msgid "year"
-msgstr "anêye"
-
-#: filter/filter-datespec.c:80
-msgid "years"
-msgstr "anêyes"
-
-#: filter/filter-datespec.c:81
-msgid "month"
-msgstr "moes"
-
-#: filter/filter-datespec.c:81
-msgid "months"
-msgstr "moes"
-
-#: filter/filter-datespec.c:82
-msgid "week"
-msgstr "samwinne"
-
-#: filter/filter-datespec.c:82
-msgid "weeks"
-msgstr "samwinnes"
-
-#: filter/filter-datespec.c:84
-msgid "hour"
-msgstr "eure"
-
-#: filter/filter-datespec.c:85
-msgid "minute"
-msgstr "munute"
-
-#: filter/filter-datespec.c:86
-msgid "second"
-msgstr "segonde"
-
-#: filter/filter-datespec.c:86
-msgid "seconds"
-msgstr "segondes"
+#. a full path + protocol
+#: camel/providers/local/camel-local-folder.c:399
+#, fuzzy, c-format
+msgid "%s (%s)"
+msgstr "%s a %s"
 
-#: filter/filter-datespec.c:194
-msgid "You have forgotten to choose a date."
+#: camel/providers/local/camel-local-provider.c:43
+msgid "Use the `.folders' folder summary file (exmh)"
 msgstr ""
 
-#: filter/filter-datespec.c:196
-msgid "You have chosen an invalid date."
+#: camel/providers/local/camel-local-provider.c:49
+msgid "MH-format mail directories"
 msgstr ""
 
-#: filter/filter-datespec.c:271
-msgid ""
-"The message's date will be compared against\n"
-"whatever the time is when the filter is run\n"
-"or vfolder is opened."
+#: camel/providers/local/camel-local-provider.c:50
+msgid "For storing local mail in MH-like mail directories."
 msgstr ""
 
-#: filter/filter-datespec.c:294
-msgid ""
-"The message's date will be compared against\n"
-"the time that you specify here."
+#: camel/providers/local/camel-local-provider.c:65
+msgid "Local delivery"
 msgstr ""
 
-#: filter/filter-datespec.c:334
+#: camel/providers/local/camel-local-provider.c:66
 msgid ""
-"The message's date will be compared against\n"
-"a time relative to when the filter is run;\n"
-"\"a week ago\", for example."
-msgstr ""
-
-#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:369
-msgid "the current time"
-msgstr ""
-
-#: filter/filter-datespec.c:369
-msgid "a time you specify"
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr ""
 
-#: filter/filter-datespec.c:370
-msgid "a time relative to the current time"
-msgstr ""
-
-#. The dialog
-#: filter/filter-datespec.c:394
-msgid "Select a time to compare against"
-msgstr ""
-
-#. The label
-#: filter/filter-datespec.c:428
-msgid "Compare against"
-msgstr ""
-
-#: filter/filter-datespec.c:546 filter/filter-datespec.c:725
-msgid "now"
-msgstr "asteure"
-
-#: filter/filter-datespec.c:575
-msgid " ago"
+#: camel/providers/local/camel-local-provider.c:77
+#: camel/providers/local/camel-local-provider.c:94
+msgid "Apply filters to new messages in INBOX"
 msgstr ""
 
-#: filter/filter-datespec.c:621
-msgid "ago"
+#: camel/providers/local/camel-local-provider.c:83
+msgid "Maildir-format mail directories"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:996
-msgid "%b %d %l:%M %p"
+#: camel/providers/local/camel-local-provider.c:84
+msgid "For storing local mail in maildir directories."
 msgstr ""
 
-#: filter/filter-datespec.c:722
-msgid "<click here to select a date>"
+#: camel/providers/local/camel-local-provider.c:95
+msgid "Store status headers in Elm/Pine/Mutt format"
 msgstr ""
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:3
-msgid "Filter Rules"
-msgstr "Rîles po les passetes"
-
-#. and now for the action area
-#: filter/filter-filter.c:488
-msgid "Then"
+#: camel/providers/local/camel-local-provider.c:101
+msgid "Standard Unix mbox spool or directory"
 msgstr ""
 
-#: filter/filter-filter.c:502
-msgid "Add action"
-msgstr "Radjouter accion"
-
-#: filter/filter-folder.c:156
+#: camel/providers/local/camel-local-provider.c:102
 msgid ""
-"You forgot to choose a folder.\n"
-"Please go back and specify a valid folder to deliver mail to."
+"For reading and storing local mail in external standard mbox spool files.\n"
+"May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: filter/filter-folder.c:239 filter/vfolder-rule.c:365
-#: mail/mail-account-gui.c:849
-msgid "Select Folder"
-msgstr "Tchoezi ridant"
-
-#: filter/filter-folder.c:274
-msgid "Enter folder URI"
-msgstr ""
-
-#: filter/filter-folder.c:321
-msgid "<click here to select a folder>"
-msgstr ""
-
-#: filter/filter-input.c:198
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
+#: camel/providers/local/camel-mbox-store.c:355
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-
-#: filter/filter-part.c:518 shell/evolution-test-component.c:41
-msgid "Test"
-msgstr "Sayî"
-
-#: filter/filter-rule.c:217
-msgid "You must name this filter."
-msgstr ""
-
-#: filter/filter-rule.c:721
-msgid "Rule name: "
-msgstr ""
-
-#: filter/filter-rule.c:725
-msgid "Untitled"
-msgstr "Sins tite"
-
-#: filter/filter-rule.c:742
-msgid "If"
-msgstr ""
-
-#: filter/filter-rule.c:760
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:764
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:769
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:780
-msgid "Add criterion"
-msgstr ""
-
-#: filter/filter-rule.c:865
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:865
-msgid "outgoing"
-msgstr ""
-
-#: filter/filter.glade.h:1
-msgid "Edit Filters"
-msgstr ""
-
-#: filter/filter.glade.h:2
-msgid "Edit VFolders"
-msgstr ""
-
-#: filter/filter.glade.h:4
-msgid "Incoming"
-msgstr "Intrêye"
-
-#: filter/filter.glade.h:5
-msgid "Outgoing"
-msgstr "Rexhowe"
-
-#: filter/filter.glade.h:6 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr ""
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr ""
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr ""
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr ""
-
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Disfacé"
-
-#: filter/libfilter-i18n.h:10
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
-msgid "Draft"
-msgstr "Brouyon"
-
-#: filter/libfilter-i18n.h:12
-msgid "Execute Shell Command"
-msgstr "Enonder ene kimande do shell"
-
-#: filter/libfilter-i18n.h:13
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "Important"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "Read"
-msgstr "Lere"
-
-#: filter/libfilter-i18n.h:22
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:8
-msgid "Score"
-msgstr "Ponts"
-
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1552
-msgid "Sender"
-msgstr "Evoyeu"
-
-#: filter/libfilter-i18n.h:27
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:932
-#: mail/message-list.etspec.h:12
-msgid "Subject"
-msgstr "Sudjet"
-
-#: filter/libfilter-i18n.h:34
-msgid "contains"
-msgstr "contént"
-
-#: filter/libfilter-i18n.h:35
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "is greater than"
+msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
-msgid "is less than"
+#: camel/providers/local/camel-local-store.c:149
+#, c-format
+msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
-msgid "is not Flagged"
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
+#, c-format
+msgid "Cannot get folder: %s: %s"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "is not"
+#: camel/providers/local/camel-local-store.c:178
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is"
+#: camel/providers/local/camel-local-store.c:224
+#, c-format
+msgid "Local mail file %s"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
+#: camel/providers/local/camel-local-store.c:333
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
+#: camel/providers/local/camel-local-store.c:398
+#, c-format
+msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: filter/rule-editor.c:179
-msgid "Rules"
-msgstr "Rîles"
-
-#: filter/rule-editor.c:287
-msgid "Add Rule"
+#: camel/providers/local/camel-local-store.c:423
+#: camel/providers/local/camel-mbox-store.c:284
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
 msgstr ""
 
-#: filter/rule-editor.c:360
-msgid "Edit Rule"
+#: camel/providers/local/camel-local-store.c:433
+#: camel/providers/local/camel-mbox-store.c:296
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
 msgstr ""
 
-#: filter/score-editor.c:130
-msgid "Score Rules"
+#: camel/providers/local/camel-local-store.c:456
+#: camel/providers/local/camel-mbox-store.c:320
+#, c-format
+msgid "Could not delete folder meta file `%s': %s"
 msgstr ""
 
-#: filter/vfolder-rule.c:204
-msgid "You must name this vfolder."
+#: camel/providers/local/camel-local-summary.c:405
+#, c-format
+msgid "Could not save summary: %s: %s"
 msgstr ""
 
-#: filter/vfolder-rule.c:213
-msgid "You need to to specify at least one folder as a source."
+#: camel/providers/local/camel-local-summary.c:464
+msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: importers/elm-importer.c:95
-msgid "Evolution is importing your old Elm mail"
-msgstr ""
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Messaedjes en intrêye"
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:107
-#: importers/pine-importer.c:101
-msgid "Importing..."
+#: camel/providers/local/camel-maildir-folder.c:214
+msgid "Maildir append message cancelled"
 msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:109
-#: importers/pine-importer.c:103
-msgid "Please wait"
-msgstr "Tårdjîz on pô, s' i vs plait"
-
-#: importers/elm-importer.c:169 importers/netscape-importer.c:689
-#: importers/pine-importer.c:365
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
-msgid "Importing %s as %s"
+msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:782
-#: importers/pine-importer.c:471
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
 #, c-format
-msgid "Scanning %s"
-msgstr ""
-
-#: importers/elm-importer.c:525 importers/netscape-importer.c:958
-#: importers/pine-importer.c:637 mail/component-factory.c:100
-msgid "Mail"
-msgstr "Emile"
-
-#: importers/elm-importer.c:545
-msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: importers/elm-importer.c:574
-msgid "Elm"
-msgstr "Elm"
-
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-msgid "Addressbook"
-msgstr "Calpin d' adresses"
-
-#: importers/evolution-gnomecard-importer.c:246
 msgid ""
-"Evolution has found GnomeCard files.\n"
-"Would you like them to be imported into Evolution?"
+"Cannot get message: %s from folder %s\n"
+"  %s"
 msgstr ""
 
-#: importers/netscape-importer.c:106
-msgid "Evolution is importing your old Netscape data"
+#: camel/providers/local/camel-maildir-folder.c:267
+msgid "Invalid message contents"
 msgstr ""
 
-#: importers/netscape-importer.c:888 importers/pine-importer.c:570
-msgid "Scanning directory"
+#: camel/providers/local/camel-maildir-store.c:109
+#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mh-store.c:204
+#, c-format
+msgid "Cannot get folder `%s': %s"
 msgstr ""
 
-#: importers/netscape-importer.c:897
-msgid "Starting import"
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mh-store.c:211
+#, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr ""
 
-#: importers/netscape-importer.c:963
-msgid "Settings"
-msgstr "Apontiaedjes"
-
-#: importers/netscape-importer.c:984
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+#: camel/providers/local/camel-maildir-store.c:121
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, c-format
+msgid "Cannot create folder `%s': %s"
 msgstr ""
 
-#: importers/pine-importer.c:100
-msgid "Evolution is importing your old Pine data"
+#: camel/providers/local/camel-maildir-store.c:136
+#, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr ""
 
-#: importers/pine-importer.c:663
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
+#: camel/providers/local/camel-mh-store.c:260
+#, c-format
+msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: importers/pine-importer.c:691
-msgid "Pine"
+#: camel/providers/local/camel-maildir-store.c:177
+msgid "not a maildir directory"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1 notes/GNOME_Evolution_Notes.oaf.in.h:2
-msgid "Evolution component for handling mail."
+#: camel/providers/local/camel-maildir-store.c:355
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
+#, c-format
+msgid "Could not scan folder `%s': %s"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-msgid "Evolution mail composer."
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
+#, c-format
+msgid "Cannot open maildir directory path: %s: %s"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-msgid "Evolution mail executive summary component."
+#: camel/providers/local/camel-maildir-summary.c:543
+msgid "Checking folder consistency"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-msgid "Evolution mail folder display component."
+#: camel/providers/local/camel-maildir-summary.c:646
+msgid "Checking for new messages"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-msgid "Evolution mail folder factory component."
+#: camel/providers/local/camel-maildir-summary.c:735
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
+#: camel/providers/local/camel-spool-summary.c:137
+msgid "Storing folder"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-msgid "Factory for the Evolution composer."
+#: 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 ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Mail Summary component."
+#: camel/providers/local/camel-mbox-folder.c:284
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-msgid "Mail configuration interface"
+#: camel/providers/local/camel-mbox-folder.c:344
+msgid "Mail append cancelled"
 msgstr ""
 
-#: mail/component-factory.c:100
-msgid "Folder containing mail"
+#: camel/providers/local/camel-mbox-folder.c:347
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: mail/component-factory.c:101
-msgid "Mail storage folder (internal)"
+#: camel/providers/local/camel-mbox-folder.c:468
+msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: mail/component-factory.c:102
-msgid "Virtual Trash"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
 msgstr ""
 
-#: mail/component-factory.c:102
-msgid "Virtual Trash folder"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+msgid "Cannot create a folder by this name."
 msgstr ""
 
-#: mail/component-factory.c:129
+#: camel/providers/local/camel-mbox-store.c:206
 #, c-format
-msgid "Cannot connect to store: %s"
-msgstr ""
-
-#: mail/component-factory.c:147
-msgid "This folder cannot contain messages."
-msgstr ""
-
-#: mail/component-factory.c:439
-msgid "Properties..."
-msgstr "Prôpietés..."
-
-#: mail/component-factory.c:439
-msgid "Change this folder's properties"
+msgid "Cannot get folder `%s': not a regular file."
 msgstr ""
 
-#: mail/component-factory.c:800
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
+#, c-format
 msgid ""
-"Some of your mail settings seem corrupt, please check that everything is in "
-"order."
+"Could not delete folder `%s':\n"
+"%s"
 msgstr ""
 
-#: mail/component-factory.c:971
-msgid "New Mail Message"
+#: camel/providers/local/camel-mbox-store.c:255
+#, c-format
+msgid "`%s' is not a regular file."
 msgstr ""
 
-#: mail/component-factory.c:971 ui/evolution-mail-global.xml.h:19
-msgid "_Mail Message"
+#: camel/providers/local/camel-mbox-store.c:262
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: mail/component-factory.c:998
-msgid "Cannot initialize Evolution's mail component."
+#: camel/providers/local/camel-mbox-store.c:374
+#, c-format
+msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: mail/component-factory.c:1007
-msgid "Cannot initialize Evolution's mail config component."
+#: camel/providers/local/camel-mbox-store.c:388
+#, c-format
+msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: mail/component-factory.c:1013
-msgid "Cannot initialize Evolution's folder info component."
+#: camel/providers/local/camel-mbox-store.c:390
+msgid "Folder already exists"
 msgstr ""
 
-#: mail/component-factory.c:1229
-msgid "Cannot register storage with shell"
+#: camel/providers/local/camel-mbox-store.c:472
+msgid "The new folder name is illegal."
 msgstr ""
 
-#: mail/folder-browser-ui.c:327
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
-msgid "Properties for \"%s\""
+msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 
-#: mail/folder-browser-ui.c:329
-msgid "Properties"
-msgstr "Prôpietés"
-
-#: mail/folder-browser.c:299 mail/mail-display.c:310 mail/mail-display.c:819
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
-msgid "Could not create temporary directory: %s"
+msgid "Could not rename '%s' to %s: %s"
 msgstr ""
 
-#: mail/folder-browser.c:754
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
-msgid "%d new"
+msgid "Could not open folder: %s: %s"
 msgstr ""
 
-#: mail/folder-browser.c:757 mail/folder-browser.c:765
-#: mail/folder-browser.c:768
-msgid ", "
-msgstr ", "
-
-#: mail/folder-browser.c:759
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
-msgid "%d hidden"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: mail/folder-browser.c:761
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
-msgid "%d visible"
+msgid "Cannot check folder: %s: %s"
 msgstr ""
 
-#: mail/folder-browser.c:766
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
-msgid "%d selected"
+msgid "Could not open file: %s: %s"
 msgstr ""
 
-#: mail/folder-browser.c:771
+#: camel/providers/local/camel-mbox-summary.c:559
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
-msgid "%d unsent"
+msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: mail/folder-browser.c:773
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
-msgid "%d sent"
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: mail/folder-browser.c:775
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
-msgid "%d total"
-msgstr ""
-
-#: mail/folder-browser.c:1062
-msgid "Create vFolder from Search"
-msgstr ""
-
-#: mail/folder-browser.c:1446
-msgid "VFolder on _Subject"
-msgstr ""
-
-#: mail/folder-browser.c:1447
-msgid "VFolder on Se_nder"
-msgstr ""
-
-#: mail/folder-browser.c:1448
-msgid "VFolder on _Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:1449
-msgid "VFolder on Mailing _List"
-msgstr ""
-
-#: mail/folder-browser.c:1453
-msgid "Filter on Sub_ject"
-msgstr ""
-
-#: mail/folder-browser.c:1454
-msgid "Filter on Sen_der"
-msgstr ""
-
-#: mail/folder-browser.c:1455
-msgid "Filter on Re_cipients"
-msgstr ""
-
-#: mail/folder-browser.c:1456
-msgid "Filter on _Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:1464 ui/evolution-mail-message.xml.h:98
-msgid "_Edit as New Message..."
-msgstr ""
-
-#: mail/folder-browser.c:1465 ui/evolution-mail-message.xml.h:109
-msgid "_Save As..."
-msgstr "Schaper et r_lomer..."
-
-#: mail/folder-browser.c:1466
-msgid "_Print"
-msgstr "_Imprimer"
-
-#: mail/folder-browser.c:1470 ui/evolution-mail-message.xml.h:108
-msgid "_Reply to Sender"
-msgstr ""
-
-#: mail/folder-browser.c:1471 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _List"
-msgstr ""
-
-#: mail/folder-browser.c:1472 ui/evolution-mail-message.xml.h:73
-msgid "Reply to _All"
-msgstr ""
-
-#: mail/folder-browser.c:1473
-msgid "_Forward"
-msgstr "En _avant"
-
-#: mail/folder-browser.c:1477 ui/evolution-mail-message.xml.h:32
-msgid "Follow _Up..."
-msgstr ""
-
-#: mail/folder-browser.c:1478
-msgid "Flag Com_pleted"
-msgstr ""
-
-#: mail/folder-browser.c:1479
-msgid "Clear Fla_g"
-msgstr ""
-
-#. separator here?
-#: mail/folder-browser.c:1483 ui/evolution-mail-message.xml.h:42
-msgid "Mar_k as Read"
-msgstr ""
-
-#: mail/folder-browser.c:1484 ui/evolution-mail-message.xml.h:44
-msgid "Mark as U_nread"
-msgstr ""
-
-#: mail/folder-browser.c:1485
-msgid "Mark as _Important"
-msgstr ""
-
-#: mail/folder-browser.c:1486
-msgid "Mark as Unim_portant"
-msgstr ""
-
-#: mail/folder-browser.c:1490 ui/evolution-addressbook.xml.h:40
-msgid "_Move to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:1491 ui/evolution-addressbook.xml.h:37
-msgid "_Copy to Folder..."
-msgstr ""
-
-#: mail/folder-browser.c:1493 ui/evolution-mail-message.xml.h:111
-msgid "_Undelete"
-msgstr "_Disrafacer"
-
-#: mail/folder-browser.c:1497 ui/evolution-mail-message.xml.h:1
-msgid "Add Sender to Address Book"
-msgstr ""
-
-#: mail/folder-browser.c:1500
-msgid "Apply Filters"
-msgstr ""
-
-#: mail/folder-browser.c:1502
-msgid "Create Ru_le From Message"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: mail/folder-browser.c:1693
-msgid "Filter on Mailing List"
+#: camel/providers/local/camel-mbox-summary.c:592
+#, c-format
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: mail/folder-browser.c:1694
-msgid "VFolder on Mailing List"
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: mail/folder-browser.c:1696
+#: camel/providers/local/camel-mbox-summary.c:811
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Unknown error: %s"
 msgstr ""
 
-#: mail/folder-browser.c:1697
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
-msgid "VFolder on Mailing List (%s)"
+msgid "Could not store folder: %s"
 msgstr ""
 
-#: mail/folder-browser.h:26
-msgid "Default"
-msgstr "Prémetou"
-
-#: mail/folder-info.c:64
-msgid "Getting Folder Information"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
-msgid "Factory to import mbox into Evolution"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
-msgid "Imports mbox files into Evolution"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
-msgid "Factory to import Outlook Express 4 mails into Evolution"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
-msgid "Imports Outlook Express 4 files into Evolution"
-msgstr ""
-
-#: mail/local-config.glade.h:1
-msgid "Body contents"
-msgstr ""
-
-#: mail/local-config.glade.h:2
-msgid "Current store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:3
-msgid "Indexing:"
-msgstr ""
-
-#: mail/local-config.glade.h:4
-msgid "Mailbox Format"
-msgstr ""
-
-#: mail/local-config.glade.h:5
-msgid "New store format:"
-msgstr ""
-
-#: mail/local-config.glade.h:6
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
-msgstr ""
-
-#: mail/local-config.glade.h:9
-msgid "maildir"
-msgstr ""
-
-#: mail/local-config.glade.h:10
-msgid "mbox"
-msgstr ""
-
-#: mail/local-config.glade.h:11
-msgid "mh"
-msgstr ""
-
-#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
-msgid "You have not filled in all of the required information."
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor-news.c:160
-msgid "Evolution News Editor"
-msgstr ""
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:160
-msgid "Evolution Account Editor"
-msgstr ""
-
-#: mail/mail-account-gui.c:974
-msgid "Could not save signature file."
-msgstr ""
-
-#: mail/mail-account-gui.c:1051
-msgid "Save signature"
-msgstr ""
-
-#: mail/mail-account-gui.c:1057
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: mail/mail-account-gui.c:1681
-msgid "You may not create two accounts with the same name."
-msgstr ""
-
-#: mail/mail-accounts.c:149
-msgid " (default)"
-msgstr ""
-
-#: mail/mail-accounts.c:194
-msgid "Disable"
-msgstr "Dismete"
-
-#: mail/mail-accounts.c:196
-msgid "Enable"
-msgstr "Mete en alaedje"
-
-#: mail/mail-accounts.c:292
-msgid "Are you sure you want to delete this account?"
-msgstr ""
-
-#: mail/mail-accounts.c:296
-msgid "Don't delete"
-msgstr ""
-
-#: mail/mail-accounts.c:299
-msgid "Really delete account?"
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
+#, c-format
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.c:535
-msgid "Are you sure you want to delete this news account?"
+#: camel/providers/local/camel-mbox-summary.c:957
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#. give our dialog an Close button and title
-#: mail/mail-accounts.c:823 mail/mail-config.glade.h:50
-msgid "Mail Settings"
+#: camel/providers/local/camel-mh-folder.c:174
+msgid "MH append message cancelled"
 msgstr ""
 
-#: mail/mail-autofilter.c:72
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
-msgid "Mail to %s"
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:217
+#: camel/providers/local/camel-mh-store.c:219
 #, c-format
-msgid "Subject is %s"
+msgid "Could not create folder `%s': %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:233
+#: camel/providers/local/camel-mh-store.c:231
 #, c-format
-msgid "Mail from %s"
+msgid "Cannot get folder `%s': not a directory."
 msgstr ""
 
-#: mail/mail-autofilter.c:289
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
-msgid "%s mailing list"
-msgstr ""
-
-#: mail/mail-autofilter.c:338 mail/mail-autofilter.c:358
-msgid "Add Filter Rule"
-msgstr ""
-
-#: mail/mail-callbacks.c:96
-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 ""
-
-#: mail/mail-callbacks.c:145
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:159
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
-msgstr ""
-
-#: mail/mail-callbacks.c:189
-msgid "You have not set a mail transport method"
-msgstr ""
-
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:224
-msgid ""
-"You are sending an HTML-formatted message, but the following recipients do "
-"not want HTML-formatted mail:\n"
-msgstr ""
-
-#: mail/mail-callbacks.c:239
-msgid "Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:281
-msgid ""
-"This message has no subject.\n"
-"Really send?"
-msgstr ""
-
-#: mail/mail-callbacks.c:325
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:329
-msgid "This message contains only Bcc recipients."
-msgstr ""
-
-#: mail/mail-callbacks.c:333
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
-msgstr ""
-
-#: mail/mail-callbacks.c:438
-msgid "You must specify recipients in order to send this message."
-msgstr ""
-
-#: mail/mail-callbacks.c:527
-msgid "You must configure an account before you can send this email."
-msgstr ""
-
-#: mail/mail-callbacks.c:646
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: mail/mail-callbacks.c:979
-msgid "an unknown sender"
-msgstr ""
-
-#: mail/mail-callbacks.c:983
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr ""
-
-#: mail/mail-callbacks.c:1429 mail/message-browser.c:130
-msgid "Move message(s) to"
-msgstr ""
-
-#: mail/mail-callbacks.c:1431 mail/message-browser.c:132
-msgid "Copy message(s) to"
+msgid "Cannot open MH directory path: %s: %s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2077
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr ""
-
-#: mail/mail-callbacks.c:2102
-msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
+msgid "Spool `%s' cannot be opened: %s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2141
-msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
-msgstr ""
-
-#: mail/mail-callbacks.c:2155
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
-msgid "Are you sure you want to resend all %d messages?"
+msgid "Spool `%s' is not a regular file or directory"
 msgstr ""
 
-#: mail/mail-callbacks.c:2181
-msgid "No Message Selected"
-msgstr ""
-
-#: mail/mail-callbacks.c:2280
-msgid "Save Message As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2282
-msgid "Save Messages As..."
-msgstr ""
-
-#: mail/mail-callbacks.c:2344
-msgid "Go to next folder with unread messages?"
+#: camel/providers/local/camel-spool-store.c:153
+#, c-format
+msgid "Folder `%s/%s' does not exist."
 msgstr ""
 
-#: mail/mail-callbacks.c:2351
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
 msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
+"Could not open folder `%s':\n"
+"%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2580
-msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: mail/mail-callbacks.c:2690
+#: camel/providers/local/camel-spool-store.c:172
 #, c-format
 msgid ""
-"Error loading filter information:\n"
+"Could not create folder `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:2702
-msgid "Filters"
-msgstr "Passetes"
-
-#: mail/mail-callbacks.c:2775
+#: camel/providers/local/camel-spool-store.c:180
 #, c-format
-msgid "Page %d of %d"
-msgstr "Pådje %d di %d"
-
-#: mail/mail-callbacks.c:2827
-msgid "Print Message"
-msgstr ""
-
-#: mail/mail-callbacks.c:2854
-msgid "US-Letter"
+msgid "`%s' is not a mailbox file."
 msgstr ""
 
-#: mail/mail-callbacks.c:2889
-msgid "Printing of message failed"
+#: camel/providers/local/camel-spool-store.c:197
+msgid "Store does not support an INBOX"
 msgstr ""
 
-#: mail/mail-callbacks.c:3055
+#: camel/providers/local/camel-spool-store.c:209
 #, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-
-#: mail/mail-config-druid.c:146
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in,\n"
-"unless you wish to include this information in email you send."
-msgstr ""
-
-#: mail/mail-config-druid.c:148
-msgid ""
-"Please enter information about your incoming mail server below. If you are "
-"not sure, ask your system\n"
-"administrator or Internet Service Provider."
-msgstr ""
-
-#: mail/mail-config-druid.c:150
-msgid "Please select among the following options"
+msgid "Spool mail file %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system\n"
-"administrator or Internet Service Provider."
+#: camel/providers/local/camel-spool-store.c:209
+#, c-format
+msgid "Spool folder tree %s"
 msgstr ""
 
-#: mail/mail-config-druid.c:154
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and\n"
-"outgoing mail transport method which you provided will be grouped together "
-"to\n"
-"make an Evolution mail account. Please enter a name for this account in the "
-"space below.\n"
-"This name will be used for display purposes only."
+#: camel/providers/local/camel-spool-store.c:217
+msgid "Spool folders cannot be renamed"
 msgstr ""
 
-#. set window title
-#: mail/mail-config-druid.c:599
-msgid "Evolution Account Assistant"
+#: camel/providers/local/camel-spool-store.c:225
+msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#: mail/mail-config.c:356
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
-msgid "Account %d"
+msgid "Could not sync temporary folder %s: %s"
 msgstr ""
 
-#: mail/mail-config.c:2036
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid ""
-"Could not get inbox for new mail store:\n"
-"%s\n"
-"No shortcut will be created."
+msgid "Could not sync spool folder %s: %s"
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:2047
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
+#: camel/providers/local/camel-spool-summary.c:274
 #, c-format
-msgid "%s: Inbox"
-msgstr ""
-
-#: mail/mail-config.c:2297
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:2375 mail/mail-config.c:2379
-msgid "Connecting to server..."
-msgstr ""
-
-#: mail/mail-config.glade.h:1
-msgid " _Check for supported types "
-msgstr ""
-
-#: mail/mail-config.glade.h:2
-msgid " color"
-msgstr ""
-
-#: mail/mail-config.glade.h:3
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
-
-#: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of evolution)"
-msgstr ""
-
-#: mail/mail-config.glade.h:5
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:6
-msgid "Account"
-msgstr "Conte"
-
-#: mail/mail-config.glade.h:7
-msgid "Account Information"
-msgstr "Informåcions sol conte"
-
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config.glade.h:9
-msgid "Accounts"
-msgstr ""
-
-#: mail/mail-config.glade.h:10
-msgid "Always _blind carbon-copy (Bcc) to:"
-msgstr ""
-
-#: mail/mail-config.glade.h:11
-msgid "Always _carbon-copy (Cc) to:"
-msgstr ""
-
-#: mail/mail-config.glade.h:12
-msgid "Always _encrypt to myself when sending encrypted mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:13
-msgid "Always _sign outgoing messages when using this account"
-msgstr ""
-
-#: mail/mail-config.glade.h:14 mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Ataetchmint"
-
-#: mail/mail-config.glade.h:15
-msgid "Authentication"
-msgstr "Otintifiaedje"
-
-#: mail/mail-config.glade.h:16
-msgid "Beep when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:17
-msgid "Checking for New Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:18
-msgid "Composer"
-msgstr "Compositeu"
-
-#: mail/mail-config.glade.h:19
-msgid "Composing Messages"
-msgstr ""
-
-#: mail/mail-config.glade.h:20
-msgid "Configuration"
-msgstr "Apontiaedje"
-
-#: mail/mail-config.glade.h:21
-msgid "Confirm when Expunging a folder"
-msgstr ""
-
-#: mail/mail-config.glade.h:22
 msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Finish\" to save your settings."
-msgstr ""
-
-#: mail/mail-config.glade.h:28
-msgid "De_fault"
-msgstr ""
-
-#: mail/mail-config.glade.h:29
-msgid "Default Forward style is: "
-msgstr ""
-
-#: mail/mail-config.glade.h:30
-msgid "Default character encoding: "
-msgstr ""
-
-#: mail/mail-config.glade.h:31
-msgid "Defaults"
-msgstr "Prémetowès valixhances"
-
-#: mail/mail-config.glade.h:33
-msgid "Digital IDs..."
-msgstr ""
-
-#: mail/mail-config.glade.h:34
-msgid "Display"
-msgstr "Håynaedje"
-
-#: mail/mail-config.glade.h:35
-msgid "Do not notify me when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:36 shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Done"
-msgstr "Fwait"
-
-#: mail/mail-config.glade.h:37 shell/e-local-storage.c:173
-msgid "Drafts"
-msgstr ""
-
-#: mail/mail-config.glade.h:38
-msgid "E_nable"
-msgstr ""
-
-#: mail/mail-config.glade.h:39 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
-msgid "Edit..."
-msgstr "Candjî..."
-
-#: mail/mail-config.glade.h:40
-msgid "Enabled"
-msgstr "En alaedje"
-
-#: mail/mail-config.glade.h:41
-msgid "Execute Command..."
-msgstr ""
-
-#: mail/mail-config.glade.h:42
-msgid "Get Digital ID..."
-msgstr ""
-
-#: mail/mail-config.glade.h:43
-msgid "HTML signature file:"
-msgstr ""
-
-#: mail/mail-config.glade.h:44
-msgid "IMAPv4 "
-msgstr ""
-
-#: mail/mail-config.glade.h:45 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Idintité"
-
-#: mail/mail-config.glade.h:46
-msgid "In HTML mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:47
-msgid "Inline"
-msgstr ""
-
-#: mail/mail-config.glade.h:48
-msgid "Kerberos "
-msgstr ""
-
-#: mail/mail-config.glade.h:49
-msgid "Mail Configuration"
-msgstr "Apontiaedje di l' emilaedje"
-
-#: mail/mail-config.glade.h:51
-msgid "Mailbox location"
-msgstr ""
-
-#: mail/mail-config.glade.h:52
-msgid "Make this my _default account"
-msgstr ""
-
-#: mail/mail-config.glade.h:53
-msgid "NNTP Server:"
-msgstr ""
-
-#: mail/mail-config.glade.h:54
-msgid "New Mail Notification"
-msgstr ""
-
-#: mail/mail-config.glade.h:55
-msgid "News"
-msgstr "Copinreyes (newsgroups)"
-
-#: mail/mail-config.glade.h:57
-msgid "Optional Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:59
-msgid "PGP/GPG _Key ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:62
-msgid "Pick a color"
-msgstr "Tchoezixhoz ene coleur"
-
-#: mail/mail-config.glade.h:63
-msgid "Play sound file when new mail arrives"
-msgstr ""
-
-#: mail/mail-config.glade.h:64
-msgid "Pretty Good Privacy (PGP/GPG)"
-msgstr ""
-
-#: mail/mail-config.glade.h:65
-msgid "Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-
-#: mail/mail-config.glade.h:66
-msgid "Prompt when sending messages with an _empty subject"
-msgstr ""
-
-#: mail/mail-config.glade.h:67
-msgid "Prompt when sending messages with only _Bcc recipients defined"
-msgstr ""
-
-#: mail/mail-config.glade.h:68
-msgid "Qmail maildir "
-msgstr ""
-
-#: mail/mail-config.glade.h:69
-msgid "Quoted"
-msgstr ""
-
-#: mail/mail-config.glade.h:70
-msgid "Re_member this password"
-msgstr ""
-
-#: mail/mail-config.glade.h:71 shell/glade/evolution-startup-wizard.glade.h:6
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:72
-msgid "Receiving Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:73
-msgid "Receiving Options"
-msgstr ""
-
-#: mail/mail-config.glade.h:74
-msgid "Required Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:76
-msgid "Secure MIME (S/MIME)"
-msgstr ""
-
-#: mail/mail-config.glade.h:77
-msgid "Security"
-msgstr "Såvrité"
-
-#: mail/mail-config.glade.h:78
-msgid "Select Filter Log file..."
-msgstr ""
-
-#: mail/mail-config.glade.h:79
-msgid "Select PGP binary"
-msgstr ""
-
-#: mail/mail-config.glade.h:80 shell/glade/evolution-startup-wizard.glade.h:7
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config.glade.h:81
-msgid "Sending Mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:83 mail/message-list.etspec.h:9
-#: shell/e-local-storage.c:176
-msgid "Sent"
-msgstr "Evoyî"
-
-#: mail/mail-config.glade.h:84
-msgid "Sent _messages folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:85
-msgid "Sent and Draft Messages"
-msgstr ""
-
-#: mail/mail-config.glade.h:86
-msgid "Ser_ver requires authentication"
-msgstr ""
-
-#: mail/mail-config.glade.h:87
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config.glade.h:88
-msgid "Server _Type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:89
-msgid "Signature file:"
-msgstr ""
-
-#: mail/mail-config.glade.h:90
-msgid "Source"
-msgstr "Sourdant"
-
-#: mail/mail-config.glade.h:91
-msgid "Source Information"
-msgstr ""
-
-#: mail/mail-config.glade.h:92
-msgid "Sources"
-msgstr "Sourdants"
-
-#: mail/mail-config.glade.h:93
-msgid "Specify filename:"
-msgstr ""
-
-#: mail/mail-config.glade.h:94
-msgid "Standard Unix mbox"
-msgstr ""
-
-#: mail/mail-config.glade.h:96
-msgid "Use s_ecure connection (SSL)"
-msgstr ""
-
-#: mail/mail-config.glade.h:97
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Next\" to begin. "
-msgstr ""
-
-#: mail/mail-config.glade.h:101
-msgid "_Always load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:102
-msgid "_Always sign outgoing messages when using this account"
-msgstr ""
-
-#: mail/mail-config.glade.h:103
-msgid "_Authentication Type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:104
-msgid "_Authentication type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:105
-msgid "_Automatically check for new mail"
-msgstr ""
-
-#: mail/mail-config.glade.h:106
-msgid "_Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:108
-msgid "_Drafts folder:"
-msgstr ""
-
-#: mail/mail-config.glade.h:111
-msgid "_Empty trash folders on exit"
-msgstr ""
-
-#: mail/mail-config.glade.h:112
-msgid "_Full name:"
-msgstr ""
-
-#: mail/mail-config.glade.h:113
-msgid "_HTML signature:"
-msgstr ""
-
-#: mail/mail-config.glade.h:114
-msgid "_Highlight citations with"
-msgstr ""
-
-#: mail/mail-config.glade.h:115
-msgid "_Host:"
-msgstr "_Lodjoe:"
-
-#: mail/mail-config.glade.h:116
-msgid "_Load images if sender is in addressbook"
-msgstr ""
-
-#: mail/mail-config.glade.h:117
-msgid "_Log filter actions to:"
-msgstr ""
-
-#: mail/mail-config.glade.h:118
-msgid "_Mark messages as Read after"
-msgstr ""
-
-#: mail/mail-config.glade.h:119
-msgid "_Name:"
-msgstr "_No:"
-
-#: mail/mail-config.glade.h:120
-msgid "_Never load images off the net"
-msgstr ""
-
-#: mail/mail-config.glade.h:121
-msgid "_Organization:"
-msgstr ""
-
-#: mail/mail-config.glade.h:122
-msgid "_PGP binary path:"
-msgstr ""
-
-#: mail/mail-config.glade.h:123
-msgid "_Path:"
-msgstr "_Tchimin:"
-
-#: mail/mail-config.glade.h:124
-msgid "_Remember this password"
-msgstr ""
-
-#: mail/mail-config.glade.h:125
-msgid "_Send mail in HTML format by default."
-msgstr ""
-
-#: mail/mail-config.glade.h:126
-msgid "_Server type: "
-msgstr ""
-
-#: mail/mail-config.glade.h:127
-msgid "_Signature file:"
-msgstr ""
-
-#: mail/mail-config.glade.h:128
-msgid "_Username:"
-msgstr "No d' _uzeu:"
-
-#: mail/mail-config.glade.h:129
-msgid "_every"
-msgstr ""
-
-#: mail/mail-config.glade.h:130
-msgid "description"
-msgstr "discrijhaedje"
-
-#: mail/mail-config.glade.h:132
-msgid "newswindow1"
-msgstr ""
-
-#: mail/mail-config.glade.h:133
-msgid "placeholder"
-msgstr ""
-
-#: mail/mail-config.glade.h:134
-msgid "seconds."
-msgstr ""
-
-#: mail/mail-crypto.c:59
-msgid "Could not create a PGP signature context."
-msgstr ""
-
-#: mail/mail-crypto.c:84
-msgid "Could not create a PGP verification context."
-msgstr ""
-
-#: mail/mail-crypto.c:113
-msgid "Could not create a PGP encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:138
-msgid "Could not create a PGP decryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:173
-msgid "Could not create a S/MIME signature context."
-msgstr ""
-
-#: mail/mail-crypto.c:205
-msgid "Could not create a S/MIME certsonly context."
-msgstr ""
-
-#: mail/mail-crypto.c:236
-msgid "Could not create a S/MIME encryption context."
-msgstr ""
-
-#: mail/mail-crypto.c:267
-msgid "Could not create a S/MIME envelope context."
-msgstr ""
-
-#: mail/mail-crypto.c:297
-msgid "Could not create a S/MIME decode context."
-msgstr ""
-
-#: mail/mail-display.c:255
-msgid "Save Attachment"
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
 msgstr ""
 
-#: mail/mail-display.c:320
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
-msgid "Could not create temporary file '%s': %s"
+msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
 
-#: mail/mail-display.c:366
-msgid "Save to Disk..."
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
 msgstr ""
 
-#: mail/mail-display.c:368
-msgid "View Inline"
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
 msgstr ""
 
-#: mail/mail-display.c:370
-#, c-format
-msgid "Open in %s..."
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
 msgstr ""
 
-#: mail/mail-display.c:431
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
+#: 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 "View Inline (via %s)"
-msgstr ""
-
-#: mail/mail-display.c:435
-msgid "Hide"
-msgstr "Catchî"
-
-#: mail/mail-display.c:456
-msgid "External Viewer"
-msgstr ""
-
-#: mail/mail-display.c:1259
-msgid "Loading message content"
-msgstr ""
-
-#: mail/mail-display.c:1754
-msgid "Open Link in Browser"
-msgstr ""
-
-#: mail/mail-display.c:1756
-msgid "Copy Link Location"
-msgstr "Copyî l' eplaeçmint do loyén"
-
-#: mail/mail-display.c:1759
-msgid "Save Link as (FIXME)"
+msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: mail/mail-display.c:1762
-msgid "Save Image as..."
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: 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 ""
 
-#: mail/mail-format.c:646
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "%s attachment"
-msgstr ""
-
-#: mail/mail-format.c:692
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-
-#: mail/mail-format.c:775
-msgid "Date"
-msgstr "Date"
-
-#: mail/mail-format.c:867
-msgid "Bad Address"
-msgstr ""
-
-#: mail/mail-format.c:910 mail/message-list.etspec.h:6
-msgid "From"
-msgstr "Di"
-
-#: mail/mail-format.c:914
-msgid "Reply-To"
-msgstr ""
-
-#: mail/mail-format.c:919 mail/message-list.etspec.h:13
-msgid "To"
-msgstr "A"
-
-#: mail/mail-format.c:924
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/mail-format.c:929
-msgid "Bcc"
-msgstr ""
-
-#: mail/mail-format.c:1767
-msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: mail/mail-format.c:1790
-msgid "Evolution does not recognize this type of signed message."
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, c-format
+msgid "Posting failed: %s"
 msgstr ""
 
-#: mail/mail-format.c:1798
-msgid "This message is digitally signed and has been found to be authentic."
+#: camel/providers/nntp/camel-nntp-folder.c:393
+msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: mail/mail-format.c:1806
-msgid "This message is digitally signed but can not be proven to be authentic."
+#: camel/providers/nntp/camel-nntp-folder.c:404
+msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: mail/mail-format.c:2049
-#, c-format
-msgid "Pointer to FTP site (%s)"
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
+msgid "Could not get group list from server."
 msgstr ""
 
-#: mail/mail-format.c:2063
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
+msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: mail/mail-format.c:2068
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
-msgid "Pointer to local file (%s)"
+msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: mail/mail-format.c:2097
-#, c-format
-msgid "Pointer to remote data (%s)"
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 
-#: mail/mail-format.c:2105
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
 msgstr ""
 
-#: mail/mail-format.c:2110
-msgid "Malformed external-body part."
+#: camel/providers/nntp/camel-nntp-provider.c:52
+msgid "USENET news"
 msgstr ""
 
-#: mail/mail-local.c:626
-msgid "Reconfiguring folder"
+#: camel/providers/nntp/camel-nntp-provider.c:54
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: mail/mail-local.c:707
-#, c-format
+#: camel/providers/nntp/camel-nntp-provider.c:73
 msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s: %s"
-msgstr ""
-
-#: mail/mail-local.c:763
-#, c-format
-msgid "Cannot save folder metainfo to %s: %s"
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
-#: mail/mail-local.c:815
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
 #, c-format
-msgid "Cannot delete folder metadata %s: %s"
+msgid "NNTP Command failed: %s"
 msgstr ""
 
-#: mail/mail-local.c:1281
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
+msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:1296
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
-msgid "%s may not be reconfigured because it is not a local folder"
-msgstr ""
-
-#: mail/mail-local.c:1318
-msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
+msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: mail/mail-local.c:1407
-msgid "You cannot change the format of a non-local folder."
-msgstr ""
-
-#: mail/mail-local.c:1416
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
-msgid "Reconfigure /%s"
+msgid "USENET News via %s"
 msgstr ""
 
-#: mail/mail-mt.c:254
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
-"Error while '%s':\n"
+"Error retrieving newsgroups:\n"
+"\n"
 "%s"
 msgstr ""
 
-#: mail/mail-mt.c:257
-#, c-format
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
-"Error while performing operation:\n"
-"%s"
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: mail/mail-mt.c:901
-msgid "Working"
+#: camel/providers/nntp/camel-nntp-store.c:904
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
 msgstr ""
 
-#: mail/mail-ops.c:87
-msgid "Filtering Folder"
+#: camel/providers/nntp/camel-nntp-store.c:929
+msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: mail/mail-ops.c:258
-msgid "Fetching Mail"
+#: camel/providers/nntp/camel-nntp-store.c:937
+msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: mail/mail-ops.c:534 mail/mail-ops.c:563
-msgid "However, the message was successfully sent."
+#: camel/providers/nntp/camel-nntp-store.c:945
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: mail/mail-ops.c:599
-#, c-format
-msgid "Sending \"%s\""
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: mail/mail-ops.c:719
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, c-format
-msgid "Sending message %d of %d"
+msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: mail/mail-ops.c:738
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:740 mail/mail-send-recv.c:545
-msgid "Complete."
+#: camel/providers/nntp/camel-nntp-store.c:1262
+msgid "Not connected."
 msgstr ""
 
-#: mail/mail-ops.c:833
-msgid "Saving message to folder"
+#: camel/providers/nntp/camel-nntp-store.c:1311
+#, c-format
+msgid "No such folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
-msgid "Moving messages to %s"
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: mail/mail-ops.c:913
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, c-format
-msgid "Copying messages to %s"
+msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: mail/mail-ops.c:940
-msgid "Moving"
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, c-format
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: mail/mail-ops.c:943
-msgid "Copying"
+#: camel/providers/nntp/camel-nntp-summary.c:368
+msgid "Use cancel"
 msgstr ""
 
-#: mail/mail-ops.c:1053
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
-msgid "Scanning folders in \"%s\""
+msgid "Operation failed: %s"
 msgstr ""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1103 shell/e-local-storage.c:178
-msgid "Trash"
-msgstr "Batch"
-
-#: mail/mail-ops.c:1236
-msgid "Forwarded messages"
+#: camel/providers/pop3/camel-pop3-folder.c:246
+msgid "Retrieving POP summary"
 msgstr ""
 
-#: mail/mail-ops.c:1279
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
-msgid "Opening folder %s"
+msgid "Cannot get POP summary: %s"
 msgstr ""
 
-#: mail/mail-ops.c:1351
-#, c-format
-msgid "Opening store %s"
+#: camel/providers/pop3/camel-pop3-folder.c:308
+msgid "Expunging deleted messages"
 msgstr ""
 
-#: mail/mail-ops.c:1420
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
-msgid "Removing folder %s"
+msgid "No message with uid %s"
 msgstr ""
 
-#: mail/mail-ops.c:1514
+#. 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:411
 #, c-format
-msgid "Storing folder '%s'"
+msgid "Retrieving POP message %d"
 msgstr ""
 
-#: mail/mail-ops.c:1565
-msgid "Refreshing folder"
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
+msgid "Unknown reason"
 msgstr ""
 
-#: mail/mail-ops.c:1601
-msgid "Expunging folder"
+#: camel/providers/pop3/camel-pop3-provider.c:40
+msgid "Leave messages on server"
 msgstr ""
 
-#: mail/mail-ops.c:1650
+#: camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
-msgid "Retrieving message %s"
+msgid "Delete after %s day(s)"
 msgstr ""
 
-#: mail/mail-ops.c:1717
-#, c-format
-msgid "Retrieving %d message(s)"
+#: camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: mail/mail-ops.c:1803
-#, c-format
-msgid "Saving %d messsage(s)"
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
+msgid "POP"
 msgstr ""
 
-#: mail/mail-ops.c:1915
-#, c-format
-msgid ""
-"Unable to create output file: %s\n"
-" %s"
+#: camel/providers/pop3/camel-pop3-provider.c:56
+msgid "For connecting to and downloading mail from POP servers."
 msgstr ""
 
-#: mail/mail-ops.c:1943
-#, c-format
+#: camel/providers/pop3/camel-pop3-provider.c:73
 msgid ""
-"Error saving messages to: %s:\n"
-" %s"
-msgstr ""
-
-#: mail/mail-ops.c:2017
-msgid "Saving attachment"
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr ""
 
-#: mail/mail-ops.c:2033
-#, c-format
+#: camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
-"Cannot create output file: %s:\n"
-" %s"
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
-#: mail/mail-ops.c:2064
+#: camel/providers/pop3/camel-pop3-store.c:195
 #, c-format
-msgid "Could not write data: %s"
+msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: mail/mail-ops.c:2133
+#: camel/providers/pop3/camel-pop3-store.c:214
 #, c-format
-msgid "Disconnecting from %s"
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
 msgstr ""
 
-#: mail/mail-ops.c:2134
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
-msgid "Reconnecting to %s"
+msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2233
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
-msgid "Executing shell command: %s"
-msgstr ""
-
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "_Cweri"
-
-#: mail/mail-search.c:137
-msgid "(Untitled Message)"
+msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: mail/mail-search.c:240
-msgid "Untitled Message"
-msgstr ""
-
-#: mail/mail-search.c:244
-msgid "Empty Message"
-msgstr ""
-
-#: mail/mail-search.c:291
-msgid "Find in Message"
-msgstr ""
-
-#: mail/mail-search.c:321
-msgid "Case Sensitive"
-msgstr "Grandès <> ptitès letes"
-
-#: mail/mail-search.c:323
-msgid "Search Forward"
-msgstr ""
-
-#: mail/mail-search.c:343
-msgid "Find:"
-msgstr "Trover:"
-
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr ""
-
-#: mail/mail-send-recv.c:143
-msgid "Cancelling..."
-msgstr ""
-
-#: mail/mail-send-recv.c:251
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
-msgid "Server: %s, Type: %s"
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr ""
 
-#: mail/mail-send-recv.c:253
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
-msgid "Path: %s, Type: %s"
+msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:255
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
-msgid "Type: %s"
-msgstr ""
-
-#: mail/mail-send-recv.c:292
-msgid "Send & Receive Mail"
-msgstr ""
-
-#: mail/mail-send-recv.c:294
-msgid "Cancel All"
-msgstr ""
-
-#: mail/mail-send-recv.c:354
-msgid "Updating..."
+msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: mail/mail-send-recv.c:355 mail/mail-send-recv.c:408
-msgid "Waiting..."
-msgstr ""
-
-#: mail/mail-send-recv.c:541
-msgid "Cancelled."
-msgstr ""
-
-#: mail/mail-session.c:222
-msgid "User canceled operation."
-msgstr ""
-
-#: mail/mail-session.c:321
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
-msgid "Enter Password for %s"
-msgstr ""
-
-#: mail/mail-session.c:324
-msgid "Enter Password"
-msgstr "Tapez li scret"
-
-#: mail/mail-summary.c:109
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-summary.c:467
-msgid "Mail Summary"
+msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: mail/mail-tools.c:256
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
-msgid "Forwarded message - %s"
-msgstr ""
-
-#: mail/mail-tools.c:260
-msgid "Forwarded message"
-msgstr ""
-
-#: mail/mail-tools.c:394
-msgid "Forwarded Message"
+msgid "%sPlease enter the POP password for %s on host %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:85
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
-msgid "Setting up vfolder: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:203
+#: camel/providers/pop3/camel-pop3-store.c:547
 #, c-format
-msgid "Updating vfolders for uri: %s"
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:419
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
+msgid "No such folder `%s'."
 msgstr ""
 
-#: mail/mail-vfolder.c:728
-msgid "VFolders"
-msgstr ""
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: mail/mail-config.glade.h:132
+msgid "Sendmail"
+msgstr "Sendmail"
 
-#: mail/mail-vfolder.c:785
-msgid "vFolders"
+#: camel/providers/sendmail/camel-sendmail-provider.c:38
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr ""
 
-#: mail/mail-vfolder.c:825
-msgid "Edit VFolder"
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
+msgid "Could not parse recipient list"
 msgstr ""
 
-#: mail/mail-vfolder.c:841
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr ""
-
-#: mail/mail-vfolder.c:895
-msgid "New VFolder"
+msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: mail/message-browser.c:212
-msgid "(No subject)"
-msgstr "(Nou sudjet)"
-
-#: mail/message-browser.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
-msgid "%s - Message"
-msgstr ""
-
-#: mail/message-list.c:641
-msgid "Unseen"
-msgstr ""
-
-#: mail/message-list.c:642
-msgid "Seen"
-msgstr ""
-
-#: mail/message-list.c:643
-msgid "Answered"
-msgstr ""
-
-#: mail/message-list.c:644
-msgid "Multiple Unseen Messages"
-msgstr ""
-
-#: mail/message-list.c:645
-msgid "Multiple Messages"
-msgstr ""
-
-#: mail/message-list.c:649
-msgid "Lowest"
-msgstr ""
-
-#: mail/message-list.c:650
-msgid "Lower"
-msgstr ""
-
-#: mail/message-list.c:654
-msgid "Higher"
-msgstr ""
-
-#: mail/message-list.c:655
-msgid "Highest"
-msgstr ""
-
-#: mail/message-list.c:960
-msgid "?"
-msgstr "?"
-
-#: mail/message-list.c:967
-msgid "Today %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:976
-msgid "Yesterday %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:988
-msgid "%a %l:%M %p"
-msgstr ""
-
-#: mail/message-list.c:998
-msgid "%b %d %Y"
-msgstr ""
-
-#: mail/message-list.c:2365
-msgid "Generating message list"
-msgstr ""
-
-#: mail/message-list.etspec.h:2
-msgid "Due By"
-msgstr ""
-
-#: mail/message-list.etspec.h:3
-msgid "Flag Status"
-msgstr ""
-
-#: mail/message-list.etspec.h:4
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.etspec.h:5
-msgid "Follow Up Flag"
-msgstr ""
-
-#: mail/message-list.etspec.h:7
-msgid "Received"
+msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: mail/message-list.etspec.h:10
-msgid "Size"
-msgstr "Grandeu"
-
-#: mail/subscribe-dialog.c:219
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
-msgid "Scanning folders under %s on \"%s\""
+msgid "Could not send message: %s"
 msgstr ""
 
-#: mail/subscribe-dialog.c:221
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
-msgid "Scanning root-level folders on \"%s\""
+msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: mail/subscribe-dialog.c:318
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
-msgid "Subscribing to folder \"%s\""
+msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: mail/subscribe-dialog.c:320
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:1279 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Folder"
-msgstr "Ridant"
-
-#: mail/subscribe-dialog.c:1520
-msgid "No server has been selected"
-msgstr ""
-
-#: mail/subscribe-dialog.c:1581
-msgid "Please select a server."
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:1
-msgid " _Refresh List "
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:2
-msgid "All folders"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:3
-msgid "Display options"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:4
-msgid "Folders whose names begin with:"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5
-msgid "Manage Subscriptions"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:6
-msgid "Show _folders from server: "
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:7
-msgid "_Subscribe"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:8
-msgid "_Unsubscribe"
-msgstr ""
-
-#: my-evolution/Locations.h:1
-msgid "Aarhus"
-msgstr ""
-
-#: my-evolution/Locations.h:2
-msgid "Abakan"
-msgstr ""
-
-#: my-evolution/Locations.h:3
-msgid "Abbotsford"
-msgstr ""
-
-#: my-evolution/Locations.h:4
-msgid "Aberdeen"
-msgstr ""
-
-#: my-evolution/Locations.h:5
-msgid "Abha"
-msgstr ""
-
-#: my-evolution/Locations.h:6
-msgid "Abilene"
-msgstr ""
-
-#: my-evolution/Locations.h:7
-msgid "Abingdon"
-msgstr ""
-
-#: my-evolution/Locations.h:8
-msgid "Abu Dhabi"
-msgstr ""
-
-#: my-evolution/Locations.h:9
-msgid "Abu Dhabi - Bateen"
-msgstr ""
-
-#: my-evolution/Locations.h:10
-msgid "Acajutla"
-msgstr ""
-
-#: my-evolution/Locations.h:11
-msgid "Acapulco"
-msgstr ""
-
-#: my-evolution/Locations.h:12
-msgid "Acarigua"
-msgstr ""
-
-#: my-evolution/Locations.h:13
-msgid "Adak"
-msgstr ""
-
-#: my-evolution/Locations.h:14
-msgid "Adana"
-msgstr ""
-
-#: my-evolution/Locations.h:15
-msgid "Adana/Incirlik"
-msgstr ""
-
-#: my-evolution/Locations.h:16
-msgid "Adelaide"
+msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: my-evolution/Locations.h:17
-msgid "Aden"
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
+msgid "sendmail"
 msgstr ""
 
-#: my-evolution/Locations.h:18
-msgid "Adrar"
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
+msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: my-evolution/Locations.h:19
-msgid "Aeroparque"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
+msgid "SMTP"
+msgstr "SMTP"
 
-#: my-evolution/Locations.h:20
-msgid "Aeropuerto del Norte"
+#: camel/providers/smtp/camel-smtp-provider.c:39
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: my-evolution/Locations.h:21
-msgid "Afonsos"
+#: camel/providers/smtp/camel-smtp-transport.c:174
+msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: my-evolution/Locations.h:22
-msgid "Africa"
-msgstr "Afrike"
-
-#: my-evolution/Locations.h:23
-msgid "Afyon"
+#: camel/providers/smtp/camel-smtp-transport.c:176
+msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: my-evolution/Locations.h:24
-msgid "Agen"
+#: camel/providers/smtp/camel-smtp-transport.c:178
+msgid "Command not implemented"
 msgstr ""
 
-#: my-evolution/Locations.h:25
-msgid "Aguascaliantes"
+#: camel/providers/smtp/camel-smtp-transport.c:180
+msgid "Command parameter not implemented"
 msgstr ""
 
-#: my-evolution/Locations.h:26
-msgid "Ahmadabad"
+#: camel/providers/smtp/camel-smtp-transport.c:182
+msgid "System status, or system help reply"
 msgstr ""
 
-#: my-evolution/Locations.h:27
-msgid "Ahwaz"
+#: camel/providers/smtp/camel-smtp-transport.c:184
+msgid "Help message"
 msgstr ""
 
-#: my-evolution/Locations.h:28
-msgid "Ainsworth"
+#: camel/providers/smtp/camel-smtp-transport.c:186
+msgid "Service ready"
 msgstr ""
 
-#: my-evolution/Locations.h:29
-msgid "Air Force"
+#: camel/providers/smtp/camel-smtp-transport.c:188
+msgid "Service closing transmission channel"
 msgstr ""
 
-#: my-evolution/Locations.h:30
-msgid "Ajaccio/Campo dell'Oro"
+#: camel/providers/smtp/camel-smtp-transport.c:190
+msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: my-evolution/Locations.h:31
-msgid "Akeno Ab"
+#: camel/providers/smtp/camel-smtp-transport.c:192
+msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: my-evolution/Locations.h:32
-msgid "Akita Airport"
+#: camel/providers/smtp/camel-smtp-transport.c:194
+msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: my-evolution/Locations.h:33
-msgid "Akron"
+#: camel/providers/smtp/camel-smtp-transport.c:196
+msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: my-evolution/Locations.h:34
-msgid "Akrotiri"
+#: camel/providers/smtp/camel-smtp-transport.c:198
+msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: my-evolution/Locations.h:35
-msgid "Alabama"
-msgstr "Alabama"
-
-#: my-evolution/Locations.h:36
-msgid "Al Ahsa"
+#: camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: my-evolution/Locations.h:37
-msgid "Al Ain"
+#: camel/providers/smtp/camel-smtp-transport.c:202
+msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: my-evolution/Locations.h:38
-msgid "Alamogordo"
+#: camel/providers/smtp/camel-smtp-transport.c:204
+msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: my-evolution/Locations.h:39
-msgid "Alamosa"
+#: camel/providers/smtp/camel-smtp-transport.c:206
+msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: my-evolution/Locations.h:40
-msgid "Alaska"
-msgstr "Alaska"
-
-#: my-evolution/Locations.h:41
-msgid "Al Baha"
+#: camel/providers/smtp/camel-smtp-transport.c:208
+msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: my-evolution/Locations.h:43
-msgid "Albany"
+#: camel/providers/smtp/camel-smtp-transport.c:210
+msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: my-evolution/Locations.h:44
-msgid "Albenga"
+#: camel/providers/smtp/camel-smtp-transport.c:212
+msgid "Transaction failed"
 msgstr ""
 
-#: my-evolution/Locations.h:45
-msgid "Alberta"
-msgstr "Alberta"
-
-#: my-evolution/Locations.h:46
-msgid "Alborg"
+#: camel/providers/smtp/camel-smtp-transport.c:216
+msgid "A password transition is needed"
 msgstr ""
 
-#: my-evolution/Locations.h:47
-msgid "Albuquerque"
+#: camel/providers/smtp/camel-smtp-transport.c:218
+msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: my-evolution/Locations.h:48
-msgid "Alderney"
+#: camel/providers/smtp/camel-smtp-transport.c:220
+msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: my-evolution/Locations.h:49
-msgid "Alesund"
+#: camel/providers/smtp/camel-smtp-transport.c:222
+msgid "Temporary authentication failure"
 msgstr ""
 
-#: my-evolution/Locations.h:50
-msgid "Alexandria"
+#: camel/providers/smtp/camel-smtp-transport.c:224
+msgid "Authentication required"
 msgstr ""
 
-#: my-evolution/Locations.h:51
-msgid "Alexandria-Esler"
+#: camel/providers/smtp/camel-smtp-transport.c:308
+msgid "Welcome response error"
 msgstr ""
 
-#: my-evolution/Locations.h:52
-msgid "Alexandria/Nouzha"
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:53
-msgid "Alexandroupolis"
+#: camel/providers/smtp/camel-smtp-transport.c:344
+msgid "server does not appear to support SSL"
 msgstr ""
 
-#: my-evolution/Locations.h:55
-msgid "Alghero"
+#: camel/providers/smtp/camel-smtp-transport.c:358
+#, c-format
+msgid "STARTTLS command failed: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:56
-msgid "Algona"
+#: camel/providers/smtp/camel-smtp-transport.c:373
+msgid "STARTTLS command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:57
-msgid "Alicante"
+#: camel/providers/smtp/camel-smtp-transport.c:476
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
-#: my-evolution/Locations.h:58
-msgid "Alice"
+#: camel/providers/smtp/camel-smtp-transport.c:514
+#, c-format
+msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr ""
 
-#: my-evolution/Locations.h:59
-msgid "Alice Springs"
+#: camel/providers/smtp/camel-smtp-transport.c:533
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: my-evolution/Locations.h:60
-msgid "Al-Jouf"
+#: camel/providers/smtp/camel-smtp-transport.c:657
+#, c-format
+msgid "SMTP server %s"
 msgstr ""
 
-#: my-evolution/Locations.h:61
-msgid "Allentown"
+#: camel/providers/smtp/camel-smtp-transport.c:659
+#, c-format
+msgid "SMTP mail delivery via %s"
 msgstr ""
 
-#: my-evolution/Locations.h:62
-msgid "Alliance"
+#: camel/providers/smtp/camel-smtp-transport.c:677
+msgid "Cannot send message: service not connected."
 msgstr ""
 
-#: my-evolution/Locations.h:63
-msgid "Alma"
+#: camel/providers/smtp/camel-smtp-transport.c:683
+msgid "Cannot send message: sender address not valid."
 msgstr ""
 
-#: my-evolution/Locations.h:64
-msgid "Almeria"
+#: camel/providers/smtp/camel-smtp-transport.c:687
+msgid "Sending message"
 msgstr ""
 
-#: my-evolution/Locations.h:65
-msgid "Alpena"
+#: camel/providers/smtp/camel-smtp-transport.c:702
+msgid "Cannot send message: no recipients defined."
 msgstr ""
 
-#: my-evolution/Locations.h:66
-msgid "Al Qaysumah"
+#: camel/providers/smtp/camel-smtp-transport.c:713
+msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: my-evolution/Locations.h:67
-msgid "Alta"
+#: camel/providers/smtp/camel-smtp-transport.c:885
+msgid "SMTP Greeting"
 msgstr ""
 
-#: my-evolution/Locations.h:68
-msgid "Altamira"
+#: camel/providers/smtp/camel-smtp-transport.c:934
+#, c-format
+msgid "HELO command failed: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:69
-msgid "Alton"
+#: camel/providers/smtp/camel-smtp-transport.c:951
+msgid "HELO command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:70
-msgid "Altoona"
+#: camel/providers/smtp/camel-smtp-transport.c:1017
+msgid "SMTP Authentication"
 msgstr ""
 
-#: my-evolution/Locations.h:71
-msgid "Alturas"
+#: camel/providers/smtp/camel-smtp-transport.c:1023
+msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: my-evolution/Locations.h:72
-msgid "Altus"
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
+#, c-format
+msgid "AUTH command failed: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:73
-msgid "Amami Airport"
+#: camel/providers/smtp/camel-smtp-transport.c:1057
+msgid "AUTH command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:74
-msgid "Amapala"
+#: camel/providers/smtp/camel-smtp-transport.c:1119
+msgid "Bad authentication response from server.\n"
 msgstr ""
 
-#: my-evolution/Locations.h:75
-msgid "Amarillo"
+#: camel/providers/smtp/camel-smtp-transport.c:1144
+#, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr ""
 
-#: my-evolution/Locations.h:76
-msgid "Amasya"
+#: camel/providers/smtp/camel-smtp-transport.c:1161
+msgid "MAIL FROM command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:77
-msgid "Ambler"
+#: camel/providers/smtp/camel-smtp-transport.c:1185
+#, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
 msgstr ""
 
-#: my-evolution/Locations.h:78
-msgid "Amelia"
+#: camel/providers/smtp/camel-smtp-transport.c:1204
+#, c-format
+msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: my-evolution/Locations.h:79
-msgid "Amendola"
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
+#, c-format
+msgid "DATA command failed: %s: mail not sent"
 msgstr ""
 
-#: my-evolution/Locations.h:80
-msgid "Ames"
+#. 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:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
+msgid "DATA command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:81
-msgid "Amritsar"
+#: camel/providers/smtp/camel-smtp-transport.c:1359
+#, c-format
+msgid "RSET command failed: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:82
-msgid "Amsterdam"
+#: camel/providers/smtp/camel-smtp-transport.c:1375
+msgid "RSET command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:83
-msgid "Anadyr"
+#: camel/providers/smtp/camel-smtp-transport.c:1398
+#, c-format
+msgid "QUIT command failed: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:84
-msgid "Anaktuvuk"
+#: camel/providers/smtp/camel-smtp-transport.c:1412
+msgid "QUIT command failed"
 msgstr ""
 
-#: my-evolution/Locations.h:85
-msgid "Anapa"
+#: composer/e-msg-composer-attachment-bar.c:106
+#, c-format
+msgid "%.0fK"
 msgstr ""
 
-#: my-evolution/Locations.h:86
-msgid "Anchorage"
+#: composer/e-msg-composer-attachment-bar.c:109
+#, c-format
+msgid "%.0fM"
 msgstr ""
 
-#: my-evolution/Locations.h:87
-msgid "Anchorage - Elmendorf AFB"
+#: composer/e-msg-composer-attachment-bar.c:112
+#, c-format
+msgid "%.0fG"
 msgstr ""
 
-#: my-evolution/Locations.h:88
-msgid "Ancona"
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
+msgid "attachment"
 msgstr ""
 
-#: my-evolution/Locations.h:89
-msgid "Andahuayla"
+#: composer/e-msg-composer-attachment-bar.c:454
+msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: my-evolution/Locations.h:90
-msgid "Anderson"
+#: composer/e-msg-composer-attachment-bar.c:494
+msgid "Add attachment..."
 msgstr ""
 
-#: my-evolution/Locations.h:91
-msgid "Andoya"
+#: composer/e-msg-composer-attachment-bar.c:495
+msgid "Attach a file to the message"
 msgstr ""
 
-#: my-evolution/Locations.h:92
-msgid "Andravida"
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
+#, c-format
+msgid "Cannot attach file %s: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:93
-msgid "Andrews AFB"
+#: composer/e-msg-composer-attachment.c:177
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
 msgstr ""
 
-#: my-evolution/Locations.h:94
-msgid "Angleton"
-msgstr ""
+#: composer/e-msg-composer-attachment.glade.h:2
+#, fuzzy
+msgid "Attachment Properties"
+msgstr "Ataetchmint"
 
-#: my-evolution/Locations.h:95
-msgid "Aniak"
-msgstr ""
+#: composer/e-msg-composer-attachment.glade.h:4
+msgid "File name:"
+msgstr "No do fitchî:"
 
-#: my-evolution/Locations.h:96
-msgid "Ankara/Esenboga"
+#: composer/e-msg-composer-attachment.glade.h:5
+msgid "MIME type:"
 msgstr ""
 
-#: my-evolution/Locations.h:97
-msgid "Ankara/Etimesgut"
+#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-select-file.c:74
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: my-evolution/Locations.h:98
-msgid "Annaba"
+#: composer/e-msg-composer-hdrs.c:512
+msgid "Posting destination"
 msgstr ""
 
-#: my-evolution/Locations.h:99
-msgid "Ann Arbor"
+#: composer/e-msg-composer-hdrs.c:513
+msgid "Choose folders to post the message to."
 msgstr ""
 
-#: my-evolution/Locations.h:100
-msgid "Annette"
+#: composer/e-msg-composer-hdrs.c:547
+msgid "Click here for the address book"
 msgstr ""
 
-#: my-evolution/Locations.h:101
-msgid "Anniston"
-msgstr ""
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:577
+msgid "Reply-To:"
+msgstr "Responde a:"
 
-#: my-evolution/Locations.h:102
-msgid "Antalya"
-msgstr "Antalya"
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:583
+msgid "From:"
+msgstr "Di:"
 
-#: my-evolution/Locations.h:103
-msgid "Antartica"
-msgstr ""
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:589
+msgid "Subject:"
+msgstr "Sudjet:"
 
-#: my-evolution/Locations.h:104
-msgid "Antigo"
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:598
+msgid "To:"
+msgstr "A:"
 
-#: my-evolution/Locations.h:105
-msgid "Antigua"
+#: composer/e-msg-composer-hdrs.c:599
+msgid "Enter the recipients of the message"
 msgstr ""
 
-#: my-evolution/Locations.h:106
-msgid "Antigua and Barbuda"
-msgstr "Antigua eyet Barbuda"
-
-#: my-evolution/Locations.h:107
-msgid "Antofagasta"
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:602
+msgid "Cc:"
+msgstr "Cc:"
 
-#: my-evolution/Locations.h:108
-msgid "Antwerpen/Deurne"
+#: composer/e-msg-composer-hdrs.c:603
+msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: my-evolution/Locations.h:109
-msgid "Aomori Airport"
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:606
+msgid "Bcc:"
+msgstr "Bcc:"
 
-#: my-evolution/Locations.h:110
-msgid "Apalachicola"
+#: composer/e-msg-composer-hdrs.c:607
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
 msgstr ""
 
-#: my-evolution/Locations.h:111
-msgid "Appleton"
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:614
+msgid "Post To:"
 msgstr ""
 
-#: my-evolution/Locations.h:112
-msgid "Aquadilla"
+#: composer/e-msg-composer-hdrs.c:619
+msgid "Click here to select folders to post to"
 msgstr ""
 
-#: my-evolution/Locations.h:113
-msgid "Aracaju"
-msgstr ""
+#: composer/e-msg-composer-select-file.c:127
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Atatchî"
 
-#: my-evolution/Locations.h:114
-msgid "Arad"
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: my-evolution/Locations.h:115
-msgid "Arar"
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr ""
 
-#: my-evolution/Locations.h:116
-msgid "Araxos"
-msgstr ""
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Dji n' sai inicyî Bonobo"
 
-#: my-evolution/Locations.h:117
-msgid "Arcata"
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: my-evolution/Locations.h:118
-msgid "Ardmore"
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
 msgstr ""
 
-#: my-evolution/Locations.h:119
-msgid "Arequipa"
-msgstr ""
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:121
-msgid "Arica"
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
 msgstr ""
 
-#: my-evolution/Locations.h:122
-msgid "Arizona"
-msgstr "Arizona"
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Singapour"
 
-#: my-evolution/Locations.h:123
-msgid "Arkansas"
-msgstr "Arkansas"
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:124
-msgid "Arkhangelsk"
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: my-evolution/Locations.h:125
-msgid "Arlington"
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: my-evolution/Locations.h:126
-msgid "Artigas"
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
 msgstr ""
 
-#: my-evolution/Locations.h:127
-msgid "Asahikawa Ab"
+#: composer/e-msg-composer.c:2649
+#, c-format
+msgid "Attached message - %s"
 msgstr ""
 
-#: my-evolution/Locations.h:128
-msgid "Asahikawa Airport"
-msgstr ""
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Ataetchmint"
+msgstr[1] "Ataetchmint"
 
-#: my-evolution/Locations.h:129
-msgid "Ashburnam"
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 
-#: my-evolution/Locations.h:130
-msgid "Asheville"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
-#: my-evolution/Locations.h:131
-msgid "Ashfield"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
-#: my-evolution/Locations.h:132
-msgid "Ashiya Ab"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: my-evolution/Locations.h:133
-msgid "Ashland"
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#: my-evolution/Locations.h:134
-msgid "Asia"
-msgstr "Azeye"
-
-#: my-evolution/Locations.h:135
-msgid "Aspen"
+#. mail-composer:attach-nomessages primary
+#: composer/mail-composer-errors.xml.h:12
+msgid "Could not retrieve messages to attach from {0}."
 msgstr ""
 
-#: my-evolution/Locations.h:136
-msgid "Asswan"
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:137
-msgid "Astoria"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+msgid "Unfinished messages found"
 msgstr ""
 
-#: my-evolution/Locations.h:138
-msgid "Astrakhan"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:18
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: my-evolution/Locations.h:139
-msgid "Asturias"
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:20
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: my-evolution/Locations.h:140
-msgid "Asuncion"
+#: composer/mail-composer-errors.xml.h:21
+msgid "Don't Recover"
 msgstr ""
 
-#: my-evolution/Locations.h:141
-msgid "Athens"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Recover"
+msgstr "Oister"
 
-#: my-evolution/Locations.h:142
-msgid "Athinai"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:24
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:143
-msgid "Atlanta"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:26
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:144
-msgid "Atlantic"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:28
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: my-evolution/Locations.h:145
-msgid "Atlantic City"
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:30
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr ""
 
-#: my-evolution/Locations.h:146
-msgid "Atsugi US NAS"
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:32
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-#: my-evolution/Locations.h:147
-msgid "Auburn"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:34
+#, fuzzy
+msgid "Save Message"
+msgstr "Messaedje shuvant"
 
-#: my-evolution/Locations.h:148
-msgid "Auckland"
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not create message."
 msgstr ""
 
-#: my-evolution/Locations.h:149
-msgid "Augsburg"
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
-#: my-evolution/Locations.h:150
-msgid "Augusta"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:151
-msgid "Aurora"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:44
+msgid "All accounts have been removed."
 msgstr ""
 
-#: my-evolution/Locations.h:152
-msgid "Austin"
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:46
+msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
-#: my-evolution/Locations.h:153
-msgid "Australasia"
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+msgid "Could not create composer window."
 msgstr ""
 
-#: my-evolution/Locations.h:156
-msgid "Avalon"
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+msgid "Unable to activate the address selector control."
 msgstr ""
 
-#: my-evolution/Locations.h:157
-msgid "Aviano"
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 
-#: my-evolution/Locations.h:158
-msgid "Ayacucho"
+#: data/evolution.desktop.in.in.h:1
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
 
-#: my-evolution/Locations.h:159
-msgid "Bage"
+#: data/evolution.desktop.in.in.h:2
+msgid "Ximian Evolution (Unstable)"
 msgstr ""
 
-#: my-evolution/Locations.h:160
-msgid "Bagotville"
+#: data/evolution.keys.in.in.h:1
+msgid "address card"
 msgstr ""
 
-#: my-evolution/Locations.h:162
-msgid "Bahia Blanca"
+#: data/evolution.keys.in.in.h:2
+msgid "calendar information"
 msgstr ""
 
-#: my-evolution/Locations.h:163
-msgid "Bahias de Huatulco"
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
 msgstr ""
 
-#: my-evolution/Locations.h:165
-msgid "Baker City"
+#: designs/OOA/ooa.glade.h:4
+msgid "<b>Out of Office Message:</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:166
-msgid "Bakersfield"
-msgstr ""
+#: designs/OOA/ooa.glade.h:5
+#, fuzzy
+msgid "<b>Status:</b>"
+msgstr "Sitatut:"
 
-#: my-evolution/Locations.h:167
-msgid "Bale-Mulhouse"
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
 msgstr ""
 
-#: my-evolution/Locations.h:168
-msgid "Balikesir"
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
 msgstr ""
 
-#: my-evolution/Locations.h:169
-msgid "Balikesir/Bandirma"
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
 msgstr ""
 
-#: my-evolution/Locations.h:170
-msgid "Ball Mountain"
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
 msgstr ""
 
-#: my-evolution/Locations.h:171
-msgid "Baltimore"
+#: designs/OOA/ooa.glade.h:12
+msgid "Out of Office Assistant"
 msgstr ""
 
-#: my-evolution/Locations.h:172
-msgid "Baltimore-Glen Burnie"
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
 msgstr ""
 
-#: my-evolution/Locations.h:173
-msgid "Banak"
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
 msgstr ""
 
-#: my-evolution/Locations.h:174
-msgid "Bandarabbass"
+#: designs/read_receipts/read.glade.h:2
+msgid "<b>Receiving Email</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:175
-msgid "Bangor"
+#: designs/read_receipts/read.glade.h:3
+msgid "<b>Sending Email:</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:176
-msgid "Baracoa"
+#: designs/read_receipts/read.glade.h:4
+msgid ""
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 
-#: my-evolution/Locations.h:177
-msgid "Barbers Point"
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
 msgstr ""
 
-#: my-evolution/Locations.h:178
-msgid "Barcelona"
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
 msgstr ""
 
-#: my-evolution/Locations.h:179
-msgid "Bardufoss"
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
 msgstr ""
 
-#: my-evolution/Locations.h:180
-msgid "Bar Harbor"
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
 msgstr ""
 
-#: my-evolution/Locations.h:181
-msgid "Bari"
-msgstr "Bari"
-
-#: my-evolution/Locations.h:182
-msgid "Bariloche"
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
 msgstr ""
 
-#: my-evolution/Locations.h:183
-msgid "Barinas"
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
-#: my-evolution/Locations.h:184
-msgid "Barking Sand"
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
-#: my-evolution/Locations.h:185
-msgid "Barksdale"
+#: e-util/e-dialog-utils.c:249
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: my-evolution/Locations.h:186
-msgid "Barnaul"
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
+msgid "Overwrite file?"
 msgstr ""
 
-#: my-evolution/Locations.h:187
-msgid "Barquisimeto"
-msgstr ""
+#: e-util/e-passwords.c:358
+msgid "Remember this password"
+msgstr "Si rmimbrer di ci scret chal"
 
-#: my-evolution/Locations.h:188
-msgid "Barranquilla/Ernestocortissoz"
+#: e-util/e-passwords.c:360
+msgid "Remember this password for the remainder of this session"
 msgstr ""
 
-#: my-evolution/Locations.h:189
-msgid "Barrow"
+#: e-util/e-pilot-settings.c:93
+msgid "Sync Private Records:"
 msgstr ""
 
-#: my-evolution/Locations.h:190
-msgid "Barter Island"
+#: e-util/e-pilot-settings.c:102
+msgid "Sync Categories:"
 msgstr ""
 
-#: my-evolution/Locations.h:191
-msgid "Bartlesville"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+msgid "%a %m/%d/%Y %I:%M %p"
 msgstr ""
 
-#: my-evolution/Locations.h:192
-msgid "Bartow"
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %H:%M"
 msgstr ""
 
-#: my-evolution/Locations.h:193
-msgid "Bastia"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:195
+msgid "%a %m/%d/%Y %I %p"
 msgstr ""
 
-#: my-evolution/Locations.h:194
-msgid "Batesville"
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without minutes or seconds.
+#: e-util/e-time-utils.c:200
+msgid "%a %m/%d/%Y %H"
 msgstr ""
 
-#: my-evolution/Locations.h:195
-msgid "Batman"
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:211
+msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: my-evolution/Locations.h:196
-msgid "Baton Rouge"
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:215
+msgid "%m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#: my-evolution/Locations.h:197
-msgid "Battle Creek"
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:220
+msgid "%m/%d/%Y %I:%M %p"
 msgstr ""
 
-#: my-evolution/Locations.h:198
-msgid "Battle Mountain"
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:225
+msgid "%m/%d/%Y %H:%M"
 msgstr ""
 
-#: my-evolution/Locations.h:199
-msgid "Bauru"
+#. strptime format of a date and a time, in 12-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:230
+msgid "%m/%d/%Y %I %p"
 msgstr ""
 
-#: my-evolution/Locations.h:200
-msgid "Bayamo"
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:235
+msgid "%m/%d/%Y %H"
 msgstr ""
 
-#: my-evolution/Locations.h:201
-msgid "Bayreuth"
-msgstr ""
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
 
-#: my-evolution/Locations.h:202
-msgid "Beatrice"
-msgstr ""
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
 
-#: my-evolution/Locations.h:203
-msgid "Beaufort"
-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:1414 widgets/misc/e-dateedit.c:1639
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: my-evolution/Locations.h:204
-msgid "Beaumont"
-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:1411 widgets/misc/e-dateedit.c:1636
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: my-evolution/Locations.h:205
-msgid "Beaumont-Port Arthur"
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:356
+msgid "%I %p"
 msgstr ""
 
-#: my-evolution/Locations.h:206
-msgid "Beauvais-Tille"
-msgstr ""
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "segonde"
+msgstr[1] "segonde"
 
-#: my-evolution/Locations.h:207
-msgid "Beauvechain"
-msgstr ""
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "1 munute"
+msgstr[1] "1 munute"
 
-#: my-evolution/Locations.h:208
-msgid "Beckley"
-msgstr ""
+#: filter/filter-datespec.c:75
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:209
-msgid "Bedford"
-msgstr ""
+#: filter/filter-datespec.c:76
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:210
-msgid "Beijing"
-msgstr ""
+#: filter/filter-datespec.c:77
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:211
-msgid "Beirut"
-msgstr ""
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] "moes"
+msgstr[1] "moes"
 
-#: my-evolution/Locations.h:212
-msgid "Beja"
-msgstr ""
+#: filter/filter-datespec.c:79
+#, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:213
-msgid "Belem"
+#: filter/filter-datespec.c:280
+msgid "<click here to select a date>"
 msgstr ""
 
-#: my-evolution/Locations.h:214
-msgid "Belfast/Aldergrove"
-msgstr ""
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
+msgid "now"
+msgstr "asteure"
 
-#: my-evolution/Locations.h:215
-msgid "Belfast/Harbour"
-msgstr ""
+#. strftime for date filter display, only needs to show a day date (i.e. no time)
+#: filter/filter-datespec.c:290
+#, fuzzy
+msgid "%d-%b-%Y"
+msgstr "%d %b"
 
-#: my-evolution/Locations.h:217
-msgid "Belgorod"
+#: filter/filter-datespec.c:406
+msgid "Select a time to compare against"
 msgstr ""
 
-#: my-evolution/Locations.h:219
-msgid "Belleville"
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: my-evolution/Locations.h:220
-msgid "Bellingham"
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: my-evolution/Locations.h:221
-msgid "Belmar-Farmingdale"
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: my-evolution/Locations.h:222
-msgid "Belo Horizonte"
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: my-evolution/Locations.h:223
-msgid "Belo Horizonte Apt"
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: my-evolution/Locations.h:224
-msgid "Bemidji"
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:14
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:225
-msgid "Benbecula"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:16
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:226
-msgid "Benina"
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
+msgid "Missing name."
 msgstr ""
 
-#: my-evolution/Locations.h:227
-msgid "Benton Harbor"
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:20
+msgid "You must name this filter."
 msgstr ""
 
-#: my-evolution/Locations.h:228
-msgid "Bentonville"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:22
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: my-evolution/Locations.h:229
-msgid "Beograd"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:24
+msgid "Please choose another name."
 msgstr ""
 
-#: my-evolution/Locations.h:230
-msgid "Bergamo"
-msgstr ""
+#: filter/filter-file.c:288
+#, fuzzy
+msgid "Choose a file"
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:231
-msgid "Bergen"
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+msgid "Important"
 msgstr ""
 
-#: my-evolution/Locations.h:232
-msgid "Bergstrom AFB"
-msgstr ""
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
 
-#: my-evolution/Locations.h:233
-msgid "Berlevag"
-msgstr ""
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Later"
+msgstr "Date"
 
-#: my-evolution/Locations.h:234
-msgid "Berlin"
-msgstr "Berlin"
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Sayî"
 
-#: my-evolution/Locations.h:235
-msgid "Berlin-Tegel"
-msgstr ""
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "No do fitchî:"
 
-#: my-evolution/Locations.h:236
-msgid "Berlin-Tempelhof"
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:237
-msgid "Bern"
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
 msgstr ""
 
-#: my-evolution/Locations.h:238
-msgid "Bethel"
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
 msgstr ""
 
-#: my-evolution/Locations.h:239
-msgid "Bethlehem Airport"
+#: filter/filter-rule.c:856
+msgid "Execute actions"
 msgstr ""
 
-#: my-evolution/Locations.h:240
-msgid "Bettles"
+#: filter/filter-rule.c:877
+msgid "All related"
 msgstr ""
 
-#: my-evolution/Locations.h:241
-msgid "Beverly"
-msgstr ""
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Responde"
 
-#: my-evolution/Locations.h:242
-msgid "Biarritz-Bayonne"
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
 msgstr ""
 
-#: my-evolution/Locations.h:243
-msgid "Bicycle Lake"
+#: filter/filter-rule.c:879
+msgid "Include threads"
 msgstr ""
 
-#: my-evolution/Locations.h:244
-msgid "Biggin Hill"
+#: filter/filter-rule.c:974
+msgid "incoming"
 msgstr ""
 
-#: my-evolution/Locations.h:245
-msgid "Big Piney"
+#: filter/filter-rule.c:974
+msgid "outgoing"
 msgstr ""
 
-#: my-evolution/Locations.h:246
-msgid "Big River Lake"
-msgstr ""
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Rîles po les passetes"
 
-#: my-evolution/Locations.h:247
-msgid "Bilbao"
+#: filter/filter.glade.h:2
+msgid "Compare against"
 msgstr ""
 
-#: my-evolution/Locations.h:248
-msgid "Billings"
-msgstr ""
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Intrêye"
 
-#: my-evolution/Locations.h:249
-msgid "Billund"
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
 msgstr ""
 
-#: my-evolution/Locations.h:250
-msgid "Binghamton"
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
 msgstr ""
 
-#: my-evolution/Locations.h:251
-msgid "Birmingham"
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
 msgstr ""
 
-#: my-evolution/Locations.h:252
-msgid "Bisha"
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
 msgstr ""
 
-#: my-evolution/Locations.h:253
-msgid "Bishop"
+#: filter/filter.glade.h:12
+msgid "ago"
 msgstr ""
 
-#: my-evolution/Locations.h:254
-msgid "Bismark"
-msgstr ""
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "moes"
 
-#: my-evolution/Locations.h:255
-msgid "Blackpool"
-msgstr ""
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segondes"
 
-#: my-evolution/Locations.h:256
-msgid "Blagoveschensk"
+#: filter/filter.glade.h:18
+msgid "the current time"
 msgstr ""
 
-#: my-evolution/Locations.h:257
-msgid "Blanding"
+#: filter/filter.glade.h:19
+msgid "the time you specify"
 msgstr ""
 
-#: my-evolution/Locations.h:258
-msgid "Block Island"
-msgstr ""
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "anêyes"
 
-#: my-evolution/Locations.h:259
-msgid "Bloemfontein J. B. M. Hertzog "
+#: filter/rule-editor.c:285
+msgid "Add Rule"
 msgstr ""
 
-#: my-evolution/Locations.h:260
-msgid "Bloomington"
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
 msgstr ""
 
-#: my-evolution/Locations.h:261
-msgid "Blue Canyon"
-msgstr ""
+#: filter/rule-editor.c:685
+#, fuzzy
+msgid "Rule name"
+msgstr "_Rilomer"
 
-#: my-evolution/Locations.h:262
-msgid "Bluefield"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: my-evolution/Locations.h:263
-msgid "Bluefields"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: my-evolution/Locations.h:264
-msgid "Blythe"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: my-evolution/Locations.h:265
-msgid "Boa Vista"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: my-evolution/Locations.h:266
-msgid "Bocas del Toro"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: my-evolution/Locations.h:267
-msgid "Bodo"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: my-evolution/Locations.h:268
-msgid "Bogota/Eldorado"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
-#: my-evolution/Locations.h:269
-msgid "Boise"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
 msgstr ""
 
-#: my-evolution/Locations.h:271
-msgid "Bologna"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: my-evolution/Locations.h:272
-msgid "Bolzano"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#: my-evolution/Locations.h:273
-msgid "Bombay/Santacruz"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: my-evolution/Locations.h:274
-msgid "Boone"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Emile"
 
-#: my-evolution/Locations.h:275
-msgid "Bordeaux"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Conte"
 
-#: my-evolution/Locations.h:276
-msgid "Borger"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
 msgstr ""
 
-#: my-evolution/Locations.h:277
-msgid "Bornholm"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Emile"
 
-#: my-evolution/Locations.h:278
-msgid "Boscombe Down"
-msgstr ""
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+#, fuzzy
+msgid "[Default]"
+msgstr "Prémetou"
 
-#: my-evolution/Locations.h:279
-msgid "Bosnia-Herzegovina"
-msgstr "Bosneye ey Herzegovine"
+#: mail/em-account-prefs.c:472
+#, fuzzy
+msgid "Account name"
+msgstr "No do _conte:"
 
-#: my-evolution/Locations.h:280
-msgid "Boston"
-msgstr ""
+#: mail/em-account-prefs.c:474
+#, fuzzy
+msgid "Protocol"
+msgstr "Porto Rico"
 
-#: my-evolution/Locations.h:281
-msgid "Boulmer"
-msgstr ""
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+#, fuzzy
+msgid "Unnamed"
+msgstr "Nén defineye"
 
-#: my-evolution/Locations.h:282
-msgid "Bourges"
-msgstr ""
+#: mail/em-composer-prefs.c:909
+#, fuzzy
+msgid "Language(s)"
+msgstr "Lingaedje"
 
-#: my-evolution/Locations.h:283
-msgid "Bournemouth"
+#: mail/em-composer-prefs.c:955
+msgid "Add signature script"
 msgstr ""
 
-#: my-evolution/Locations.h:284
-msgid "Bowling Green"
-msgstr ""
+#: mail/em-composer-prefs.c:975
+#, fuzzy
+msgid "Signature(s)"
+msgstr "munutes(s)"
 
-#: my-evolution/Locations.h:285
-msgid "Bozeman"
+#: mail/em-composer-utils.c:887
+msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: my-evolution/Locations.h:286
-msgid "Bradford"
+#: mail/em-composer-utils.c:1500
+msgid "an unknown sender"
 msgstr ""
 
-#: my-evolution/Locations.h:287
-msgid "Bradshaw Field"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: my-evolution/Locations.h:288
-msgid "Brainerd"
-msgstr ""
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Rîles po les passetes"
 
-#: my-evolution/Locations.h:289
-msgid "Brasilia"
-msgstr ""
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Tchoezi ridant"
 
-#: my-evolution/Locations.h:290
-msgid "Brasschaat"
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
 msgstr ""
 
-#: my-evolution/Locations.h:291
-msgid "Bratislava"
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
 msgstr ""
 
-#: my-evolution/Locations.h:292
-msgid "Bratsk"
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
 msgstr ""
 
-#: my-evolution/Locations.h:293
-msgid "Braunschweig"
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
 msgstr ""
 
-#: my-evolution/Locations.h:295
-msgid "Bremen"
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
 msgstr "Brême"
 
-#: my-evolution/Locations.h:296
-msgid "Bremerton"
-msgstr ""
-
-#: my-evolution/Locations.h:297
-msgid "Brest"
-msgstr ""
-
-#: my-evolution/Locations.h:298
-msgid "Bridgeport"
-msgstr ""
-
-#: my-evolution/Locations.h:299
-msgid "Brindisi"
-msgstr ""
-
-#: my-evolution/Locations.h:300
-msgid "Brisbane"
-msgstr ""
-
-#: my-evolution/Locations.h:301
-msgid "Bristol"
-msgstr ""
-
-#: my-evolution/Locations.h:302
-msgid "British Columbia"
-msgstr "Colombeye britanike"
-
-#: my-evolution/Locations.h:303
-msgid "Brno"
-msgstr ""
-
-#: my-evolution/Locations.h:304
-msgid "Broadus"
-msgstr ""
-
-#: my-evolution/Locations.h:305
-msgid "Broken Bow"
-msgstr ""
-
-#: my-evolution/Locations.h:306
-msgid "Bronnoysund"
-msgstr ""
-
-#: my-evolution/Locations.h:307
-msgid "Brookings"
-msgstr ""
-
-#: my-evolution/Locations.h:308
-msgid "Brooksville"
-msgstr ""
-
-#: my-evolution/Locations.h:309
-msgid "Broome"
-msgstr ""
-
-#: my-evolution/Locations.h:310
-msgid "Brownsville"
-msgstr ""
-
-#: my-evolution/Locations.h:311
-msgid "Brunswick"
-msgstr ""
-
-#: my-evolution/Locations.h:312
-msgid "Brussels-National Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:313
-msgid "Bryansk"
-msgstr ""
-
-#: my-evolution/Locations.h:314
-msgid "Bryce Canyon"
-msgstr ""
-
-#: my-evolution/Locations.h:315
-msgid "Bucaramanga/Palonegro"
-msgstr ""
-
-#: my-evolution/Locations.h:316
-msgid "Bucuresti"
-msgstr ""
-
-#: my-evolution/Locations.h:317
-msgid "Bucuresti-Otopeni"
-msgstr ""
-
-#: my-evolution/Locations.h:318
-msgid "Budapest"
-msgstr ""
-
-#: my-evolution/Locations.h:319
-msgid "Buffalo"
-msgstr ""
-
-#: my-evolution/Locations.h:321
-msgid "Bullfrog"
-msgstr ""
-
-#: my-evolution/Locations.h:322
-msgid "Burbank"
-msgstr ""
-
-#: my-evolution/Locations.h:323
-msgid "Burgas"
-msgstr ""
-
-#: my-evolution/Locations.h:324
-msgid "Burley"
-msgstr ""
-
-#: my-evolution/Locations.h:325
-msgid "Burlington"
-msgstr ""
-
-#: my-evolution/Locations.h:326
-msgid "Burnet"
-msgstr ""
-
-#: my-evolution/Locations.h:327
-msgid "Burns"
-msgstr ""
-
-#: my-evolution/Locations.h:328
-msgid "Bursa"
-msgstr ""
-
-#: my-evolution/Locations.h:329
-msgid "Burwell"
-msgstr ""
-
-#: my-evolution/Locations.h:330
-msgid "Butte"
-msgstr ""
-
-#: my-evolution/Locations.h:331
-msgid "Caen-Carpiquet"
-msgstr ""
-
-#: my-evolution/Locations.h:332
-msgid "Cagliari"
-msgstr ""
-
-#: my-evolution/Locations.h:333
-msgid "Cairns"
-msgstr ""
-
-#: my-evolution/Locations.h:334
-msgid "Cairo"
-msgstr ""
-
-#: my-evolution/Locations.h:335
-msgid "Calabozo"
-msgstr ""
-
-#: my-evolution/Locations.h:336
-msgid "Calcutta/Dum Dum"
-msgstr ""
-
-#: my-evolution/Locations.h:337
-msgid "Caldwell"
-msgstr ""
-
-#: my-evolution/Locations.h:338
-msgid "Calgary"
-msgstr ""
-
-#: my-evolution/Locations.h:339
-msgid "Cali/Alfonso Bonillaaragon"
-msgstr ""
-
-#: my-evolution/Locations.h:340
-msgid "Caliente"
-msgstr ""
-
-#: my-evolution/Locations.h:341
-msgid "California"
-msgstr "Californeye"
-
-#: my-evolution/Locations.h:342
-msgid "Calvi-Ste-Catherine"
-msgstr ""
-
-#: my-evolution/Locations.h:343
-msgid "Camaguey"
-msgstr ""
-
-#: my-evolution/Locations.h:344
-msgid "Camarillo"
-msgstr ""
-
-#: my-evolution/Locations.h:345
-msgid "Cambridge"
-msgstr ""
-
-#: my-evolution/Locations.h:346
-msgid "Cameron"
-msgstr ""
-
-#: my-evolution/Locations.h:347
-msgid "Camiri"
-msgstr ""
-
-#: my-evolution/Locations.h:348
-msgid "Campeche"
-msgstr ""
-
-#: my-evolution/Locations.h:349
-msgid "Campinas"
-msgstr ""
-
-#: my-evolution/Locations.h:350
-msgid "Campo"
-msgstr ""
-
-#: my-evolution/Locations.h:351
-msgid "Campo Grande"
-msgstr ""
-
-#: my-evolution/Locations.h:352
-msgid "Camp Stanley/H-207"
-msgstr ""
-
-#: my-evolution/Locations.h:353
-msgid "Canaan"
-msgstr ""
-
-#: my-evolution/Locations.h:355
-msgid "Canarias/Fuerteventura"
-msgstr ""
-
-#: my-evolution/Locations.h:356
-msgid "Canarias/Gran Canaria"
-msgstr ""
-
-#: my-evolution/Locations.h:357
-msgid "Canarias/Hierro"
-msgstr ""
-
-#: my-evolution/Locations.h:358
-msgid "Canarias/Lanzarote"
-msgstr ""
-
-#: my-evolution/Locations.h:359
-msgid "Canarias/La Palma"
-msgstr ""
-
-#: my-evolution/Locations.h:360
-msgid "Canarias/Tenerife Norte"
-msgstr ""
-
-#: my-evolution/Locations.h:361
-msgid "Canarias/Tenerife Sur"
-msgstr ""
-
-#: my-evolution/Locations.h:362
-msgid "Canberra"
-msgstr ""
-
-#: my-evolution/Locations.h:363
-msgid "Cancun"
-msgstr ""
-
-#: my-evolution/Locations.h:364
-msgid "Cannes-Mandelieu"
-msgstr ""
-
-#: my-evolution/Locations.h:365
-msgid "Cantwell"
-msgstr ""
-
-#: my-evolution/Locations.h:366
-msgid "Cape Girardeau"
-msgstr ""
-
-#: my-evolution/Locations.h:367
-msgid "Cape Hatteras"
-msgstr ""
-
-#: my-evolution/Locations.h:368
-msgid "Cape Lisburne"
-msgstr ""
-
-#: my-evolution/Locations.h:369
-msgid "Cape Newenham"
-msgstr ""
-
-#: my-evolution/Locations.h:370
-msgid "Cape Romanzoff"
-msgstr ""
-
-#: my-evolution/Locations.h:371
-msgid "Cape Town D. F. Malan "
-msgstr ""
-
-#: my-evolution/Locations.h:372
-msgid "Capitan Corbeta"
-msgstr ""
-
-#: my-evolution/Locations.h:373
-msgid "Capo Mele"
-msgstr ""
-
-#: my-evolution/Locations.h:374
-msgid "Caracas La Carlota"
-msgstr ""
-
-#: my-evolution/Locations.h:375
-msgid "Caracas Maiquetia"
-msgstr ""
-
-#: my-evolution/Locations.h:376
-msgid "Caravelas"
-msgstr ""
-
-#: my-evolution/Locations.h:377
-msgid "Carbondale"
-msgstr ""
-
-#: my-evolution/Locations.h:378
-msgid "Cardiff"
-msgstr ""
-
-#: my-evolution/Locations.h:379
-msgid "Caribou"
-msgstr ""
-
-#: my-evolution/Locations.h:380
-msgid "Carlisle"
-msgstr ""
-
-#: my-evolution/Locations.h:381
-msgid "Carlsbad"
-msgstr ""
-
-#: my-evolution/Locations.h:382
-msgid "Carroll"
-msgstr ""
-
-#: my-evolution/Locations.h:383
-msgid "Cartagena/Rafael Nunez"
-msgstr ""
-
-#: my-evolution/Locations.h:384
-msgid "Casa Granda"
-msgstr ""
-
-#: my-evolution/Locations.h:385
-msgid "Cascade"
-msgstr ""
-
-#: my-evolution/Locations.h:386
-msgid "Casper"
-msgstr ""
-
-#: my-evolution/Locations.h:387
-msgid "Catacamas"
-msgstr ""
-
-#: my-evolution/Locations.h:388
-msgid "Catania"
-msgstr "Catania"
-
-#: my-evolution/Locations.h:390
-msgid "Cayo Largo del Sur"
-msgstr ""
-
-#: my-evolution/Locations.h:391
-msgid "Cazaux"
-msgstr ""
-
-#: my-evolution/Locations.h:392
-msgid "Cecil NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:393
-msgid "Cedar City"
-msgstr ""
-
-#: my-evolution/Locations.h:394
-msgid "Cedar Rapids"
-msgstr ""
-
-#: my-evolution/Locations.h:395
-msgid "Central and South America"
-msgstr "Amerike nonnrece et cintråle"
-
-#: my-evolution/Locations.h:396
-msgid "Cervia"
-msgstr ""
-
-#: my-evolution/Locations.h:397
-msgid "Chacarita"
-msgstr ""
-
-#: my-evolution/Locations.h:398
-msgid "Chadron"
-msgstr ""
-
-#: my-evolution/Locations.h:399
-msgid "Challis"
-msgstr ""
-
-#: my-evolution/Locations.h:400
-msgid "Chamberlain"
-msgstr ""
-
-#: my-evolution/Locations.h:401
-msgid "Chambery"
-msgstr ""
-
-#: my-evolution/Locations.h:402
-msgid "Champaign"
-msgstr ""
-
-#: my-evolution/Locations.h:403
-msgid "Chandalar Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:404
-msgid "Chandler"
-msgstr ""
-
-#: my-evolution/Locations.h:405
-msgid "Chania"
-msgstr "Chania"
-
-#: my-evolution/Locations.h:406
-msgid "Chanute"
-msgstr ""
-
-#: my-evolution/Locations.h:407
-msgid "Chariton"
-msgstr ""
-
-#: my-evolution/Locations.h:408
-msgid "Charleroi-Brussels South"
-msgstr "Gochliye-Tchårlerwè"
-
-#: my-evolution/Locations.h:409
-msgid "Charles City"
-msgstr ""
-
-#: my-evolution/Locations.h:410
-msgid "Charleston"
-msgstr "Charleston"
-
-#: my-evolution/Locations.h:411
-msgid "Charlotte"
-msgstr ""
-
-#: my-evolution/Locations.h:412
-msgid "Charlottesville"
-msgstr ""
-
-#: my-evolution/Locations.h:413
-msgid "Chatham"
-msgstr ""
-
-#: my-evolution/Locations.h:414
-msgid "Chattanooga"
-msgstr "Chattanooga"
-
-#: my-evolution/Locations.h:415
-msgid "Cheboksary"
-msgstr ""
-
-#: my-evolution/Locations.h:416
-msgid "Cheju"
-msgstr ""
-
-#: my-evolution/Locations.h:417
-msgid "Chelyabinsk"
-msgstr ""
-
-#: my-evolution/Locations.h:418
-msgid "Chengdu"
-msgstr ""
-
-#: my-evolution/Locations.h:419
-msgid "Cherbourg"
-msgstr ""
-
-#: my-evolution/Locations.h:420
-msgid "Cherry Point"
-msgstr ""
-
-#: my-evolution/Locations.h:421
-msgid "Chetumal"
-msgstr ""
-
-#: my-evolution/Locations.h:422
-msgid "Cheyenne"
-msgstr "Tcheyinne"
-
-#: my-evolution/Locations.h:423
-msgid "Chiang Kai Shek"
-msgstr ""
-
-#: my-evolution/Locations.h:424
-msgid "Chia Tung"
-msgstr ""
-
-#: my-evolution/Locations.h:425
-msgid "Chiayi"
-msgstr ""
-
-#: my-evolution/Locations.h:426
-msgid "Chicago-DuPage"
-msgstr ""
-
-#: my-evolution/Locations.h:427
-msgid "Chicago-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:428
-msgid "Chicago-Midway"
-msgstr ""
-
-#: my-evolution/Locations.h:429
-msgid "Chicago-O'Hare"
-msgstr ""
-
-#: my-evolution/Locations.h:430
-msgid "Chichijima"
-msgstr ""
-
-#: my-evolution/Locations.h:431
-msgid "Chiclayo"
-msgstr ""
-
-#: my-evolution/Locations.h:432
-msgid "Chico"
-msgstr ""
-
-#: my-evolution/Locations.h:433
-msgid "Chicopee Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:434
-msgid "Chievres"
-msgstr ""
-
-#: my-evolution/Locations.h:435
-msgid "Chihhang"
-msgstr ""
-
-#: my-evolution/Locations.h:436
-msgid "Chihuahua"
-msgstr ""
-
-#: my-evolution/Locations.h:437
-msgid "Childress"
-msgstr ""
-
-#: my-evolution/Locations.h:439
-msgid "China Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:440
-msgid "Chinandega"
-msgstr "Chinandega"
-
-#: my-evolution/Locations.h:441
-msgid "Chinmem/Shatou"
-msgstr ""
-
-#: my-evolution/Locations.h:442
-msgid "Chino"
-msgstr ""
-
-#: my-evolution/Locations.h:443
-msgid "Chippewa County"
-msgstr ""
-
-#: my-evolution/Locations.h:444
-msgid "Chita"
-msgstr ""
-
-#: my-evolution/Locations.h:445
-msgid "Chitose Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:446
-msgid "Chitose ASDF"
-msgstr ""
-
-#: my-evolution/Locations.h:447
-msgid "Chofu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:448
-msgid "Choluteca"
-msgstr ""
-
-#: my-evolution/Locations.h:449
-msgid "Chongju Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:450
-msgid "Christchurch"
-msgstr ""
-
-#: my-evolution/Locations.h:452
-msgid "Chulitna"
-msgstr ""
-
-#: my-evolution/Locations.h:453
-msgid "Churchill"
-msgstr ""
-
-#: my-evolution/Locations.h:454
-msgid "Churchill Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:455
-msgid "Cincinnati"
-msgstr ""
-
-#: my-evolution/Locations.h:456
-msgid "Circle City"
-msgstr ""
-
-#: my-evolution/Locations.h:457
-msgid "Ciudad Bolivar"
-msgstr ""
-
-#: my-evolution/Locations.h:458
-msgid "Ciudad del Carmen"
-msgstr ""
-
-#: my-evolution/Locations.h:459
-msgid "Ciudad Juarez"
-msgstr ""
-
-#: my-evolution/Locations.h:460
-msgid "Ciudad Obregon"
-msgstr ""
-
-#: my-evolution/Locations.h:461
-msgid "Ciudad Victoria"
-msgstr ""
-
-#: my-evolution/Locations.h:462
-msgid "Clarinda"
-msgstr ""
-
-#: my-evolution/Locations.h:463
-msgid "Clarion"
-msgstr ""
-
-#: my-evolution/Locations.h:464
-msgid "Clarksburg"
-msgstr ""
-
-#: my-evolution/Locations.h:465
-msgid "Clayton"
-msgstr ""
-
-#: my-evolution/Locations.h:466
-msgid "Clayton Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:467
-msgid "Clermont-Ferrand"
-msgstr ""
-
-#: my-evolution/Locations.h:468
-msgid "Cleveland"
-msgstr ""
-
-#: my-evolution/Locations.h:469
-msgid "Cleveland/Cuyahoga"
-msgstr ""
-
-#: my-evolution/Locations.h:470
-msgid "Cleveland-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:471
-msgid "Clinton"
-msgstr ""
-
-#: my-evolution/Locations.h:472
-msgid "Clovis-Cannon AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:473
-msgid "Cobija"
-msgstr ""
-
-#: my-evolution/Locations.h:474
-msgid "Cochabamba"
-msgstr ""
-
-#: my-evolution/Locations.h:475
-msgid "Cocoa Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:476
-msgid "Cocos Island"
-msgstr ""
-
-#: my-evolution/Locations.h:477
-msgid "Cody"
-msgstr ""
-
-#: my-evolution/Locations.h:478
-msgid "Coeur d'Alene"
-msgstr ""
-
-#: my-evolution/Locations.h:479
-msgid "Cold Bay"
-msgstr ""
-
-#: my-evolution/Locations.h:480
-msgid "Colima"
-msgstr ""
-
-#: my-evolution/Locations.h:481
-msgid "College Station"
-msgstr ""
-
-#: my-evolution/Locations.h:482
-msgid "Colmar-Meyenheim"
-msgstr ""
-
-#: my-evolution/Locations.h:484
-msgid "Colonia"
-msgstr ""
-
-#: my-evolution/Locations.h:485
-msgid "Colorado"
-msgstr "Colorado"
-
-#: my-evolution/Locations.h:486
-msgid "Colorado Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:487
-msgid "Columbia"
-msgstr ""
-
-#: my-evolution/Locations.h:488
-msgid "Columbia-McEntire"
-msgstr ""
-
-#: my-evolution/Locations.h:489
-msgid "Columbus"
-msgstr ""
-
-#: my-evolution/Locations.h:490
-msgid "Columbus-Fort Benning"
-msgstr ""
-
-#: my-evolution/Locations.h:491
-msgid "Columbus-Gahanna"
-msgstr ""
-
-#: my-evolution/Locations.h:492
-msgid "Columbus-OSU"
-msgstr ""
-
-#: my-evolution/Locations.h:493
-msgid "Columbus-W Point-Starkville"
-msgstr ""
-
-#: my-evolution/Locations.h:494
-msgid "Colville"
-msgstr ""
-
-#: my-evolution/Locations.h:495
-msgid "Comodoro Rivadavia"
-msgstr ""
-
-#: my-evolution/Locations.h:496
-msgid "Comox"
-msgstr ""
-
-#: my-evolution/Locations.h:497
-msgid "Conceicao Do Araguaia"
-msgstr ""
-
-#: my-evolution/Locations.h:498
-msgid "Concepcion"
-msgstr ""
-
-#: my-evolution/Locations.h:499
-msgid "Concord"
-msgstr ""
-
-#: my-evolution/Locations.h:500
-msgid "Concordia"
-msgstr ""
-
-#: my-evolution/Locations.h:501
-msgid "Connaught"
-msgstr ""
-
-#: my-evolution/Locations.h:502
-msgid "Connecticut"
-msgstr "Connecticut"
-
-#: my-evolution/Locations.h:503
-msgid "Conroe"
-msgstr ""
-
-#: my-evolution/Locations.h:504
-msgid "Constantine"
-msgstr ""
-
-#: my-evolution/Locations.h:505
-msgid "Copper Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:506
-msgid "Cordoba"
-msgstr "Córdoba"
-
-#: my-evolution/Locations.h:507
-msgid "Cordova"
-msgstr ""
-
-#: my-evolution/Locations.h:508
-msgid "Cork"
-msgstr ""
-
-#: my-evolution/Locations.h:509
-msgid "Coro"
-msgstr ""
-
-#: my-evolution/Locations.h:510
-msgid "Corona"
-msgstr ""
-
-#: my-evolution/Locations.h:511
-msgid "Corpus Christi"
-msgstr ""
-
-#: my-evolution/Locations.h:512
-msgid "Corpus Christi NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:513
-msgid "Corrientes"
-msgstr ""
-
-#: my-evolution/Locations.h:514
-msgid "Corsicana"
-msgstr ""
-
-#: my-evolution/Locations.h:515
-msgid "Cortez"
-msgstr ""
-
-#: my-evolution/Locations.h:516
-msgid "Corumba"
-msgstr ""
-
-#: my-evolution/Locations.h:518
-msgid "Cotulla"
-msgstr ""
-
-#: my-evolution/Locations.h:519
-msgid "Council Bluffs"
-msgstr ""
-
-#: my-evolution/Locations.h:520
-msgid "Coventry"
-msgstr "Coventry"
-
-#: my-evolution/Locations.h:521
-msgid "Covington"
-msgstr ""
-
-#: my-evolution/Locations.h:522
-msgid "Cozumel"
-msgstr ""
-
-#: my-evolution/Locations.h:523
-msgid "Craig"
-msgstr ""
-
-#: my-evolution/Locations.h:524
-msgid "Cranfield"
-msgstr ""
-
-#: my-evolution/Locations.h:525
-msgid "Crescent City"
-msgstr ""
-
-#: my-evolution/Locations.h:526
-msgid "Creston"
-msgstr ""
-
-#: my-evolution/Locations.h:527
-msgid "Crestview"
-msgstr ""
-
-#: my-evolution/Locations.h:529
-msgid "Cross City"
-msgstr ""
-
-#: my-evolution/Locations.h:530
-msgid "Crossville"
-msgstr ""
-
-#: my-evolution/Locations.h:531
-msgid "Crotone"
-msgstr ""
-
-#: my-evolution/Locations.h:533
-msgid "Cuba Awrs"
-msgstr ""
-
-#: my-evolution/Locations.h:534
-msgid "Cuernavaca"
-msgstr ""
-
-#: my-evolution/Locations.h:535
-msgid "Cuiaba"
-msgstr ""
-
-#: my-evolution/Locations.h:536
-msgid "Culdrose"
-msgstr ""
-
-#: my-evolution/Locations.h:537
-msgid "Culiacan"
-msgstr ""
-
-#: my-evolution/Locations.h:538
-msgid "Cumana"
-msgstr ""
-
-#: my-evolution/Locations.h:539
-msgid "Cumberland"
-msgstr ""
-
-#: my-evolution/Locations.h:540
-msgid "Curitiba"
-msgstr ""
-
-#: my-evolution/Locations.h:541
-msgid "Curitiba Apt"
-msgstr ""
-
-#: my-evolution/Locations.h:542
-msgid "Custer"
-msgstr ""
-
-#: my-evolution/Locations.h:543
-msgid "Cut Bank"
-msgstr ""
-
-#: my-evolution/Locations.h:544
-msgid "Cuzco"
-msgstr ""
-
-#: my-evolution/Locations.h:547
-msgid "Dagali"
-msgstr ""
-
-#: my-evolution/Locations.h:548
-msgid "Daggett"
-msgstr ""
-
-#: my-evolution/Locations.h:549
-msgid "Dalhart"
-msgstr ""
-
-#: my-evolution/Locations.h:550
-msgid "Dalian"
-msgstr ""
-
-#: my-evolution/Locations.h:551
-msgid "Dallas-Addison"
-msgstr ""
-
-#: my-evolution/Locations.h:552
-msgid "Dallas-Fort Worth"
-msgstr ""
-
-#: my-evolution/Locations.h:553
-msgid "Dallas-Love Field"
-msgstr ""
-
-#: my-evolution/Locations.h:554
-msgid "Dallas-Redbird"
-msgstr ""
-
-#: my-evolution/Locations.h:555
-msgid "Da Nang"
-msgstr ""
-
-#: my-evolution/Locations.h:556
-msgid "Danbury"
-msgstr ""
-
-#: my-evolution/Locations.h:557
-msgid "Danville"
-msgstr ""
-
-#: my-evolution/Locations.h:558
-msgid "Dar-El-Beida"
-msgstr ""
-
-#: my-evolution/Locations.h:559
-msgid "Davenport"
-msgstr ""
-
-#: my-evolution/Locations.h:560
-msgid "David"
-msgstr ""
-
-#: my-evolution/Locations.h:561
-msgid "Dawadmi"
-msgstr ""
-
-#: my-evolution/Locations.h:562
-msgid "Dayton"
-msgstr ""
-
-#: my-evolution/Locations.h:563
-msgid "Daytona Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:564
-msgid "Dayton-Fairborn"
-msgstr ""
-
-#: my-evolution/Locations.h:565
-msgid "Dayton-South Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:566
-msgid "Dead Horse"
-msgstr ""
-
-#: my-evolution/Locations.h:567
-msgid "Deauville-Saint-Gatien"
-msgstr ""
-
-#: my-evolution/Locations.h:568
-msgid "Decatur"
-msgstr ""
-
-#: my-evolution/Locations.h:569
-msgid "Decimomannu"
-msgstr ""
-
-#: my-evolution/Locations.h:570
-msgid "Decorah"
-msgstr ""
-
-#: my-evolution/Locations.h:571
-msgid "Deelen"
-msgstr ""
-
-#: my-evolution/Locations.h:572
-msgid "Dekalb/Peachtree"
-msgstr ""
-
-#: my-evolution/Locations.h:573
-msgid "Delaware"
-msgstr "Delaware"
-
-#: my-evolution/Locations.h:574
-msgid "Del Bajio"
-msgstr ""
-
-#: my-evolution/Locations.h:575
-msgid "Del Rio"
-msgstr ""
-
-#: my-evolution/Locations.h:576
-msgid "Delta"
-msgstr ""
-
-#: my-evolution/Locations.h:577
-msgid "Deming"
-msgstr ""
-
-#: my-evolution/Locations.h:578
-msgid "Den Helder/De Kooy"
-msgstr ""
-
-#: my-evolution/Locations.h:579
-msgid "Denison"
-msgstr ""
-
-#: my-evolution/Locations.h:581
-msgid "Denton"
-msgstr ""
-
-#: my-evolution/Locations.h:582
-msgid "Denver"
-msgstr ""
-
-#: my-evolution/Locations.h:583
-msgid "Denver-Aurora"
-msgstr ""
-
-#: my-evolution/Locations.h:584
-msgid "Denver-Broomfield"
-msgstr ""
-
-#: my-evolution/Locations.h:585
-msgid "Denver-Cherry Knolls"
-msgstr ""
-
-#: my-evolution/Locations.h:586
-msgid "Desert Rock"
-msgstr ""
-
-#: my-evolution/Locations.h:587
-msgid "Des Moines"
-msgstr ""
-
-#: my-evolution/Locations.h:588
-msgid "Destin"
-msgstr ""
-
-#: my-evolution/Locations.h:589
-msgid "Detroit"
-msgstr ""
-
-#: my-evolution/Locations.h:590
-msgid "Detroit Lakes"
-msgstr ""
-
-#: my-evolution/Locations.h:591
-msgid "Detroit-Taylor"
-msgstr ""
-
-#: my-evolution/Locations.h:592
-msgid "Detroit/Ypsilanti"
-msgstr ""
-
-#: my-evolution/Locations.h:593
-msgid "Devils Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:594
-msgid "Devils Lake (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:595
-msgid "Dhahran"
-msgstr ""
-
-#: my-evolution/Locations.h:596
-msgid "Dickinson"
-msgstr ""
-
-#: my-evolution/Locations.h:597
-msgid "Dijon"
-msgstr ""
-
-#: my-evolution/Locations.h:598
-msgid "Dillingham"
-msgstr ""
-
-#: my-evolution/Locations.h:599
-msgid "Dillon"
-msgstr ""
-
-#: my-evolution/Locations.h:600
-msgid "Dinard"
-msgstr ""
-
-#: my-evolution/Locations.h:601
-msgid "District of Columbia"
-msgstr "Washington D.C."
-
-#: my-evolution/Locations.h:602
-msgid "Diyarbakir"
-msgstr ""
-
-#: my-evolution/Locations.h:603
-msgid "Dnipropetrovsk"
-msgstr ""
-
-#: my-evolution/Locations.h:604
-msgid "Dobbiaco"
-msgstr ""
-
-#: my-evolution/Locations.h:605
-msgid "Dodge City"
-msgstr ""
-
-#: my-evolution/Locations.h:606
-msgid "Doha"
-msgstr ""
-
-#: my-evolution/Locations.h:607
-msgid "Dole"
-msgstr ""
-
-#: my-evolution/Locations.h:609
-msgid "Donetsk"
-msgstr ""
-
-#: my-evolution/Locations.h:610
-msgid "Dongsha"
-msgstr ""
-
-#: my-evolution/Locations.h:611
-msgid "Dongshi"
-msgstr ""
-
-#: my-evolution/Locations.h:612
-msgid "Don Torcuato"
-msgstr ""
-
-#: my-evolution/Locations.h:613
-msgid "Dortmund-Wickede"
-msgstr ""
-
-#: my-evolution/Locations.h:614
-msgid "Dothan"
-msgstr ""
-
-#: my-evolution/Locations.h:615
-msgid "Douglas"
-msgstr ""
-
-#: my-evolution/Locations.h:616
-msgid "Dover"
-msgstr ""
-
-#: my-evolution/Locations.h:617
-msgid "Dresden-Klotzsche"
-msgstr ""
-
-#: my-evolution/Locations.h:618
-msgid "Drummond"
-msgstr ""
-
-#: my-evolution/Locations.h:619
-msgid "Dubai"
-msgstr ""
-
-#: my-evolution/Locations.h:620
-msgid "Dubbo"
-msgstr ""
-
-#: my-evolution/Locations.h:621
-msgid "Dublin"
-msgstr ""
-
-#: my-evolution/Locations.h:622
-msgid "Du Bois"
-msgstr ""
-
-#: my-evolution/Locations.h:623
-msgid "Dubrovnik"
-msgstr ""
-
-#: my-evolution/Locations.h:624
-msgid "Dubuque"
-msgstr ""
-
-#: my-evolution/Locations.h:625
-msgid "Dugway"
-msgstr ""
-
-#: my-evolution/Locations.h:626
-msgid "Duluth"
-msgstr ""
-
-#: my-evolution/Locations.h:627
-msgid "Dundee"
-msgstr ""
-
-#: my-evolution/Locations.h:628
-msgid "Durango"
-msgstr ""
-
-#: my-evolution/Locations.h:629
-msgid "Durango Awrs"
-msgstr ""
-
-#: my-evolution/Locations.h:630
-msgid "Durazno"
-msgstr ""
-
-#: my-evolution/Locations.h:631
-msgid "Durban Louis Botha "
-msgstr ""
-
-#: my-evolution/Locations.h:632
-msgid "Dusseldorf"
-msgstr ""
-
-#: my-evolution/Locations.h:633
-msgid "Dutch Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:634
-msgid "Dyersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:635
-msgid "Eagle"
-msgstr ""
-
-#: my-evolution/Locations.h:636
-msgid "Eagle Range"
-msgstr ""
-
-#: my-evolution/Locations.h:637
-msgid "East London"
-msgstr ""
-
-#: my-evolution/Locations.h:638
-msgid "East Midlands"
-msgstr ""
-
-#: my-evolution/Locations.h:639
-msgid "East St Louis"
-msgstr ""
-
-#: my-evolution/Locations.h:640
-msgid "Eau Claire"
-msgstr ""
-
-#: my-evolution/Locations.h:642
-msgid "Edinburgh"
-msgstr ""
-
-#: my-evolution/Locations.h:643
-msgid "Edmonton"
-msgstr ""
-
-#: my-evolution/Locations.h:644
-msgid "Edmonton/Villeneuve"
-msgstr ""
-
-#: my-evolution/Locations.h:645
-msgid "Eduardo Gomes International"
-msgstr ""
-
-#: my-evolution/Locations.h:646
-msgid "Edwards AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:647
-msgid "Egilsstadir"
-msgstr ""
-
-#: my-evolution/Locations.h:648
-msgid "Eglin"
-msgstr ""
-
-#: my-evolution/Locations.h:649
-msgid "Eglington/Londonderry"
-msgstr ""
-
-#: my-evolution/Locations.h:651
-msgid "Eindhoven"
-msgstr ""
-
-#: my-evolution/Locations.h:652
-msgid "Ekofisk"
-msgstr ""
-
-#: my-evolution/Locations.h:653
-msgid "Elazig"
-msgstr ""
-
-#: my-evolution/Locations.h:654
-msgid "El Centro"
-msgstr ""
-
-#: my-evolution/Locations.h:655
-msgid "El Dorado"
-msgstr ""
-
-#: my-evolution/Locations.h:656
-msgid "Elefsis"
-msgstr ""
-
-#: my-evolution/Locations.h:657
-msgid "Elfin Cove"
-msgstr ""
-
-#: my-evolution/Locations.h:658
-msgid "Elizabeth City"
-msgstr ""
-
-#: my-evolution/Locations.h:659
-msgid "Elk City"
-msgstr ""
-
-#: my-evolution/Locations.h:660
-msgid "Elkhart"
-msgstr ""
-
-#: my-evolution/Locations.h:661
-msgid "Elkins"
-msgstr ""
-
-#: my-evolution/Locations.h:662
-msgid "Elko"
-msgstr ""
-
-#: my-evolution/Locations.h:663
-msgid "Elmira"
-msgstr ""
-
-#: my-evolution/Locations.h:664
-msgid "El Monte"
-msgstr ""
-
-#: my-evolution/Locations.h:665
-msgid "El Paso"
-msgstr ""
-
-#: my-evolution/Locations.h:667
-msgid "El Salvador Int."
-msgstr ""
-
-#: my-evolution/Locations.h:668
-msgid "Elsenborn"
-msgstr ""
-
-#: my-evolution/Locations.h:669
-msgid "Ely"
-msgstr ""
-
-#: my-evolution/Locations.h:670
-msgid "Emmonak"
-msgstr ""
-
-#: my-evolution/Locations.h:671
-msgid "Emporia"
-msgstr ""
-
-#: my-evolution/Locations.h:672
-msgid "Enid"
-msgstr ""
-
-#: my-evolution/Locations.h:673
-msgid "Enid/Woodring"
-msgstr ""
-
-#: my-evolution/Locations.h:674
-msgid "Enosburg Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:675
-msgid "Ephrata"
-msgstr ""
-
-#: my-evolution/Locations.h:676
-msgid "Ercan"
-msgstr ""
-
-#: my-evolution/Locations.h:677
-msgid "Erie"
-msgstr ""
-
-#: my-evolution/Locations.h:678
-msgid "Erzurum"
-msgstr ""
-
-#: my-evolution/Locations.h:679
-msgid "Esbjerg"
-msgstr ""
-
-#: my-evolution/Locations.h:680
-msgid "Escanaba"
-msgstr ""
-
-#: my-evolution/Locations.h:681
-msgid "Esfahan"
-msgstr ""
-
-#: my-evolution/Locations.h:682
-msgid "Eskisehir"
-msgstr ""
-
-#: my-evolution/Locations.h:683
-msgid "Estherville"
-msgstr ""
-
-#: my-evolution/Locations.h:685
-msgid "Eugene"
-msgstr ""
-
-#: my-evolution/Locations.h:686
-msgid "Eureka"
-msgstr ""
-
-#: my-evolution/Locations.h:687
-msgid "Europe"
-msgstr "Europe"
-
-#: my-evolution/Locations.h:688
-msgid "Evanston"
-msgstr ""
-
-#: my-evolution/Locations.h:689
-msgid "Evansville"
-msgstr ""
-
-#: my-evolution/Locations.h:690
-msgid "Everett"
-msgstr ""
-
-#: my-evolution/Locations.h:691
-msgid "Evergreen"
-msgstr ""
-
-#: my-evolution/Locations.h:692
-msgid "Evreux-Fauville"
-msgstr ""
-
-#: my-evolution/Locations.h:693
-msgid "Exeter"
-msgstr ""
-
-#: my-evolution/Locations.h:694
-msgid "Ezeiza"
-msgstr ""
-
-#: my-evolution/Locations.h:695
-msgid "Fagernes"
-msgstr ""
-
-#: my-evolution/Locations.h:696
-msgid "Fairbanks"
-msgstr ""
-
-#: my-evolution/Locations.h:697
-msgid "Fairchild"
-msgstr ""
-
-#: my-evolution/Locations.h:698
-msgid "Fairfield"
-msgstr ""
-
-#: my-evolution/Locations.h:699
-msgid "Fairmont"
-msgstr ""
-
-#: my-evolution/Locations.h:700
-msgid "Fallon"
-msgstr ""
-
-#: my-evolution/Locations.h:701
-msgid "Falls City"
-msgstr ""
-
-#: my-evolution/Locations.h:702
-msgid "Falmouth-Otis AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:703
-msgid "Farbanks/Eielson AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:704
-msgid "Fargo"
-msgstr ""
-
-#: my-evolution/Locations.h:705
-msgid "Farmingdale"
-msgstr ""
-
-#: my-evolution/Locations.h:706
-msgid "Farmington"
-msgstr ""
-
-#: my-evolution/Locations.h:707
-msgid "Farmville"
-msgstr ""
-
-#: my-evolution/Locations.h:708
-msgid "Faro"
-msgstr ""
-
-#: my-evolution/Locations.h:709
-msgid "Fayetteville"
-msgstr ""
-
-#: my-evolution/Locations.h:710
-msgid "Feng Nin"
-msgstr ""
-
-#: my-evolution/Locations.h:711
-msgid "Fergus Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:712
-msgid "Fernando De Noronha"
-msgstr ""
-
-#: my-evolution/Locations.h:713
-msgid "Ferrara"
-msgstr ""
-
-#: my-evolution/Locations.h:714
-msgid "Figari"
-msgstr ""
-
-#: my-evolution/Locations.h:715
-msgid "Findlay"
-msgstr ""
-
-#: my-evolution/Locations.h:717
-msgid "Firenze"
-msgstr "Firenze"
-
-#: my-evolution/Locations.h:718
-msgid "Fitchburg"
-msgstr ""
-
-#: my-evolution/Locations.h:719
-msgid "Flagstaff"
-msgstr ""
-
-#: my-evolution/Locations.h:720
-msgid "Flint"
-msgstr ""
-
-#: my-evolution/Locations.h:721
-msgid "Flippin"
-msgstr ""
-
-#: my-evolution/Locations.h:722
-msgid "Florence"
-msgstr ""
-
-#: my-evolution/Locations.h:723
-msgid "Florennes"
-msgstr ""
-
-#: my-evolution/Locations.h:724
-msgid "Flores"
-msgstr ""
-
-#: my-evolution/Locations.h:725
-msgid "Florianopolis"
-msgstr ""
-
-#: my-evolution/Locations.h:726
-msgid "Florida"
-msgstr "Floride"
-
-#: my-evolution/Locations.h:727
-msgid "Floro"
-msgstr ""
-
-#: my-evolution/Locations.h:728
-msgid "Fond Du Lac"
-msgstr ""
-
-#: my-evolution/Locations.h:729
-msgid "Forde/Bringeland"
-msgstr ""
-
-#: my-evolution/Locations.h:730
-msgid "Forli"
-msgstr ""
-
-#: my-evolution/Locations.h:731
-msgid "Formosa"
-msgstr ""
-
-#: my-evolution/Locations.h:732
-msgid "Fortaleza"
-msgstr ""
-
-#: my-evolution/Locations.h:733
-msgid "Fort Belvoir"
-msgstr ""
-
-#: my-evolution/Locations.h:734
-msgid "Fort Benning"
-msgstr ""
-
-#: my-evolution/Locations.h:735
-msgid "Fort Bragg"
-msgstr ""
-
-#: my-evolution/Locations.h:736
-msgid "Fort Campbell"
-msgstr ""
-
-#: my-evolution/Locations.h:737
-msgid "Fort Carson"
-msgstr ""
-
-#: my-evolution/Locations.h:738
-msgid "Fort Collins"
-msgstr ""
-
-#: my-evolution/Locations.h:739
-msgid "Fort Collins/Lovel"
-msgstr ""
-
-#: my-evolution/Locations.h:740
-msgid "Fort Dodge"
-msgstr ""
-
-#: my-evolution/Locations.h:741
-msgid "Fort Drum"
-msgstr ""
-
-#: my-evolution/Locations.h:742
-msgid "Fort Eustis"
-msgstr ""
-
-#: my-evolution/Locations.h:743
-msgid "Fort Greely/Allen AAF"
-msgstr ""
-
-#: my-evolution/Locations.h:744
-msgid "Fort Huachuca"
-msgstr ""
-
-#: my-evolution/Locations.h:745
-msgid "Fort Knox"
-msgstr ""
-
-#: my-evolution/Locations.h:746
-msgid "Fort Lauderdale"
-msgstr ""
-
-#: my-evolution/Locations.h:747
-msgid "Fort Lauderdale (International)"
-msgstr ""
-
-#: my-evolution/Locations.h:748
-msgid "Fort Leonard"
-msgstr ""
-
-#: my-evolution/Locations.h:749
-msgid "Fort Lewis"
-msgstr ""
-
-#: my-evolution/Locations.h:750
-msgid "Fort Madison"
-msgstr ""
-
-#: my-evolution/Locations.h:751
-msgid "Fort Meade"
-msgstr ""
-
-#: my-evolution/Locations.h:752
-msgid "Fort Myers (Page Field)"
-msgstr ""
-
-#: my-evolution/Locations.h:753
-msgid "Fort Myers (Southwest Florida International)"
-msgstr ""
-
-#: my-evolution/Locations.h:754
-msgid "Fort Polk-Leesville"
-msgstr ""
-
-#: my-evolution/Locations.h:755
-msgid "Fort Riley"
-msgstr ""
-
-#: my-evolution/Locations.h:756
-msgid "Fort Sill"
-msgstr ""
-
-#: my-evolution/Locations.h:757
-msgid "Fort Smith"
-msgstr ""
-
-#: my-evolution/Locations.h:758
-msgid "Fort Stewart"
-msgstr ""
-
-#: my-evolution/Locations.h:759
-msgid "Fort Stockton"
-msgstr ""
-
-#: my-evolution/Locations.h:760
-msgid "Fort Wayne"
-msgstr ""
-
-#: my-evolution/Locations.h:761
-msgid "Fort Worth-Alliance"
-msgstr ""
-
-#: my-evolution/Locations.h:762
-msgid "Fort Worth-Meacham"
-msgstr ""
-
-#: my-evolution/Locations.h:763
-msgid "Fort Worth NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:764
-msgid "Fourchon"
-msgstr ""
-
-#: my-evolution/Locations.h:765
-msgid "Foz Do Iguacu"
-msgstr ""
-
-#: my-evolution/Locations.h:767
-msgid "Frankfort"
-msgstr ""
-
-#: my-evolution/Locations.h:768
-msgid "Frankfurt/Main"
-msgstr ""
-
-#: my-evolution/Locations.h:769
-msgid "Franklin"
-msgstr ""
-
-#: my-evolution/Locations.h:770
-msgid "Fredericton"
-msgstr ""
-
-#: my-evolution/Locations.h:771
-msgid "Freeport"
-msgstr ""
-
-#: my-evolution/Locations.h:772
-msgid "Frenchville"
-msgstr ""
-
-#: my-evolution/Locations.h:773
-msgid "Fresno"
-msgstr ""
-
-#: my-evolution/Locations.h:774
-msgid "Fresno-Chandler"
-msgstr ""
-
-#: my-evolution/Locations.h:775
-msgid "Friday Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:776
-msgid "Friedrichshafen"
-msgstr ""
-
-#: my-evolution/Locations.h:777
-msgid "Frigg"
-msgstr ""
-
-#: my-evolution/Locations.h:778
-msgid "Frontone"
-msgstr ""
-
-#: my-evolution/Locations.h:779
-msgid "Frosinone"
-msgstr ""
-
-#: my-evolution/Locations.h:780
-msgid "Fryeburg"
-msgstr ""
-
-#: my-evolution/Locations.h:781
-msgid "Fujairah"
-msgstr ""
-
-#: my-evolution/Locations.h:782
-msgid "Fuji Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:783
-msgid "Fukue Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:784
-msgid "Fukui Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:785
-msgid "Fukuoka Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:786
-msgid "Fullerton"
-msgstr ""
-
-#: my-evolution/Locations.h:787
-msgid "Funchal"
-msgstr ""
-
-#: my-evolution/Locations.h:788
-msgid "FYR Macedonia"
-msgstr ""
-
-#: my-evolution/Locations.h:789
-msgid "Gadsden"
-msgstr ""
-
-#: my-evolution/Locations.h:790
-msgid "Gage"
-msgstr ""
-
-#: my-evolution/Locations.h:791
-msgid "Gainesville"
-msgstr ""
-
-#: my-evolution/Locations.h:792
-msgid "Galax-Hillsville"
-msgstr ""
-
-#: my-evolution/Locations.h:793
-msgid "Galbraith Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:794
-msgid "Galeao"
-msgstr ""
-
-#: my-evolution/Locations.h:795
-msgid "Galena"
-msgstr ""
-
-#: my-evolution/Locations.h:796
-msgid "Galesburg"
-msgstr ""
-
-#: my-evolution/Locations.h:797
-msgid "Gallup"
-msgstr ""
-
-#: my-evolution/Locations.h:798
-msgid "Galveston"
-msgstr ""
-
-#: my-evolution/Locations.h:799
-msgid "Gambell"
-msgstr ""
-
-#: my-evolution/Locations.h:800
-msgid "Gander"
-msgstr ""
-
-#: my-evolution/Locations.h:801
-msgid "Garden City"
-msgstr ""
-
-#: my-evolution/Locations.h:802
-msgid "Gary"
-msgstr ""
-
-#: my-evolution/Locations.h:803
-msgid "Gassim"
-msgstr ""
-
-#: my-evolution/Locations.h:804
-msgid "Gatineau"
-msgstr ""
-
-#: my-evolution/Locations.h:805
-msgid "Gaziantep"
-msgstr ""
-
-#: my-evolution/Locations.h:806
-msgid "Gdansk"
-msgstr ""
-
-#: my-evolution/Locations.h:807
-msgid "Geneve"
-msgstr ""
-
-#: my-evolution/Locations.h:808
-msgid "Genova"
-msgstr ""
-
-#: my-evolution/Locations.h:809
-msgid "George Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:810
-msgid "Georgetown"
-msgstr ""
-
-#: my-evolution/Locations.h:813
-msgid "Ghardaia"
-msgstr ""
-
-#: my-evolution/Locations.h:814
-msgid "Ghedi"
-msgstr ""
-
-#: my-evolution/Locations.h:816
-msgid "Gifu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:817
-msgid "Gila Bend"
-msgstr ""
-
-#: my-evolution/Locations.h:818
-msgid "Gillette"
-msgstr ""
-
-#: my-evolution/Locations.h:819
-msgid "Gilze-Rijen"
-msgstr ""
-
-#: my-evolution/Locations.h:820
-msgid "Gioia del Colle"
-msgstr ""
-
-#: my-evolution/Locations.h:821
-msgid "Girona"
-msgstr ""
-
-#: my-evolution/Locations.h:822
-msgid "Gizan"
-msgstr ""
-
-#: my-evolution/Locations.h:823
-msgid "Glasgow"
-msgstr ""
-
-#: my-evolution/Locations.h:824
-msgid "Glendive"
-msgstr ""
-
-#: my-evolution/Locations.h:825
-msgid "Glens Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:826
-msgid "Goiania"
-msgstr ""
-
-#: my-evolution/Locations.h:827
-msgid "Goldsboro"
-msgstr ""
-
-#: my-evolution/Locations.h:828
-msgid "Goodland"
-msgstr ""
-
-#: my-evolution/Locations.h:829
-msgid "Goose Bay"
-msgstr ""
-
-#: my-evolution/Locations.h:830
-msgid "Goteborg (Landvetter)"
-msgstr "Göteborg (Landvetter)"
-
-#: my-evolution/Locations.h:831
-msgid "Goteborg (Save)"
-msgstr "Göteborg (Save)"
-
-#: my-evolution/Locations.h:832
-msgid "Granada"
-msgstr "Grenåde"
-
-#: my-evolution/Locations.h:833
-msgid "Grand Canyon"
-msgstr ""
-
-#: my-evolution/Locations.h:834
-msgid "Grand Cayman"
-msgstr ""
-
-#: my-evolution/Locations.h:835
-msgid "Grand Forks"
-msgstr ""
-
-#: my-evolution/Locations.h:836
-msgid "Grand Island"
-msgstr ""
-
-#: my-evolution/Locations.h:837
-msgid "Grand Isle"
-msgstr ""
-
-#: my-evolution/Locations.h:838
-msgid "Grand Junction"
-msgstr ""
-
-#: my-evolution/Locations.h:839
-msgid "Grand Marais"
-msgstr ""
-
-#: my-evolution/Locations.h:840
-msgid "Grand Rapids"
-msgstr ""
-
-#: my-evolution/Locations.h:841
-msgid "Grandview"
-msgstr ""
-
-#: my-evolution/Locations.h:842
-msgid "Grangeville"
-msgstr ""
-
-#: my-evolution/Locations.h:843
-msgid "Grants"
-msgstr ""
-
-#: my-evolution/Locations.h:844
-msgid "Graz"
-msgstr ""
-
-#: my-evolution/Locations.h:845
-msgid "Great Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:847
-msgid "Greeley"
-msgstr ""
-
-#: my-evolution/Locations.h:848
-msgid "Green Bay"
-msgstr ""
-
-#: my-evolution/Locations.h:849
-msgid "Green River"
-msgstr ""
-
-#: my-evolution/Locations.h:850
-msgid "Greensboro"
-msgstr ""
-
-#: my-evolution/Locations.h:851
-msgid "Greenville"
-msgstr ""
-
-#: my-evolution/Locations.h:852
-msgid "Greenville-Spartanburg"
-msgstr ""
-
-#: my-evolution/Locations.h:853
-msgid "Greenwood"
-msgstr ""
-
-#: my-evolution/Locations.h:854
-msgid "Grenoble-Saint-Geoirs"
-msgstr ""
-
-#: my-evolution/Locations.h:855
-msgid "Griffiss AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:856
-msgid "Groningen"
-msgstr ""
-
-#: my-evolution/Locations.h:857
-msgid "Grosseto"
-msgstr ""
-
-#: my-evolution/Locations.h:858
-msgid "Groton"
-msgstr ""
-
-#: my-evolution/Locations.h:859
-msgid "Guadalajara"
-msgstr ""
-
-#: my-evolution/Locations.h:860
-msgid "Guadalupe Pass"
-msgstr ""
-
-#: my-evolution/Locations.h:861
-msgid "Guanare"
-msgstr ""
-
-#: my-evolution/Locations.h:862
-msgid "Guangzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:863
-msgid "Guantanamo"
-msgstr ""
-
-#: my-evolution/Locations.h:864
-msgid "Guarany"
-msgstr ""
-
-#: my-evolution/Locations.h:865
-msgid "Guaratingueta"
-msgstr ""
-
-#: my-evolution/Locations.h:866
-msgid "Guarulhos"
-msgstr ""
-
-#: my-evolution/Locations.h:868
-msgid "Guayaquil/Simon Bolivar"
-msgstr ""
-
-#: my-evolution/Locations.h:869
-msgid "Guaymas"
-msgstr ""
-
-#: my-evolution/Locations.h:870
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: my-evolution/Locations.h:871
-msgid "Guidonia"
-msgstr ""
-
-#: my-evolution/Locations.h:872
-msgid "Gulfport"
-msgstr ""
-
-#: my-evolution/Locations.h:873
-msgid "Gulkana"
-msgstr ""
-
-#: my-evolution/Locations.h:874
-msgid "Gullfax C"
-msgstr ""
-
-#: my-evolution/Locations.h:875
-msgid "Gunnison"
-msgstr ""
-
-#: my-evolution/Locations.h:876
-msgid "Gunnison (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:877
-msgid "Guriat"
-msgstr ""
-
-#: my-evolution/Locations.h:878
-msgid "Gustavus"
-msgstr ""
-
-#: my-evolution/Locations.h:879
-msgid "Guymon"
-msgstr ""
-
-#: my-evolution/Locations.h:880
-msgid "Habana"
-msgstr ""
-
-#: my-evolution/Locations.h:881
-msgid "Hachijojima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:882
-msgid "Hachinohe Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:883
-msgid "Hafr Al-Batin"
-msgstr ""
-
-#: my-evolution/Locations.h:884
-msgid "Hagerstown"
-msgstr ""
-
-#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
-msgid "Hail"
-msgstr ""
-
-#: my-evolution/Locations.h:886
-msgid "Hailey-Sun Valley"
-msgstr ""
-
-#: my-evolution/Locations.h:887
-msgid "Haines"
-msgstr ""
-
-#: my-evolution/Locations.h:889
-msgid "Hakodate Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:890
-msgid "Halifax"
-msgstr ""
-
-#: my-evolution/Locations.h:891
-msgid "Hamamatsu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:892
-msgid "Hamburg"
-msgstr ""
-
-#: my-evolution/Locations.h:893
-msgid "Hamburg-Finkenwerder"
-msgstr ""
-
-#: my-evolution/Locations.h:894
-msgid "Hamilton"
-msgstr ""
-
-#: my-evolution/Locations.h:895
-msgid "Hammerfest"
-msgstr ""
-
-#: my-evolution/Locations.h:896
-msgid "Hampton"
-msgstr ""
-
-#: my-evolution/Locations.h:897
-msgid "Hanamaki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:898
-msgid "Hancock"
-msgstr ""
-
-#: my-evolution/Locations.h:899
-msgid "Hangzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:900
-msgid "Hanksville"
-msgstr ""
-
-#: my-evolution/Locations.h:901
-msgid "Hannover"
-msgstr ""
-
-#: my-evolution/Locations.h:902
-msgid "Ha Noi"
-msgstr ""
-
-#: my-evolution/Locations.h:903
-msgid "Harbor Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:904
-msgid "Harlingen"
-msgstr ""
-
-#: my-evolution/Locations.h:905
-msgid "Harlowton"
-msgstr ""
-
-#: my-evolution/Locations.h:906
-msgid "Harrisburg"
-msgstr ""
-
-#: my-evolution/Locations.h:907
-msgid "Harrison"
-msgstr ""
-
-#: my-evolution/Locations.h:908
-msgid "Harstad/Narvik/Evenes"
-msgstr ""
-
-#: my-evolution/Locations.h:909
-msgid "Hartford"
-msgstr ""
-
-#: my-evolution/Locations.h:910
-msgid "Hassi-Messaoud"
-msgstr ""
-
-#: my-evolution/Locations.h:911
-msgid "Hastings"
-msgstr ""
-
-#: my-evolution/Locations.h:912
-msgid "Haugesund"
-msgstr ""
-
-#: my-evolution/Locations.h:913
-msgid "Havre"
-msgstr ""
-
-#: my-evolution/Locations.h:914
-msgid "Hawaii"
-msgstr "Hawaii"
-
-#: my-evolution/Locations.h:915
-msgid "Hawthorne"
-msgstr ""
-
-#: my-evolution/Locations.h:916
-msgid "Hayden"
-msgstr ""
-
-#: my-evolution/Locations.h:917
-msgid "Hayes River"
-msgstr ""
-
-#: my-evolution/Locations.h:918
-msgid "Hays"
-msgstr ""
-
-#: my-evolution/Locations.h:919
-msgid "Hayward"
-msgstr ""
-
-#: my-evolution/Locations.h:920
-msgid "Healy River"
-msgstr ""
-
-#: my-evolution/Locations.h:921
-msgid "Helena"
-msgstr ""
-
-#: my-evolution/Locations.h:922
-msgid "Helsinki"
-msgstr ""
-
-#: my-evolution/Locations.h:923
-msgid "Henderson"
-msgstr ""
-
-#: my-evolution/Locations.h:924
-msgid "Hengchun"
-msgstr ""
-
-#: my-evolution/Locations.h:925
-msgid "Hermosillo"
-msgstr ""
-
-#: my-evolution/Locations.h:926
-msgid "Hibbing"
-msgstr ""
-
-#: my-evolution/Locations.h:927
-msgid "Hickory"
-msgstr ""
-
-#: my-evolution/Locations.h:928
-msgid "Hill City"
-msgstr ""
-
-#: my-evolution/Locations.h:929
-msgid "Hillsboro"
-msgstr ""
-
-#: my-evolution/Locations.h:930
-msgid "Hilo"
-msgstr ""
-
-#: my-evolution/Locations.h:931
-msgid "Hinesville"
-msgstr ""
-
-#: my-evolution/Locations.h:932
-msgid "Hiroshima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:933
-msgid "Hobart"
-msgstr ""
-
-#: my-evolution/Locations.h:934
-msgid "Hobbs"
-msgstr ""
-
-#: my-evolution/Locations.h:935
-msgid "Ho Chi Minh"
-msgstr ""
-
-#: my-evolution/Locations.h:936
-msgid "Hodeidah"
-msgstr ""
-
-#: my-evolution/Locations.h:937
-msgid "Hof"
-msgstr ""
-
-#: my-evolution/Locations.h:938
-msgid "Hoffman"
-msgstr ""
-
-#: my-evolution/Locations.h:939
-msgid "Hofu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:940
-msgid "Hohenems"
-msgstr ""
-
-#: my-evolution/Locations.h:941
-msgid "Holguin"
-msgstr ""
-
-#: my-evolution/Locations.h:942
-msgid "Homer"
-msgstr ""
-
-#: my-evolution/Locations.h:943
-msgid "Homestead AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:944
-msgid "Hondo"
-msgstr ""
-
-#: my-evolution/Locations.h:947
-msgid "Honningsvag"
-msgstr ""
-
-#: my-evolution/Locations.h:948
-msgid "Honolulu"
-msgstr ""
-
-#: my-evolution/Locations.h:949
-msgid "Hoonah"
-msgstr ""
-
-#: my-evolution/Locations.h:950
-msgid "Hoquiam"
-msgstr ""
-
-#: my-evolution/Locations.h:951
-msgid "Hot Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:952
-msgid "Houghton Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:953
-msgid "Houlton"
-msgstr ""
-
-#: my-evolution/Locations.h:954
-msgid "Houma"
-msgstr ""
-
-#: my-evolution/Locations.h:955
-msgid "Houston-Bush"
-msgstr ""
-
-#: my-evolution/Locations.h:956
-msgid "Houston-Clover"
-msgstr ""
-
-#: my-evolution/Locations.h:957
-msgid "Houston-Ellington Field"
-msgstr ""
-
-#: my-evolution/Locations.h:958
-msgid "Houston-Hobby"
-msgstr ""
-
-#: my-evolution/Locations.h:959
-msgid "Houston-Hooks"
-msgstr ""
-
-#: my-evolution/Locations.h:960
-msgid "Howard AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:961
-msgid "Hsinchu"
-msgstr ""
-
-#: my-evolution/Locations.h:962
-msgid "Huanuco"
-msgstr ""
-
-#: my-evolution/Locations.h:963
-msgid "Huehuetenango"
-msgstr ""
-
-#: my-evolution/Locations.h:964
-msgid "Hulien"
-msgstr ""
-
-#: my-evolution/Locations.h:965
-msgid "Humberside"
-msgstr ""
-
-#: my-evolution/Locations.h:967
-msgid "Huntington"
-msgstr ""
-
-#: my-evolution/Locations.h:968
-msgid "Huntsville"
-msgstr ""
-
-#: my-evolution/Locations.h:969
-msgid "Hurlburt"
-msgstr ""
-
-#: my-evolution/Locations.h:970
-msgid "Huron"
-msgstr ""
-
-#: my-evolution/Locations.h:971
-msgid "Hutchinson"
-msgstr ""
-
-#: my-evolution/Locations.h:972
-msgid "Hyakuri Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:973
-msgid "Hyannis"
-msgstr ""
-
-#: my-evolution/Locations.h:974
-msgid "Hyderabad"
-msgstr ""
-
-#: my-evolution/Locations.h:975
-msgid "Hyeres-Le Palyvestre"
-msgstr ""
-
-#: my-evolution/Locations.h:976
-msgid "Iasi"
-msgstr ""
-
-#: my-evolution/Locations.h:977
-msgid "Ibiza"
-msgstr ""
-
-#: my-evolution/Locations.h:979
-msgid "Ichikawa"
-msgstr ""
-
-#: my-evolution/Locations.h:980
-msgid "Idaho"
-msgstr "Idaho"
-
-#: my-evolution/Locations.h:981
-msgid "Idaho Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:982
-msgid "Iguazu"
-msgstr ""
-
-#: my-evolution/Locations.h:983
-msgid "Iki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:984
-msgid "Ilan"
-msgstr ""
-
-#: my-evolution/Locations.h:985
-msgid "Iliamna"
-msgstr ""
-
-#: my-evolution/Locations.h:986
-msgid "Illinois"
-msgstr "Illinois"
-
-#: my-evolution/Locations.h:987
-msgid "Imperial"
-msgstr ""
-
-#: my-evolution/Locations.h:988
-msgid "Imperial (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:989
-msgid "Imperial Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:990
-msgid "In Amenas"
-msgstr ""
-
-#: my-evolution/Locations.h:992
-msgid "Indiana"
-msgstr "Indiana"
-
-#: my-evolution/Locations.h:993
-msgid "Indianapolis"
-msgstr ""
-
-#: my-evolution/Locations.h:994
-msgid "Indian Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:995
-msgid "Innsbruck"
-msgstr ""
-
-#: my-evolution/Locations.h:996
-msgid "International Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:997
-msgid "Intracoastal"
-msgstr ""
-
-#: my-evolution/Locations.h:998
-msgid "Inverness"
-msgstr ""
-
-#: my-evolution/Locations.h:999
-msgid "Inyokern"
-msgstr ""
-
-#: my-evolution/Locations.h:1000
-msgid "Iowa"
-msgstr "Iowa"
-
-#: my-evolution/Locations.h:1001
-msgid "Iowa City"
-msgstr ""
-
-#: my-evolution/Locations.h:1002
-msgid "Iqaluit"
-msgstr ""
-
-#: my-evolution/Locations.h:1003
-msgid "Iquique/Diego Arac"
-msgstr ""
-
-#: my-evolution/Locations.h:1004
-msgid "Iquitos"
-msgstr ""
-
-#: my-evolution/Locations.h:1005
-msgid "Iraklion"
-msgstr ""
-
-#: my-evolution/Locations.h:1006
-msgid "Iran, Islamic Republic of"
-msgstr ""
-
-#: my-evolution/Locations.h:1008
-msgid "Iron Mountain"
-msgstr ""
-
-#: my-evolution/Locations.h:1009
-msgid "Ironwood"
-msgstr ""
-
-#: my-evolution/Locations.h:1010
-msgid "Iruma Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1011
-msgid "Islamabad"
-msgstr ""
-
-#: my-evolution/Locations.h:1012
-msgid "Isle of Man"
-msgstr ""
-
-#: my-evolution/Locations.h:1013
-msgid "Islip"
-msgstr ""
-
-#: my-evolution/Locations.h:1014
-msgid "Istanbul"
-msgstr "Istanbul"
-
-#: my-evolution/Locations.h:1015
-msgid "Itaituba"
-msgstr ""
-
-#: my-evolution/Locations.h:1017
-msgid "Ithaca"
-msgstr ""
-
-#: my-evolution/Locations.h:1018
-msgid "Ivano-Frankivsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1019
-msgid "Iwakuni MCAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1020
-msgid "Iwojima"
-msgstr ""
-
-#: my-evolution/Locations.h:1021
-msgid "Ixtapa"
-msgstr ""
-
-#: my-evolution/Locations.h:1022
-msgid "Izmir/Adnan Menderes"
-msgstr ""
-
-#: my-evolution/Locations.h:1023
-msgid "Izmir/Cigli"
-msgstr ""
-
-#: my-evolution/Locations.h:1024
-msgid "Izmit"
-msgstr ""
-
-#: my-evolution/Locations.h:1025
-msgid "Izumo Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1026
-msgid "Jackson"
-msgstr ""
-
-#: my-evolution/Locations.h:1027
-msgid "Jacksonville"
-msgstr ""
-
-#: my-evolution/Locations.h:1028
-msgid "Jacksonville-Craig Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1029
-msgid "Jacksonville NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1030
-msgid "Jaffrey"
-msgstr ""
-
-#: my-evolution/Locations.h:1032
-msgid "Jamestown"
-msgstr ""
-
-#: my-evolution/Locations.h:1033
-msgid "Janesville"
-msgstr ""
-
-#: my-evolution/Locations.h:1034
-msgid "Jan Smuts"
-msgstr ""
-
-#: my-evolution/Locations.h:1036
-msgid "Jeddah King Abdul Aziz International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1037
-msgid "Jefferson City"
-msgstr ""
-
-#: my-evolution/Locations.h:1038
-msgid "Jerez"
-msgstr ""
-
-#: my-evolution/Locations.h:1039
-msgid "Jersey"
-msgstr "Djersey"
-
-#: my-evolution/Locations.h:1040
-msgid "Jinotega"
-msgstr ""
-
-#: my-evolution/Locations.h:1041
-msgid "Johan A. Pengel"
-msgstr ""
-
-#: my-evolution/Locations.h:1042
-msgid "Johnstown"
-msgstr ""
-
-#: my-evolution/Locations.h:1043
-msgid "Jonesboro"
-msgstr ""
-
-#: my-evolution/Locations.h:1044
-msgid "Jonkoping"
-msgstr ""
-
-#: my-evolution/Locations.h:1045
-msgid "Joplin"
-msgstr ""
-
-#: my-evolution/Locations.h:1047
-msgid "Juanjui"
-msgstr ""
-
-#: my-evolution/Locations.h:1048
-msgid "Juan Santamaria"
-msgstr ""
-
-#: my-evolution/Locations.h:1049
-msgid "Juigalpa"
-msgstr ""
-
-#: my-evolution/Locations.h:1050
-msgid "Jujuy"
-msgstr ""
-
-#: my-evolution/Locations.h:1051
-msgid "Juliaca"
-msgstr ""
-
-#: my-evolution/Locations.h:1052
-msgid "Junction"
-msgstr ""
-
-#: my-evolution/Locations.h:1053
-msgid "Juneau"
-msgstr ""
-
-#: my-evolution/Locations.h:1054
-msgid "Kadena Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1055
-msgid "Kagoshima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1056
-msgid "Kahului"
-msgstr ""
-
-#: my-evolution/Locations.h:1057
-msgid "Kailua-Kona"
-msgstr ""
-
-#: my-evolution/Locations.h:1058
-msgid "Kake"
-msgstr ""
-
-#: my-evolution/Locations.h:1059
-msgid "Kalamata"
-msgstr ""
-
-#: my-evolution/Locations.h:1060
-msgid "Kalamazoo"
-msgstr ""
-
-#: my-evolution/Locations.h:1061
-msgid "Kalispell"
-msgstr ""
-
-#: my-evolution/Locations.h:1062
-msgid "Kamigoto"
-msgstr ""
-
-#: my-evolution/Locations.h:1063
-msgid "Kaneohe"
-msgstr ""
-
-#: my-evolution/Locations.h:1064
-msgid "Kangshan"
-msgstr ""
-
-#: my-evolution/Locations.h:1065
-msgid "Kanoya Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1066
-msgid "Kansai International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1067
-msgid "Kansas"
-msgstr "Kansas"
-
-#: my-evolution/Locations.h:1068
-msgid "Kansas City"
-msgstr ""
-
-#: my-evolution/Locations.h:1069
-msgid "Kansas City-Gladstone"
-msgstr ""
-
-#: my-evolution/Locations.h:1070
-msgid "Kaohsiung"
-msgstr ""
-
-#: my-evolution/Locations.h:1071
-msgid "Karachi"
-msgstr ""
-
-#: my-evolution/Locations.h:1072
-msgid "Karup"
-msgstr ""
-
-#: my-evolution/Locations.h:1073
-msgid "Kassel-Calden"
-msgstr ""
-
-#: my-evolution/Locations.h:1074
-msgid "Kasumigaura Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1075
-msgid "Kasuminome Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1076
-msgid "Katowice"
-msgstr ""
-
-#: my-evolution/Locations.h:1077
-msgid "Kavala"
-msgstr ""
-
-#: my-evolution/Locations.h:1078
-msgid "Kayseri"
-msgstr ""
-
-#: my-evolution/Locations.h:1079
-msgid "Kazan"
-msgstr ""
-
-#: my-evolution/Locations.h:1080
-msgid "Kearney"
-msgstr ""
-
-#: my-evolution/Locations.h:1081
-msgid "Keene"
-msgstr ""
-
-#: my-evolution/Locations.h:1082
-msgid "Kefallinia"
-msgstr ""
-
-#: my-evolution/Locations.h:1083
-msgid "Keflavik"
-msgstr ""
-
-#: my-evolution/Locations.h:1084
-msgid "Kenai"
-msgstr ""
-
-#: my-evolution/Locations.h:1085
-msgid "Kenosha"
-msgstr ""
-
-#: my-evolution/Locations.h:1086
-msgid "Kentucky"
-msgstr "Kentucky"
-
-#: my-evolution/Locations.h:1087
-msgid "Keokuk"
-msgstr ""
-
-#: my-evolution/Locations.h:1088
-msgid "Kerkira"
-msgstr ""
-
-#: my-evolution/Locations.h:1089
-msgid "Kerman"
-msgstr "Kerman"
-
-#: my-evolution/Locations.h:1090
-msgid "Ketchikan"
-msgstr ""
-
-#: my-evolution/Locations.h:1091
-msgid "Key West"
-msgstr ""
-
-#: my-evolution/Locations.h:1092
-msgid "Key West NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1093
-msgid "Khabarovsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1094
-msgid "Khamis Mushait"
-msgstr ""
-
-#: my-evolution/Locations.h:1095
-msgid "Kharkiv"
-msgstr ""
-
-#: my-evolution/Locations.h:1096
-msgid "Kikai Island"
-msgstr ""
-
-#: my-evolution/Locations.h:1097
-msgid "Killeen"
-msgstr ""
-
-#: my-evolution/Locations.h:1098
-msgid "Killeen-Ft Hood"
-msgstr ""
-
-#: my-evolution/Locations.h:1099
-msgid "Killeen-Gray AAF"
-msgstr ""
-
-#: my-evolution/Locations.h:1100
-msgid "King Khaled International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1101
-msgid "Kingman"
-msgstr ""
-
-#: my-evolution/Locations.h:1102
-msgid "King Salmon"
-msgstr ""
-
-#: my-evolution/Locations.h:1103
-msgid "Kingston"
-msgstr ""
-
-#: my-evolution/Locations.h:1104
-msgid "Kingsville"
-msgstr ""
-
-#: my-evolution/Locations.h:1105
-msgid "Kinloss"
-msgstr ""
-
-#: my-evolution/Locations.h:1106
-msgid "Kinston"
-msgstr ""
-
-#: my-evolution/Locations.h:1107
-msgid "Kirkenes"
-msgstr ""
-
-#: my-evolution/Locations.h:1108
-msgid "Kirksville"
-msgstr ""
-
-#: my-evolution/Locations.h:1109
-msgid "Kiruna"
-msgstr ""
-
-#: my-evolution/Locations.h:1110
-msgid "Kisarazu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1111
-msgid "Kishineu"
-msgstr ""
-
-#: my-evolution/Locations.h:1112
-msgid "Kitakyushu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1113
-msgid "Klagenfurt"
-msgstr ""
-
-#: my-evolution/Locations.h:1114
-msgid "Klamath Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:1115
-msgid "Klawock"
-msgstr ""
-
-#: my-evolution/Locations.h:1116
-msgid "Kleine Brogel"
-msgstr ""
-
-#: my-evolution/Locations.h:1117
-msgid "Kliningrad"
-msgstr ""
-
-#: my-evolution/Locations.h:1118
-msgid "Knoxville"
-msgstr ""
-
-#: my-evolution/Locations.h:1119
-msgid "Knoxville-Downtown"
-msgstr ""
-
-#: my-evolution/Locations.h:1120
-msgid "Kobenhavn/Kastrup"
-msgstr ""
-
-#: my-evolution/Locations.h:1121
-msgid "Kobenhavn/Roskilde"
-msgstr ""
-
-#: my-evolution/Locations.h:1122
-msgid "Kochi Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1123
-msgid "Kodiak"
-msgstr ""
-
-#: my-evolution/Locations.h:1124
-msgid "Kogalniceanu"
-msgstr ""
-
-#: my-evolution/Locations.h:1125
-msgid "Kogalym"
-msgstr ""
-
-#: my-evolution/Locations.h:1126
-msgid "Koksijde"
-msgstr ""
-
-#: my-evolution/Locations.h:1127
-msgid "Kolding/Vandrup"
-msgstr ""
-
-#: my-evolution/Locations.h:1128
-msgid "Koln/Bonn"
-msgstr ""
-
-#: my-evolution/Locations.h:1129
-msgid "Komatsu Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1130
-msgid "Komatsujima Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1131
-msgid "Konya"
-msgstr ""
-
-#: my-evolution/Locations.h:1132
-msgid "Korea, Democratic People's Republic of"
-msgstr "Corêye (bijhrece)"
-
-#: my-evolution/Locations.h:1133
-msgid "Korea, Republic of"
-msgstr "Corêye (nonnrece)"
-
-#: my-evolution/Locations.h:1134
-msgid "Kos"
-msgstr ""
-
-#: my-evolution/Locations.h:1135
-msgid "Kotzebue"
-msgstr ""
-
-#: my-evolution/Locations.h:1136
-msgid "Kozani"
-msgstr ""
-
-#: my-evolution/Locations.h:1137
-msgid "Krakow"
-msgstr ""
-
-#: my-evolution/Locations.h:1138
-msgid "Krasnodar"
-msgstr ""
-
-#: my-evolution/Locations.h:1139
-msgid "Krasnoyarsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1140
-msgid "Kristiansand/Kjevik"
-msgstr ""
-
-#: my-evolution/Locations.h:1141
-msgid "Kristiansund/Kvernberget"
-msgstr ""
-
-#: my-evolution/Locations.h:1142
-msgid "Kryviy Rig/Lozovatka"
-msgstr ""
-
-#: my-evolution/Locations.h:1143
-msgid "Kumamoto Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1144
-msgid "Kunming"
-msgstr ""
-
-#: my-evolution/Locations.h:1145
-msgid "Kushiro Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1147
-msgid "Kyyiv/Boryspil"
-msgstr ""
-
-#: my-evolution/Locations.h:1148
-msgid "Kyyiv/Zhulyany"
-msgstr ""
-
-#: my-evolution/Locations.h:1149
-msgid "La Ceiba"
-msgstr ""
-
-#: my-evolution/Locations.h:1150
-msgid "Laconia"
-msgstr ""
-
-#: my-evolution/Locations.h:1151
-msgid "La Coruna"
-msgstr ""
-
-#: my-evolution/Locations.h:1152
-msgid "La Crosse"
-msgstr ""
-
-#: my-evolution/Locations.h:1153
-msgid "La Esperanza"
-msgstr ""
-
-#: my-evolution/Locations.h:1154
-msgid "Lafayette"
-msgstr ""
-
-#: my-evolution/Locations.h:1155
-msgid "La Grande"
-msgstr ""
-
-#: my-evolution/Locations.h:1156
-msgid "Lahaina"
-msgstr ""
-
-#: my-evolution/Locations.h:1157
-msgid "Lahore"
-msgstr ""
-
-#: my-evolution/Locations.h:1158
-msgid "Lajes"
-msgstr ""
-
-#: my-evolution/Locations.h:1159
-msgid "La Junta"
-msgstr ""
-
-#: my-evolution/Locations.h:1160
-msgid "Lake Charles"
-msgstr ""
-
-#: my-evolution/Locations.h:1161
-msgid "Lake Hood"
-msgstr ""
-
-#: my-evolution/Locations.h:1162
-msgid "Lakehurst"
-msgstr ""
-
-#: my-evolution/Locations.h:1163
-msgid "Lakeland"
-msgstr ""
-
-#: my-evolution/Locations.h:1164
-msgid "Lake Tahoe"
-msgstr ""
-
-#: my-evolution/Locations.h:1165
-msgid "Lakeview"
-msgstr ""
-
-#: my-evolution/Locations.h:1166
-msgid "Lamar"
-msgstr ""
-
-#: my-evolution/Locations.h:1167
-msgid "La Mesa"
-msgstr ""
-
-#: my-evolution/Locations.h:1168
-msgid "Lamezia"
-msgstr ""
-
-#: my-evolution/Locations.h:1169
-msgid "Lamoni"
-msgstr ""
-
-#: my-evolution/Locations.h:1170
-msgid "Lampedusa"
-msgstr ""
-
-#: my-evolution/Locations.h:1171
-msgid "Lanai"
-msgstr ""
-
-#: my-evolution/Locations.h:1172
-msgid "Lancaster"
-msgstr ""
-
-#: my-evolution/Locations.h:1173
-msgid "Lander"
-msgstr ""
-
-#: my-evolution/Locations.h:1174
-msgid "Langebaanweg"
-msgstr ""
-
-#: my-evolution/Locations.h:1175
-msgid "Langley AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1176
-msgid "Lannion"
-msgstr ""
-
-#: my-evolution/Locations.h:1177
-msgid "Lansing"
-msgstr ""
-
-#: my-evolution/Locations.h:1178
-msgid "Lanzhou"
-msgstr ""
-
-#: my-evolution/Locations.h:1179
-msgid "La Paz"
-msgstr ""
-
-#: my-evolution/Locations.h:1180
-msgid "La Paz/Alto"
-msgstr ""
-
-#: my-evolution/Locations.h:1181
-msgid "Laramie"
-msgstr ""
-
-#: my-evolution/Locations.h:1182
-msgid "Laredo"
-msgstr ""
-
-#: my-evolution/Locations.h:1183
-msgid "Larnaka"
-msgstr "Larnaka"
-
-#: my-evolution/Locations.h:1184
-msgid "La Romana"
-msgstr ""
-
-#: my-evolution/Locations.h:1185
-msgid "Las Americas"
-msgstr ""
-
-#: my-evolution/Locations.h:1186
-msgid "Las Tunas"
-msgstr ""
-
-#: my-evolution/Locations.h:1187
-msgid "Las Vegas"
-msgstr ""
-
-#: my-evolution/Locations.h:1188
-msgid "Latina"
-msgstr ""
-
-#: my-evolution/Locations.h:1189
-msgid "Latrobe"
-msgstr ""
-
-#: my-evolution/Locations.h:1191
-msgid "Laughlin"
-msgstr ""
-
-#: my-evolution/Locations.h:1192
-msgid "Laurel"
-msgstr ""
-
-#: my-evolution/Locations.h:1193
-msgid "La Verne"
-msgstr ""
-
-#: my-evolution/Locations.h:1194
-msgid "Lawrence"
-msgstr ""
-
-#: my-evolution/Locations.h:1195
-msgid "Lawton"
-msgstr ""
-
-#: my-evolution/Locations.h:1196
-msgid "Leadville"
-msgstr ""
-
-#: my-evolution/Locations.h:1197
-msgid "Learmouth"
-msgstr ""
-
-#: my-evolution/Locations.h:1199
-msgid "Lecce"
-msgstr ""
-
-#: my-evolution/Locations.h:1200
-msgid "Leeds and Bradford"
-msgstr ""
-
-#: my-evolution/Locations.h:1201
-msgid "Leesburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1202
-msgid "Leeuwarden"
-msgstr ""
-
-#: my-evolution/Locations.h:1203
-msgid "Le Havre-Octeville"
-msgstr ""
-
-#: my-evolution/Locations.h:1204
-msgid "Leipzig-Schkeuditz"
-msgstr ""
-
-#: my-evolution/Locations.h:1205
-msgid "Leknes"
-msgstr ""
-
-#: my-evolution/Locations.h:1206
-msgid "Le Mans"
-msgstr ""
-
-#: my-evolution/Locations.h:1207
-msgid "Le Marine"
-msgstr ""
-
-#: my-evolution/Locations.h:1208
-msgid "Lemmon"
-msgstr ""
-
-#: my-evolution/Locations.h:1209
-msgid "Lemoore"
-msgstr ""
-
-#: my-evolution/Locations.h:1210
-msgid "Leticia/Vasquez Cobo"
-msgstr ""
-
-#: my-evolution/Locations.h:1211
-msgid "Le Touquet"
-msgstr ""
-
-#: my-evolution/Locations.h:1212
-msgid "Leuchars"
-msgstr ""
-
-#: my-evolution/Locations.h:1213
-msgid "Lewisburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1214
-msgid "Lewiston"
-msgstr ""
-
-#: my-evolution/Locations.h:1215
-msgid "Lewistown"
-msgstr ""
-
-#: my-evolution/Locations.h:1216
-msgid "Lexington"
-msgstr ""
-
-#: my-evolution/Locations.h:1217
-msgid "Liberal"
-msgstr ""
-
-#: my-evolution/Locations.h:1219
-msgid "Libya"
-msgstr "Libeye"
-
-#: my-evolution/Locations.h:1220
-msgid "Lichtenburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1221
-msgid "Lidgerwood"
-msgstr ""
-
-#: my-evolution/Locations.h:1222
-msgid "Liege"
-msgstr "Lidje"
-
-#: my-evolution/Locations.h:1223
-msgid "Lihue"
-msgstr ""
-
-#: my-evolution/Locations.h:1224
-msgid "Lille-Lesquin"
-msgstr ""
-
-#: my-evolution/Locations.h:1225
-msgid "Lima-Callao"
-msgstr ""
-
-#: my-evolution/Locations.h:1226
-msgid "Limnos"
-msgstr ""
-
-#: my-evolution/Locations.h:1227
-msgid "Limoges"
-msgstr ""
-
-#: my-evolution/Locations.h:1228
-msgid "Limon"
-msgstr ""
-
-#: my-evolution/Locations.h:1229
-msgid "Lincoln"
-msgstr ""
-
-#: my-evolution/Locations.h:1230
-msgid "Linz"
-msgstr ""
-
-#: my-evolution/Locations.h:1231
-msgid "Lisboa"
-msgstr ""
-
-#: my-evolution/Locations.h:1232
-msgid "Lista"
-msgstr ""
-
-#: my-evolution/Locations.h:1233
-msgid "Litchfield"
-msgstr ""
-
-#: my-evolution/Locations.h:1235
-msgid "Little Rock"
-msgstr ""
-
-#: my-evolution/Locations.h:1236
-msgid "Little Rock AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1237
-msgid "Livermore"
-msgstr ""
-
-#: my-evolution/Locations.h:1238
-msgid "Liverpool"
-msgstr ""
-
-#: my-evolution/Locations.h:1239
-msgid "Livingston"
-msgstr ""
-
-#: my-evolution/Locations.h:1240
-msgid "Ljubljana"
-msgstr "Ljubljana"
-
-#: my-evolution/Locations.h:1241
-msgid "Logan"
-msgstr ""
-
-#: my-evolution/Locations.h:1242
-msgid "Lolland Falster"
-msgstr ""
-
-#: my-evolution/Locations.h:1243
-msgid "Lompoc"
-msgstr ""
-
-#: my-evolution/Locations.h:1244
-msgid "London"
-msgstr ""
-
-#: my-evolution/Locations.h:1245
-msgid "London/City"
-msgstr ""
-
-#: my-evolution/Locations.h:1246
-msgid "London/Gatwick"
-msgstr ""
-
-#: my-evolution/Locations.h:1247
-msgid "London/Heathrow"
-msgstr ""
-
-#: my-evolution/Locations.h:1248
-msgid "London/Stansted"
-msgstr ""
-
-#: my-evolution/Locations.h:1249
-msgid "Londrina"
-msgstr ""
-
-#: my-evolution/Locations.h:1250
-msgid "Lone Rock"
-msgstr ""
-
-#: my-evolution/Locations.h:1251
-msgid "Long Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1252
-msgid "Longview"
-msgstr ""
-
-#: my-evolution/Locations.h:1253
-msgid "Lorient-Lann-Bihoue"
-msgstr ""
-
-#: my-evolution/Locations.h:1254
-msgid "Los Alamos"
-msgstr ""
-
-#: my-evolution/Locations.h:1255
-msgid "Los Angeles"
-msgstr ""
-
-#: my-evolution/Locations.h:1256
-msgid "Los Mochis"
-msgstr ""
-
-#: my-evolution/Locations.h:1257
-msgid "Lossiemouth"
-msgstr ""
-
-#: my-evolution/Locations.h:1258
-msgid "Louisville"
-msgstr ""
-
-#: my-evolution/Locations.h:1259
-msgid "Louisville-Standiford Field"
-msgstr ""
-
-#: my-evolution/Locations.h:1260
-msgid "Lousiana"
-msgstr ""
-
-#: my-evolution/Locations.h:1261
-msgid "Lovelock"
-msgstr ""
-
-#: my-evolution/Locations.h:1262
-msgid "Lubbock"
-msgstr ""
-
-#: my-evolution/Locations.h:1263
-msgid "Lubeck-Blankensee"
-msgstr ""
-
-#: my-evolution/Locations.h:1264
-msgid "Lufkin"
-msgstr ""
-
-#: my-evolution/Locations.h:1265
-msgid "Lugano"
-msgstr ""
-
-#: my-evolution/Locations.h:1266
-msgid "Luqa"
-msgstr ""
-
-#: my-evolution/Locations.h:1267
-msgid "Luton"
-msgstr ""
-
-#: my-evolution/Locations.h:1269
-msgid "Luxeuil"
-msgstr ""
-
-#: my-evolution/Locations.h:1270
-msgid "Luxor"
-msgstr ""
-
-#: my-evolution/Locations.h:1271
-msgid "Lviv"
-msgstr ""
-
-#: my-evolution/Locations.h:1272
-msgid "Lynchburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1273
-msgid "Lyneham"
-msgstr ""
-
-#: my-evolution/Locations.h:1274
-msgid "Lyon-Bron"
-msgstr ""
-
-#: my-evolution/Locations.h:1275
-msgid "Lyon-Satolas"
-msgstr ""
-
-#: my-evolution/Locations.h:1276
-msgid "Maastricht"
-msgstr ""
-
-#: my-evolution/Locations.h:1277
-msgid "Macae"
-msgstr ""
-
-#: my-evolution/Locations.h:1278
-msgid "Macapa"
-msgstr ""
-
-#: my-evolution/Locations.h:1279
-msgid "Maceio"
-msgstr ""
-
-#: my-evolution/Locations.h:1280
-msgid "Macon"
-msgstr ""
-
-#: my-evolution/Locations.h:1281
-msgid "Madinah"
-msgstr ""
-
-#: my-evolution/Locations.h:1282
-msgid "Madison"
-msgstr ""
-
-#: my-evolution/Locations.h:1283
-msgid "Madras/Minambakkam"
-msgstr ""
-
-#: my-evolution/Locations.h:1284
-msgid "Madrid (Barajas)"
-msgstr ""
-
-#: my-evolution/Locations.h:1285
-msgid "Madrid (Cuatro Vientos)"
-msgstr ""
-
-#: my-evolution/Locations.h:1286
-msgid "Magadan"
-msgstr ""
-
-#: my-evolution/Locations.h:1287
-msgid "Magdalena"
-msgstr ""
-
-#: my-evolution/Locations.h:1288
-msgid "Maine"
-msgstr "Maine"
-
-#: my-evolution/Locations.h:1289
-msgid "Makhachkala"
-msgstr ""
-
-#: my-evolution/Locations.h:1290
-msgid "Makkah"
-msgstr ""
-
-#: my-evolution/Locations.h:1291
-msgid "Makung"
-msgstr ""
-
-#: my-evolution/Locations.h:1292
-msgid "Malad City"
-msgstr ""
-
-#: my-evolution/Locations.h:1293
-msgid "Malaga"
-msgstr ""
-
-#: my-evolution/Locations.h:1294
-msgid "Malatya"
-msgstr ""
-
-#: my-evolution/Locations.h:1295
-msgid "Maldonado/Punta Est"
-msgstr ""
-
-#: my-evolution/Locations.h:1296
-msgid "Malmo/Sturup"
-msgstr ""
-
-#: my-evolution/Locations.h:1298
-msgid "Mammoth Lakes"
-msgstr ""
-
-#: my-evolution/Locations.h:1299
-msgid "Managua"
-msgstr "Managua"
-
-#: my-evolution/Locations.h:1300
-msgid "Manassas"
-msgstr ""
-
-#: my-evolution/Locations.h:1301
-msgid "Manaus"
-msgstr ""
-
-#: my-evolution/Locations.h:1302
-msgid "Manchester"
-msgstr ""
-
-#: my-evolution/Locations.h:1303
-msgid "Mangilsan Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1304
-msgid "Manhattan"
-msgstr ""
-
-#: my-evolution/Locations.h:1305
-msgid "Manisa"
-msgstr ""
-
-#: my-evolution/Locations.h:1306
-msgid "Manistee"
-msgstr ""
-
-#: my-evolution/Locations.h:1307
-msgid "Manitoba"
-msgstr "Manitoba"
-
-#: my-evolution/Locations.h:1308
-msgid "Manitowoc"
-msgstr ""
-
-#: my-evolution/Locations.h:1309
-msgid "Mankato"
-msgstr ""
-
-#: my-evolution/Locations.h:1310
-msgid "Mansfield"
-msgstr ""
-
-#: my-evolution/Locations.h:1311
-msgid "Manta"
-msgstr ""
-
-#: my-evolution/Locations.h:1312
-msgid "Manzanillo"
-msgstr ""
-
-#: my-evolution/Locations.h:1313
-msgid "Maraba"
-msgstr ""
-
-#: my-evolution/Locations.h:1314
-msgid "Maracaibo-La Chinita"
-msgstr ""
-
-#: my-evolution/Locations.h:1315
-msgid "Maracay-B.A.Sucre"
-msgstr ""
-
-#: my-evolution/Locations.h:1316
-msgid "Marathon"
-msgstr ""
-
-#: my-evolution/Locations.h:1317
-msgid "Mar Del Plata"
-msgstr ""
-
-#: my-evolution/Locations.h:1318
-msgid "Margarita"
-msgstr ""
-
-#: my-evolution/Locations.h:1319
-msgid "Marianna"
-msgstr ""
-
-#: my-evolution/Locations.h:1320
-msgid "Marib"
-msgstr ""
-
-#: my-evolution/Locations.h:1321
-msgid "Maribor"
-msgstr "Maribor"
-
-#: my-evolution/Locations.h:1322
-msgid "Marietta"
-msgstr ""
-
-#: my-evolution/Locations.h:1323
-msgid "Marino di Ravenna"
-msgstr ""
-
-#: my-evolution/Locations.h:1324
-msgid "Marion"
-msgstr ""
-
-#: my-evolution/Locations.h:1325
-msgid "Marion-Wytheville"
-msgstr ""
-
-#: my-evolution/Locations.h:1326
-msgid "Marquette"
-msgstr ""
-
-#: my-evolution/Locations.h:1327
-msgid "Marseille-Provence"
-msgstr ""
-
-#: my-evolution/Locations.h:1328
-msgid "Marseilles"
-msgstr ""
-
-#: my-evolution/Locations.h:1329
-msgid "Marshall"
-msgstr ""
-
-#: my-evolution/Locations.h:1330
-msgid "Marshalltown"
-msgstr ""
-
-#: my-evolution/Locations.h:1331
-msgid "Marshfield"
-msgstr ""
-
-#: my-evolution/Locations.h:1332
-msgid "Marte"
-msgstr ""
-
-#: my-evolution/Locations.h:1333
-msgid "Marthas Vineyard"
-msgstr ""
-
-#: my-evolution/Locations.h:1334
-msgid "Martinsburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1335
-msgid "Martinsville"
-msgstr ""
-
-#: my-evolution/Locations.h:1336
-msgid "Maryland"
-msgstr "Maryland"
-
-#: my-evolution/Locations.h:1337
-msgid "Marysville"
-msgstr ""
-
-#: my-evolution/Locations.h:1338
-msgid "Marysville-Beale AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1339
-msgid "Mashhad"
-msgstr ""
-
-#: my-evolution/Locations.h:1340
-msgid "Masirah"
-msgstr ""
-
-#: my-evolution/Locations.h:1341
-msgid "Mason City"
-msgstr ""
-
-#: my-evolution/Locations.h:1342
-msgid "Massachusetts"
-msgstr "Massachusetts"
-
-#: my-evolution/Locations.h:1343
-msgid "Massena"
-msgstr ""
-
-#: my-evolution/Locations.h:1344
-msgid "Matamoros"
-msgstr ""
-
-#: my-evolution/Locations.h:1345
-msgid "Matsumoto Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1346
-msgid "Matsushima Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1347
-msgid "Matsuyama Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1348
-msgid "Mattoon"
-msgstr ""
-
-#: my-evolution/Locations.h:1349
-msgid "Mayaguez"
-msgstr ""
-
-#: my-evolution/Locations.h:1350
-msgid "Mayport"
-msgstr ""
-
-#: my-evolution/Locations.h:1351
-msgid "Mazatlan"
-msgstr ""
-
-#: my-evolution/Locations.h:1352
-msgid "Mazu"
-msgstr ""
-
-#: my-evolution/Locations.h:1353
-msgid "McAlester"
-msgstr ""
-
-#: my-evolution/Locations.h:1354
-msgid "McAllen"
-msgstr ""
-
-#: my-evolution/Locations.h:1355
-msgid "McCall"
-msgstr ""
-
-#: my-evolution/Locations.h:1356
-msgid "McCarthy"
-msgstr ""
-
-#: my-evolution/Locations.h:1357
-msgid "McClellan"
-msgstr ""
-
-#: my-evolution/Locations.h:1358
-msgid "McComb"
-msgstr ""
-
-#: my-evolution/Locations.h:1359
-msgid "McCook"
-msgstr ""
-
-#: my-evolution/Locations.h:1360
-msgid "McGrath"
-msgstr ""
-
-#: my-evolution/Locations.h:1361
-msgid "Mc Gregor"
-msgstr ""
-
-#: my-evolution/Locations.h:1362
-msgid "Meacham"
-msgstr ""
-
-#: my-evolution/Locations.h:1363
-msgid "Medford"
-msgstr ""
-
-#: my-evolution/Locations.h:1364
-msgid "Medicine Lodge"
-msgstr ""
-
-#: my-evolution/Locations.h:1365
-msgid "Mehamn"
-msgstr ""
-
-#: my-evolution/Locations.h:1366
-msgid "Mekoryuk"
-msgstr ""
-
-#: my-evolution/Locations.h:1367
-msgid "Melbourne"
-msgstr ""
-
-#: my-evolution/Locations.h:1368
-msgid "Melfa"
-msgstr ""
-
-#: my-evolution/Locations.h:1369
-msgid "Melilla"
-msgstr ""
-
-#: my-evolution/Locations.h:1370
-msgid "Memambetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1371
-msgid "Memphis"
-msgstr ""
-
-#: my-evolution/Locations.h:1372
-msgid "Memphis-NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1373
-msgid "Mendoza"
-msgstr ""
-
-#: my-evolution/Locations.h:1374
-msgid "Mene Grande"
-msgstr ""
-
-#: my-evolution/Locations.h:1375
-msgid "Menominee"
-msgstr ""
-
-#: my-evolution/Locations.h:1376
-msgid "Menorca"
-msgstr ""
-
-#: my-evolution/Locations.h:1377
-msgid "Merced"
-msgstr ""
-
-#: my-evolution/Locations.h:1378
-msgid "Merida"
-msgstr ""
-
-#: my-evolution/Locations.h:1379
-msgid "Meridian"
-msgstr ""
-
-#: my-evolution/Locations.h:1380
-msgid "Meridian-Lauderdale"
-msgstr ""
-
-#: my-evolution/Locations.h:1381
-msgid "Merril Field"
-msgstr ""
-
-#: my-evolution/Locations.h:1382
-msgid "Mersa Matruh"
-msgstr ""
-
-#: my-evolution/Locations.h:1383
-msgid "Mesa-Falcon Field"
-msgstr ""
-
-#: my-evolution/Locations.h:1384
-msgid "Metabaru Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1385
-msgid "Metz-Frescaty"
-msgstr ""
-
-#: my-evolution/Locations.h:1386
-msgid "Mexicali"
-msgstr ""
-
-#: my-evolution/Locations.h:1388
-msgid "Miami"
-msgstr ""
-
-#: my-evolution/Locations.h:1389
-msgid "Miami-Kendall"
-msgstr ""
-
-#: my-evolution/Locations.h:1390
-msgid "Miami-Opa Locka"
-msgstr ""
-
-#: my-evolution/Locations.h:1391
-msgid "Michigan"
-msgstr "Michigan"
-
-#: my-evolution/Locations.h:1392
-msgid "Middle East"
-msgstr ""
-
-#: my-evolution/Locations.h:1393
-msgid "Middleton Island"
-msgstr ""
-
-#: my-evolution/Locations.h:1394
-msgid "Middletown"
-msgstr ""
-
-#: my-evolution/Locations.h:1395
-msgid "Midland"
-msgstr ""
-
-#: my-evolution/Locations.h:1396
-msgid "Miho Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1397
-msgid "Milano/Linate"
-msgstr ""
-
-#: my-evolution/Locations.h:1398
-msgid "Milano/Malpensa"
-msgstr ""
-
-#: my-evolution/Locations.h:1399
-msgid "Miles City"
-msgstr ""
-
-#: my-evolution/Locations.h:1400
-msgid "Milford"
-msgstr ""
-
-#: my-evolution/Locations.h:1401
-msgid "Millinocket"
-msgstr ""
-
-#: my-evolution/Locations.h:1402
-msgid "Millville"
-msgstr ""
-
-#: my-evolution/Locations.h:1403
-msgid "Milton"
-msgstr ""
-
-#: my-evolution/Locations.h:1404
-msgid "Milwaukee"
-msgstr ""
-
-#: my-evolution/Locations.h:1405
-msgid "Milwaukee-Timmerman"
-msgstr ""
-
-#: my-evolution/Locations.h:1406
-msgid "Minamitorishima"
-msgstr ""
-
-#: my-evolution/Locations.h:1407
-msgid "Minatitlan"
-msgstr ""
-
-#: my-evolution/Locations.h:1408
-msgid "Minchumina"
-msgstr ""
-
-#: my-evolution/Locations.h:1409
-msgid "Mineralnye Vody"
-msgstr ""
-
-#: my-evolution/Locations.h:1410
-msgid "Mineral Wells"
-msgstr ""
-
-#: my-evolution/Locations.h:1411
-msgid "Minneapolis"
-msgstr ""
-
-#: my-evolution/Locations.h:1412
-msgid "Minneapolis [2]"
-msgstr ""
-
-#: my-evolution/Locations.h:1413
-msgid "Minneapolis [3]"
-msgstr ""
-
-#: my-evolution/Locations.h:1414
-msgid "Minnesota"
-msgstr "Minnesota"
-
-#: my-evolution/Locations.h:1415
-msgid "Minocqua"
-msgstr ""
-
-#: my-evolution/Locations.h:1416
-msgid "Minot"
-msgstr ""
-
-#: my-evolution/Locations.h:1417
-msgid "Minot AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1418
-msgid "Misawa Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1419
-msgid "Mississippi"
-msgstr "Mississipi"
-
-#: my-evolution/Locations.h:1420
-msgid "Missoula"
-msgstr ""
-
-#: my-evolution/Locations.h:1421
-msgid "Missouri"
-msgstr "Missouri"
-
-#: my-evolution/Locations.h:1422
-msgid "Mitchell"
-msgstr ""
-
-#: my-evolution/Locations.h:1423
-msgid "Mitilini"
-msgstr ""
-
-#: my-evolution/Locations.h:1424
-msgid "Miyakejima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1425
-msgid "Miyazaki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1426
-msgid "Moa"
-msgstr ""
-
-#: my-evolution/Locations.h:1427
-msgid "Mobile Downtown"
-msgstr ""
-
-#: my-evolution/Locations.h:1428
-msgid "Mobile Regional Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1429
-msgid "Mobridge"
-msgstr ""
-
-#: my-evolution/Locations.h:1430
-msgid "Modesto"
-msgstr ""
-
-#: my-evolution/Locations.h:1431
-msgid "Mo I Rana"
-msgstr ""
-
-#: my-evolution/Locations.h:1432
-msgid "Mojave"
-msgstr ""
-
-#: my-evolution/Locations.h:1433
-msgid "Molde"
-msgstr ""
-
-#: my-evolution/Locations.h:1434
-msgid "Moldova"
-msgstr "Moldova"
-
-#: my-evolution/Locations.h:1435
-msgid "Moline-Quad Cities"
-msgstr ""
-
-#: my-evolution/Locations.h:1436
-msgid "Molokai"
-msgstr ""
-
-#: my-evolution/Locations.h:1437
-msgid "Mombetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1438
-msgid "Monchengladbach"
-msgstr ""
-
-#: my-evolution/Locations.h:1439
-msgid "Monclova"
-msgstr ""
-
-#: my-evolution/Locations.h:1440
-msgid "Moncton"
-msgstr ""
-
-#: my-evolution/Locations.h:1441
-msgid "Monida"
-msgstr ""
-
-#: my-evolution/Locations.h:1442
-msgid "Monpellier-Mediterrannee"
-msgstr ""
-
-#: my-evolution/Locations.h:1443
-msgid "Monroe"
-msgstr ""
-
-#: my-evolution/Locations.h:1444
-msgid "Montague"
-msgstr ""
-
-#: my-evolution/Locations.h:1445
-msgid "Montana"
-msgstr "Montana"
-
-#: my-evolution/Locations.h:1446
-msgid "Mont-de-Marsan"
-msgstr ""
-
-#: my-evolution/Locations.h:1447
-msgid "Monte Argentario"
-msgstr ""
-
-#: my-evolution/Locations.h:1448
-msgid "Monte Bisbino"
-msgstr ""
-
-#: my-evolution/Locations.h:1449
-msgid "Monte Calamita"
-msgstr ""
-
-#: my-evolution/Locations.h:1450
-msgid "Monte Cimone"
-msgstr ""
-
-#: my-evolution/Locations.h:1451
-msgid "Montego Bay"
-msgstr ""
-
-#: my-evolution/Locations.h:1452
-msgid "Monte Malanotte"
-msgstr ""
-
-#: my-evolution/Locations.h:1453
-msgid "Monterey"
-msgstr ""
-
-#: my-evolution/Locations.h:1454
-msgid "Monterrey"
-msgstr ""
-
-#: my-evolution/Locations.h:1455
-msgid "Monte Scuro"
-msgstr ""
-
-#: my-evolution/Locations.h:1456
-msgid "Monte Terminillo"
-msgstr ""
-
-#: my-evolution/Locations.h:1457
-msgid "Montevideo/Carrasco"
-msgstr ""
-
-#: my-evolution/Locations.h:1458
-msgid "Montgomery"
-msgstr ""
-
-#: my-evolution/Locations.h:1459
-msgid "Montgomery-Maxwell AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1460
-msgid "Monticello"
-msgstr ""
-
-#: my-evolution/Locations.h:1461
-msgid "Montpelier"
-msgstr ""
-
-#: my-evolution/Locations.h:1462
-msgid "Montreal Dorval"
-msgstr ""
-
-#: my-evolution/Locations.h:1463
-msgid "Montreal Mirabel"
-msgstr ""
-
-#: my-evolution/Locations.h:1464
-msgid "Montreal Saint-Hubert"
-msgstr ""
-
-#: my-evolution/Locations.h:1465
-msgid "Montrose"
-msgstr ""
-
-#: my-evolution/Locations.h:1466
-msgid "Montrose (2)"
-msgstr ""
-
-#: my-evolution/Locations.h:1467
-msgid "Morelia"
-msgstr ""
-
-#: my-evolution/Locations.h:1468
-msgid "Morgantown"
-msgstr ""
-
-#: my-evolution/Locations.h:1469
-msgid "Moriarty"
-msgstr ""
-
-#: my-evolution/Locations.h:1471
-msgid "Morristown"
-msgstr ""
-
-#: my-evolution/Locations.h:1472
-msgid "Moscow Domodedovo"
-msgstr ""
-
-#: my-evolution/Locations.h:1473
-msgid "Moscow Sheremetyevo"
-msgstr ""
-
-#: my-evolution/Locations.h:1474
-msgid "Moses Lake"
-msgstr ""
-
-#: my-evolution/Locations.h:1475
-msgid "Mosinee"
-msgstr ""
-
-#: my-evolution/Locations.h:1476
-msgid "Mosjoen"
-msgstr ""
-
-#: my-evolution/Locations.h:1477
-msgid "Moultrie"
-msgstr ""
-
-#: my-evolution/Locations.h:1478
-msgid "Mountain Home"
-msgstr ""
-
-#: my-evolution/Locations.h:1479
-msgid "Mountain View"
-msgstr ""
-
-#: my-evolution/Locations.h:1480
-msgid "Mount Clemens"
-msgstr ""
-
-#: my-evolution/Locations.h:1481
-msgid "Mount Holly"
-msgstr ""
-
-#: my-evolution/Locations.h:1482
-msgid "Mount Shasta"
-msgstr ""
-
-#: my-evolution/Locations.h:1483
-msgid "Mount Vernon"
-msgstr ""
-
-#: my-evolution/Locations.h:1484
-msgid "Mount Wilson"
-msgstr ""
-
-#: my-evolution/Locations.h:1485
-msgid "Mt Washington"
-msgstr ""
-
-#: my-evolution/Locations.h:1486
-msgid "Mugla/Dalaman"
-msgstr ""
-
-#: my-evolution/Locations.h:1487
-msgid "Muir"
-msgstr ""
-
-#: my-evolution/Locations.h:1488
-msgid "Mullan"
-msgstr ""
-
-#: my-evolution/Locations.h:1489
-msgid "Mullen"
-msgstr ""
-
-#: my-evolution/Locations.h:1490
-msgid "Munchen"
-msgstr ""
-
-#: my-evolution/Locations.h:1491
-msgid "Muncie"
-msgstr ""
-
-#: my-evolution/Locations.h:1492
-msgid "Munster/Osnabruck"
-msgstr ""
-
-#: my-evolution/Locations.h:1493
-msgid "Murcia"
-msgstr ""
-
-#: my-evolution/Locations.h:1494
-msgid "Murmansk"
-msgstr ""
-
-#: my-evolution/Locations.h:1495
-msgid "Mus"
-msgstr ""
-
-#: my-evolution/Locations.h:1496
-msgid "Muscatine"
-msgstr ""
-
-#: my-evolution/Locations.h:1497
-msgid "Muscle Shoals"
-msgstr ""
-
-#: my-evolution/Locations.h:1498
-msgid "Muskegon"
-msgstr ""
-
-#: my-evolution/Locations.h:1499
-msgid "Mykonos"
-msgstr ""
-
-#: my-evolution/Locations.h:1500
-msgid "Myrtle Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1501
-msgid "Nabesna/Devil Mt."
-msgstr ""
-
-#: my-evolution/Locations.h:1502
-msgid "Nacogdoches"
-msgstr ""
-
-#: my-evolution/Locations.h:1503
-msgid "Nagasaki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1504
-msgid "Nagoya Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1505
-msgid "Nagpur Sonegaon"
-msgstr ""
-
-#: my-evolution/Locations.h:1506
-msgid "Naha Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1507
-msgid "Najran"
-msgstr ""
-
-#: my-evolution/Locations.h:1508
-msgid "Nakashibetsu Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1509
-msgid "Nalchik"
-msgstr ""
-
-#: my-evolution/Locations.h:1510
-msgid "Namsos"
-msgstr ""
-
-#: my-evolution/Locations.h:1511
-msgid "Nancy-Essey"
-msgstr ""
-
-#: my-evolution/Locations.h:1512
-msgid "Nancy-Ochey"
-msgstr ""
-
-#: my-evolution/Locations.h:1513
-msgid "Nankishirahama Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1514
-msgid "Nanning"
-msgstr ""
-
-#: my-evolution/Locations.h:1515
-msgid "Nantes Adlantique"
-msgstr ""
-
-#: my-evolution/Locations.h:1516
-msgid "Nantucket"
-msgstr ""
-
-#: my-evolution/Locations.h:1517
-msgid "Napa"
-msgstr ""
-
-#: my-evolution/Locations.h:1518
-msgid "Naples"
-msgstr ""
-
-#: my-evolution/Locations.h:1519
-msgid "Napoli"
-msgstr ""
-
-#: my-evolution/Locations.h:1520
-msgid "Narvik"
-msgstr ""
-
-#: my-evolution/Locations.h:1521
-msgid "Nasa Shuttle"
-msgstr ""
-
-#: my-evolution/Locations.h:1522
-msgid "Nashua"
-msgstr ""
-
-#: my-evolution/Locations.h:1523
-msgid "Nashville"
-msgstr ""
-
-#: my-evolution/Locations.h:1524
-msgid "Nassau"
-msgstr ""
-
-#: my-evolution/Locations.h:1525
-msgid "Natal"
-msgstr ""
-
-#: my-evolution/Locations.h:1526
-msgid "Natchez"
-msgstr ""
-
-#: my-evolution/Locations.h:1527
-msgid "Nawabshah"
-msgstr ""
-
-#: my-evolution/Locations.h:1528
-msgid "Nebraska"
-msgstr "Nebraska"
-
-#: my-evolution/Locations.h:1529
-msgid "Needles"
-msgstr ""
-
-#: my-evolution/Locations.h:1530
-msgid "Nenana"
-msgstr ""
-
-#: my-evolution/Locations.h:1532
-msgid "Neuquen"
-msgstr ""
-
-#: my-evolution/Locations.h:1533
-msgid "Nevada"
-msgstr "Nevada"
-
-#: my-evolution/Locations.h:1534
-msgid "Newark"
-msgstr ""
-
-#: my-evolution/Locations.h:1535
-msgid "New Bedford"
-msgstr ""
-
-#: my-evolution/Locations.h:1536
-msgid "New Bern"
-msgstr ""
-
-#: my-evolution/Locations.h:1537
-msgid "New Braunfels"
-msgstr ""
-
-#: my-evolution/Locations.h:1538
-msgid "New Brunswick"
-msgstr "Noû Brunswick"
-
-#: my-evolution/Locations.h:1539
-msgid "Newburgh"
-msgstr ""
-
-#: my-evolution/Locations.h:1540
-msgid "Newcastle"
-msgstr ""
-
-#: my-evolution/Locations.h:1541
-msgid "New Delhi/Palam"
-msgstr ""
-
-#: my-evolution/Locations.h:1542
-msgid "Newfoundland"
-msgstr "Terre Neuve"
-
-#: my-evolution/Locations.h:1543
-msgid "New Hampshire"
-msgstr "Noû Hampshire"
-
-#: my-evolution/Locations.h:1544
-msgid "New Haven"
-msgstr ""
-
-#: my-evolution/Locations.h:1545
-msgid "New Iberia"
-msgstr ""
-
-#: my-evolution/Locations.h:1546
-msgid "New Jersey"
-msgstr "Noû Djersey"
-
-#: my-evolution/Locations.h:1547
-msgid "New Mexico"
-msgstr "Noû Mecsike"
-
-#: my-evolution/Locations.h:1548
-msgid "New Orleans"
-msgstr ""
-
-#: my-evolution/Locations.h:1549
-msgid "New Orleans-Lakefront"
-msgstr ""
-
-#: my-evolution/Locations.h:1550
-msgid "New Orleans NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1551
-msgid "Newport"
-msgstr ""
-
-#: my-evolution/Locations.h:1552
-msgid "Newport News"
-msgstr ""
-
-#: my-evolution/Locations.h:1553
-msgid "New Port Richey"
-msgstr ""
-
-#: my-evolution/Locations.h:1554
-msgid "New River"
-msgstr ""
-
-#: my-evolution/Locations.h:1555
-msgid "New Tokyo International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1556
-msgid "Newton"
-msgstr ""
-
-#: my-evolution/Locations.h:1557
-msgid "New York"
-msgstr "Noû York"
-
-#: my-evolution/Locations.h:1558
-msgid "New York-JFK Arpt"
-msgstr ""
-
-#: my-evolution/Locations.h:1559
-msgid "New York-La Guardia"
-msgstr ""
-
-#: my-evolution/Locations.h:1561
-msgid "Niagara Falls"
-msgstr ""
-
-#: my-evolution/Locations.h:1563
-msgid "Nice-Cote d'Azur"
-msgstr ""
-
-#: my-evolution/Locations.h:1564
-msgid "Niigata Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1565
-msgid "Nimes-Garons"
-msgstr ""
-
-#: my-evolution/Locations.h:1566
-msgid "Nipawin"
-msgstr ""
-
-#: my-evolution/Locations.h:1567
-msgid "Nis"
-msgstr ""
-
-#: my-evolution/Locations.h:1568
-msgid "Nizhny Novgorod"
-msgstr ""
-
-#: my-evolution/Locations.h:1569
-msgid "N Las Vegas"
-msgstr ""
-
-#: my-evolution/Locations.h:1570
-msgid "N Myrtle Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1571
-msgid "Nogales"
-msgstr ""
-
-#: my-evolution/Locations.h:1572
-msgid "Nome"
-msgstr ""
-
-#: my-evolution/Locations.h:1573
-msgid "Norfolk"
-msgstr ""
-
-#: my-evolution/Locations.h:1575
-msgid "Norfolk NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1576
-msgid "Norrkoping"
-msgstr ""
-
-#: my-evolution/Locations.h:1577
-msgid "North Adams"
-msgstr ""
-
-#: my-evolution/Locations.h:1578
-msgid "North Bend"
-msgstr ""
-
-#: my-evolution/Locations.h:1579
-msgid "North Carolina"
-msgstr "Caroline bijhrece"
-
-#: my-evolution/Locations.h:1580
-msgid "North Conway"
-msgstr ""
-
-#: my-evolution/Locations.h:1581
-msgid "North Dakota"
-msgstr "Dakota bijhrece"
-
-#: my-evolution/Locations.h:1582
-msgid "Northeast Philadelphia"
-msgstr ""
-
-#: my-evolution/Locations.h:1583
-msgid "North Kingstown"
-msgstr ""
-
-#: my-evolution/Locations.h:1584
-msgid "North Platte"
-msgstr ""
-
-#: my-evolution/Locations.h:1585
-msgid "Northway"
-msgstr ""
-
-#: my-evolution/Locations.h:1586
-msgid "Northwest Territories"
-msgstr ""
-
-#: my-evolution/Locations.h:1588
-msgid "Norwich"
-msgstr ""
-
-#: my-evolution/Locations.h:1589
-msgid "Norwood"
-msgstr ""
-
-#: my-evolution/Locations.h:1590
-msgid "Notodden"
-msgstr ""
-
-#: my-evolution/Locations.h:1591
-msgid "Novara/Cameri"
-msgstr ""
-
-#: my-evolution/Locations.h:1592
-msgid "Nova Scotia"
-msgstr "Nouve Sicôsse"
-
-#: my-evolution/Locations.h:1593
-msgid "Novosibirsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1594
-msgid "Nueva Gerona"
-msgstr ""
-
-#: my-evolution/Locations.h:1595
-msgid "Nueva Ocotepeque"
-msgstr ""
-
-#: my-evolution/Locations.h:1596
-msgid "Nuevo Laredo"
-msgstr ""
-
-#: my-evolution/Locations.h:1597
-msgid "Nurnberg"
-msgstr ""
-
-#: my-evolution/Locations.h:1598
-msgid "Nyutabaru Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1599
-msgid "Oahu"
-msgstr ""
-
-#: my-evolution/Locations.h:1600
-msgid "Oak Harbor"
-msgstr ""
-
-#: my-evolution/Locations.h:1601
-msgid "Oakland"
-msgstr ""
-
-#: my-evolution/Locations.h:1602
-msgid "Oaxaca"
-msgstr ""
-
-#: my-evolution/Locations.h:1603
-msgid "Oberpfaffenhofen"
-msgstr ""
-
-#: my-evolution/Locations.h:1604
-msgid "Obihiro Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1605
-msgid "Ocala"
-msgstr ""
-
-#: my-evolution/Locations.h:1606
-msgid "Oceanside"
-msgstr ""
-
-#: my-evolution/Locations.h:1607
-msgid "Odense"
-msgstr ""
-
-#: my-evolution/Locations.h:1608
-msgid "Odesa"
-msgstr ""
-
-#: my-evolution/Locations.h:1609
-msgid "Oelwen"
-msgstr ""
-
-#: my-evolution/Locations.h:1610
-msgid "Ogden"
-msgstr ""
-
-#: my-evolution/Locations.h:1611
-msgid "Ogden-Hill AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1612
-msgid "Ogdensburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1613
-msgid "Ohio"
-msgstr "Ohio"
-
-#: my-evolution/Locations.h:1614
-msgid "Ohrid"
-msgstr ""
-
-#: my-evolution/Locations.h:1615
-msgid "Oita Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1616
-msgid "Ojika Island"
-msgstr ""
-
-#: my-evolution/Locations.h:1617
-msgid "Okayama Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1618
-msgid "Oki Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1619
-msgid "Okinoerabu"
-msgstr ""
-
-#: my-evolution/Locations.h:1620
-msgid "Oklahoma"
-msgstr "Oklahoma"
-
-#: my-evolution/Locations.h:1621
-msgid "Oklahoma City"
-msgstr ""
-
-#: my-evolution/Locations.h:1622
-msgid "Oklahoma City-Bethany"
-msgstr ""
-
-#: my-evolution/Locations.h:1623
-msgid "Oklahoma City-Midwest City"
-msgstr ""
-
-#: my-evolution/Locations.h:1624
-msgid "Okushiri Island"
-msgstr ""
-
-#: my-evolution/Locations.h:1625
-msgid "Olathe"
-msgstr ""
-
-#: my-evolution/Locations.h:1626
-msgid "Olathe/Ind."
-msgstr ""
-
-#: my-evolution/Locations.h:1627
-msgid "Olbia"
-msgstr ""
-
-#: my-evolution/Locations.h:1628
-msgid "Olympia"
-msgstr ""
-
-#: my-evolution/Locations.h:1629
-msgid "Omaha"
-msgstr ""
-
-#: my-evolution/Locations.h:1630
-msgid "Omaha-Bellevue"
-msgstr ""
-
-#: my-evolution/Locations.h:1631
-msgid "Omak"
-msgstr ""
-
-#: my-evolution/Locations.h:1633
-msgid "Ominato Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1634
-msgid "Omsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1635
-msgid "O'Neill"
-msgstr ""
-
-#: my-evolution/Locations.h:1636
-msgid "Ontario"
-msgstr "Ontario"
-
-#: my-evolution/Locations.h:1637
-msgid "Oostende"
-msgstr ""
-
-#: my-evolution/Locations.h:1638
-msgid "Oran"
-msgstr "Oran"
-
-#: my-evolution/Locations.h:1639
-msgid "Oran/Es Senia"
-msgstr ""
-
-#: my-evolution/Locations.h:1640
-msgid "Orange"
-msgstr ""
-
-#: my-evolution/Locations.h:1641
-msgid "Orange City"
-msgstr ""
-
-#: my-evolution/Locations.h:1642
-msgid "Ord-Sharp"
-msgstr ""
-
-#: my-evolution/Locations.h:1643
-msgid "Oregon"
-msgstr "Oregon"
-
-#: my-evolution/Locations.h:1644
-msgid "Orenburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1645
-msgid "Orland"
-msgstr ""
-
-#: my-evolution/Locations.h:1646
-msgid "Orlando"
-msgstr ""
-
-#: my-evolution/Locations.h:1647
-msgid "Orlando (Orlando International)"
-msgstr ""
-
-#: my-evolution/Locations.h:1648
-msgid "Orsta-Volda"
-msgstr ""
-
-#: my-evolution/Locations.h:1649
-msgid "Oruro"
-msgstr ""
-
-#: my-evolution/Locations.h:1650
-msgid "Osaka International Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1651
-msgid "Osan Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1652
-msgid "Oscoda"
-msgstr ""
-
-#: my-evolution/Locations.h:1653
-msgid "Oseberg A"
-msgstr ""
-
-#: my-evolution/Locations.h:1654
-msgid "Oshima Airport"
-msgstr ""
-
-#: my-evolution/Locations.h:1655
-msgid "Oshkosh"
-msgstr ""
-
-#: my-evolution/Locations.h:1656
-msgid "Oslo/Gardenmoen"
-msgstr ""
-
-#: my-evolution/Locations.h:1657
-msgid "Ostrava"
-msgstr ""
-
-#: my-evolution/Locations.h:1658
-msgid "Ottawa"
-msgstr ""
-
-#: my-evolution/Locations.h:1659
-msgid "Ottumwa"
-msgstr ""
-
-#: my-evolution/Locations.h:1660
-msgid "Owensboro"
-msgstr ""
-
-#: my-evolution/Locations.h:1661
-msgid "Owyhee"
-msgstr ""
-
-#: my-evolution/Locations.h:1662
-msgid "Oxford"
-msgstr ""
-
-#: my-evolution/Locations.h:1663
-msgid "Oxnard"
-msgstr ""
-
-#: my-evolution/Locations.h:1664
-msgid "Ozark"
-msgstr ""
-
-#: my-evolution/Locations.h:1665
-msgid "Ozuki Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1666
-msgid "Paderborn-Haxterberg"
-msgstr ""
-
-#: my-evolution/Locations.h:1667
-msgid "Padova"
-msgstr ""
-
-#: my-evolution/Locations.h:1668
-msgid "Paducah"
-msgstr ""
-
-#: my-evolution/Locations.h:1669
-msgid "Paekado"
-msgstr ""
-
-#: my-evolution/Locations.h:1670
-msgid "Paengnyongdo Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1671
-msgid "Paganella"
-msgstr ""
-
-#: my-evolution/Locations.h:1674
-msgid "Pa Kuei/Bakuai"
-msgstr ""
-
-#: my-evolution/Locations.h:1675
-msgid "Palacios"
-msgstr ""
-
-#: my-evolution/Locations.h:1676
-msgid "Palermo"
-msgstr ""
-
-#: my-evolution/Locations.h:1677
-msgid "Palma de Mallorca"
-msgstr ""
-
-#: my-evolution/Locations.h:1678
-msgid "Palmdale"
-msgstr ""
-
-#: my-evolution/Locations.h:1679
-msgid "Palmer"
-msgstr ""
-
-#: my-evolution/Locations.h:1680
-msgid "Palm Springs"
-msgstr ""
-
-#: my-evolution/Locations.h:1681
-msgid "Palo Alto"
-msgstr ""
-
-#: my-evolution/Locations.h:1682
-msgid "Pamplona"
-msgstr ""
-
-#: my-evolution/Locations.h:1684
-msgid "Panama City"
-msgstr ""
-
-#: my-evolution/Locations.h:1685
-msgid "Pantelleria"
-msgstr ""
-
-#: my-evolution/Locations.h:1686
-msgid "Papa"
-msgstr ""
-
-#: my-evolution/Locations.h:1687
-msgid "Paphos"
-msgstr ""
-
-#: my-evolution/Locations.h:1689
-msgid "Paris"
-msgstr ""
-
-#: my-evolution/Locations.h:1690
-msgid "Paris/Charles De Gaulle"
-msgstr ""
-
-#: my-evolution/Locations.h:1691
-msgid "Paris/Le Bourget"
-msgstr ""
-
-#: my-evolution/Locations.h:1692
-msgid "Paris/Orly"
-msgstr ""
-
-#: my-evolution/Locations.h:1693
-msgid "Parkersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1694
-msgid "Pasco"
-msgstr ""
-
-#: my-evolution/Locations.h:1695
-msgid "Paso De Los Libres"
-msgstr ""
-
-#: my-evolution/Locations.h:1696
-msgid "Paso Robles"
-msgstr ""
-
-#: my-evolution/Locations.h:1697
-msgid "Passo dei Giovi"
-msgstr ""
-
-#: my-evolution/Locations.h:1698
-msgid "Passo della Cisa"
-msgstr ""
-
-#: my-evolution/Locations.h:1699
-msgid "Passo Resia"
-msgstr ""
-
-#: my-evolution/Locations.h:1700
-msgid "Passo Rolle"
-msgstr ""
-
-#: my-evolution/Locations.h:1701
-msgid "Patna"
-msgstr ""
-
-#: my-evolution/Locations.h:1702
-msgid "Patterson"
-msgstr ""
-
-#: my-evolution/Locations.h:1703
-msgid "Patuxent River"
-msgstr ""
-
-#: my-evolution/Locations.h:1704
-msgid "Pau/Pyrenees"
-msgstr ""
-
-#: my-evolution/Locations.h:1705
-msgid "Paxson"
-msgstr ""
-
-#: my-evolution/Locations.h:1706
-msgid "Paysandu"
-msgstr ""
-
-#: my-evolution/Locations.h:1707
-msgid "Payson"
-msgstr ""
-
-#: my-evolution/Locations.h:1708
-msgid "Pellston"
-msgstr ""
-
-#: my-evolution/Locations.h:1709
-msgid "Pelotas"
-msgstr ""
-
-#: my-evolution/Locations.h:1710
-msgid "Pendleton"
-msgstr ""
-
-#: my-evolution/Locations.h:1711
-msgid "Pennsylvania"
-msgstr "Pensilvaneye"
-
-#: my-evolution/Locations.h:1712
-msgid "Penn Yan"
-msgstr ""
-
-#: my-evolution/Locations.h:1713
-msgid "Pensacola"
-msgstr ""
-
-#: my-evolution/Locations.h:1714
-msgid "Pensacola NAS"
-msgstr ""
-
-#: my-evolution/Locations.h:1715
-msgid "People's Republic of China"
-msgstr "Republike populaire di Chine"
-
-#: my-evolution/Locations.h:1716
-msgid "Peoria"
-msgstr ""
-
-#: my-evolution/Locations.h:1717
-msgid "Pequot Lakes"
-msgstr ""
-
-#: my-evolution/Locations.h:1718
-msgid "Pereira/Matecana"
-msgstr ""
-
-#: my-evolution/Locations.h:1719
-msgid "Perm"
-msgstr ""
-
-#: my-evolution/Locations.h:1720
-msgid "Perpignan-Rivesaltes"
-msgstr ""
-
-#: my-evolution/Locations.h:1721
-msgid "Perry-Foley"
-msgstr ""
-
-#: my-evolution/Locations.h:1722
-msgid "Perth"
-msgstr ""
-
-#: my-evolution/Locations.h:1724
-msgid "Perugia"
-msgstr "Perugia"
-
-#: my-evolution/Locations.h:1725
-msgid "Pescara"
-msgstr ""
-
-#: my-evolution/Locations.h:1726
-msgid "Petersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1727
-msgid "Petropavlovsk-Kamchatsky"
-msgstr ""
-
-#: my-evolution/Locations.h:1728
-msgid "Petrozavodsk"
-msgstr ""
-
-#: my-evolution/Locations.h:1729
-msgid "Philadelphia"
-msgstr ""
-
-#: my-evolution/Locations.h:1730
-msgid "Philip"
-msgstr ""
-
-#: my-evolution/Locations.h:1731
-msgid "Philipsburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1732
-msgid "Phillips"
-msgstr ""
-
-#: my-evolution/Locations.h:1733
-msgid "Phoenix"
-msgstr ""
-
-#: my-evolution/Locations.h:1734
-msgid "Phoenix-Deer Valley"
-msgstr ""
-
-#: my-evolution/Locations.h:1735
-msgid "Phoenix-Goodyear"
-msgstr ""
-
-#: my-evolution/Locations.h:1736
-msgid "Phoenix-Luke AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1737
-msgid "Piacenza"
-msgstr ""
-
-#: my-evolution/Locations.h:1738
-msgid "Pian Rosa"
-msgstr ""
-
-#: my-evolution/Locations.h:1739
-msgid "Piedras Negras"
-msgstr ""
-
-#: my-evolution/Locations.h:1740
-msgid "Pierre"
-msgstr ""
-
-#: my-evolution/Locations.h:1741
-msgid "Pietersburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1742
-msgid "Pikeville"
-msgstr ""
-
-#: my-evolution/Locations.h:1743
-msgid "Pine Bluff"
-msgstr ""
-
-#: my-evolution/Locations.h:1744
-msgid "Pingtung North"
-msgstr ""
-
-#: my-evolution/Locations.h:1745
-msgid "Pingtung South"
-msgstr ""
-
-#: my-evolution/Locations.h:1746
-msgid "Pirassununga"
-msgstr ""
-
-#: my-evolution/Locations.h:1747
-msgid "Pisa"
-msgstr ""
-
-#: my-evolution/Locations.h:1748
-msgid "Pisco"
-msgstr ""
-
-#: my-evolution/Locations.h:1749
-msgid "Pittsburgh"
-msgstr ""
-
-#: my-evolution/Locations.h:1750
-msgid "Pittsburgh-West Mifflin"
-msgstr ""
-
-#: my-evolution/Locations.h:1751
-msgid "Plattsburg"
-msgstr ""
-
-#: my-evolution/Locations.h:1752
-msgid "Plovdiv"
-msgstr ""
-
-#: my-evolution/Locations.h:1753
-msgid "Plymouth"
-msgstr ""
-
-#: my-evolution/Locations.h:1754
-msgid "Pocatello"
-msgstr ""
-
-#: my-evolution/Locations.h:1755
-msgid "Pocos De Caldas"
-msgstr ""
-
-#: my-evolution/Locations.h:1756
-msgid "Podgorica"
-msgstr ""
-
-#: my-evolution/Locations.h:1757
-msgid "Podgorica Titograd"
-msgstr ""
-
-#: my-evolution/Locations.h:1758
-msgid "Pohang Ab"
-msgstr ""
-
-#: my-evolution/Locations.h:1759
-msgid "Point Hope"
-msgstr ""
-
-#: my-evolution/Locations.h:1760
-msgid "Point Lay"
-msgstr ""
-
-#: my-evolution/Locations.h:1761
-msgid "Point Mugu"
-msgstr ""
-
-#: my-evolution/Locations.h:1762
-msgid "Point Piedras Blanca"
-msgstr ""
-
-#: my-evolution/Locations.h:1763
-msgid "Poitiers"
-msgstr ""
-
-#: my-evolution/Locations.h:1765
-msgid "Pompano Beach"
-msgstr ""
-
-#: my-evolution/Locations.h:1766
-msgid "Ponca City"
-msgstr ""
-
-#: my-evolution/Locations.h:1767
-msgid "Ponce"
-msgstr ""
-
-#: my-evolution/Locations.h:1768
-msgid "Ponta Pora"
-msgstr ""
-
-#: my-evolution/Locations.h:1769
-msgid "Pontiac"
-msgstr ""
-
-#: my-evolution/Locations.h:1770
-msgid "Pope AFB"
-msgstr ""
-
-#: my-evolution/Locations.h:1771
-msgid "Poplar Bluff"
-msgstr ""
-
-#: my-evolution/Locations.h:1772
-msgid "Poprad"
-msgstr ""
-
-#: my-evolution/Locations.h:1773
-msgid "Port Alexander"
-msgstr ""
-
-#: my-evolution/Locations.h:1774
-msgid "Port Alsworth"
-msgstr ""
-
-#: my-evolution/Locations.h:1775
-msgid "Port Angeles"
-msgstr ""
-
-#: my-evolution/Locations.h:1776
-msgid "Port-Au-Prince"
-msgstr ""
-
-#: my-evolution/Locations.h:1777
-msgid "Port Elizabeth"
-msgstr ""
-
-#: my-evolution/Locations.h:1778
-msgid "Porterville"
-msgstr ""
-
-#: my-evolution/Locations.h:1779
-msgid "Port Hardy"
-msgstr ""
-
-#: my-evolution/Locations.h:1780
-msgid "Port Hedland"
-msgstr ""
-
-#: my-evolution/Locations.h:1781
-msgid "Port Heiden"
-msgstr ""
-
-#: my-evolution/Locations.h:1782
-msgid "Portland"
-msgstr ""
-
-#: my-evolution/Locations.h:1783
-msgid "Porto"
-msgstr ""
-
-#: my-evolution/Locations.h:1784
-msgid "Porto Alegre"
-msgstr ""
-
-#: my-evolution/Locations.h:1785
-msgid "Porto Alegre Apt"
-msgstr ""
-
-#: my-evolution/Locations.h:1786
-msgid "Portoroz"
-msgstr ""
-
-#: my-evolution/Locations.h:1787
-msgid "Porto Santo"
-msgstr ""
-
-#: my-evolution/Locations.h:1788
-msgid "Porto Velho"
-msgstr ""
-
-#: my-evolution/Locations.h:1789
-msgid "Port Said"
-msgstr ""
-
-#: my-evolution/Locations.h:1790
-msgid "Portsmouth"
-msgstr ""
-
-#: my-evolution/Locations.h:1792
-msgid "Posadas"
-msgstr ""
-
-#: my-evolution/Locations.h:1793
-msgid "Potosi"
-msgstr ""
-
-#: my-evolution/Locations.h:1794
-msgid "Poughkeepsie"
-msgstr ""
-
-#: my-evolution/Locations.h:1795
-msgid "Pownal"
-msgstr ""
-
-#: my-evolution/Locations.h:1796
-msgid "Poza Rica"
-msgstr ""
-
-#: my-evolution/Locations.h:1797
-msgid "Poznan"
-msgstr ""
-
-#: my-evolution/Locations.h:1798
-msgid "Praha"
-msgstr ""
-
-#: my-evolution/Locations.h:1799
-msgid "Pratica di Mare"
-msgstr ""
-
-#: my-evolution/Locations.h:1800
-msgid "Prescott"
-msgstr ""
-
-#: my-evolution/Locations.h:1801
-msgid "Presidente Prudente"
-msgstr ""
-
-#: my-evolution/Locations.h:1802
-msgid "Presque Isle"
-msgstr ""
-
-#: my-evolution/Locations.h:1803
-msgid "Prestwick"
-msgstr ""
-
-#: my-evolution/Locations.h:1804
-msgid "Pretoria"
-msgstr ""
-
-#: my-evolution/Locations.h:1805
-msgid "Preveza"
-msgstr ""
-
-#: my-evolution/Locations.h:1806
-msgid "Price-Carbon"
-msgstr ""
-
-#: my-evolution/Locations.h:1807
-msgid "Pristina"
-msgstr ""
-
-#: my-evolution/Locations.h:1808
-msgid "Providence"
-msgstr ""
-
-#: my-evolution/Locations.h:1809
-msgid "Provincetown"
-msgstr ""
-
-#: my-evolution/Locations.h:1810
-msgid "Provo"
-msgstr ""
-
-#: my-evolution/Locations.h:1811
-msgid "Pskov"
-msgstr ""
-
-#: my-evolution/Locations.h:1812
-msgid "Pucallpa"
-msgstr ""
-
-#: my-evolution/Locations.h:1813
-msgid "Pudahuel"
-msgstr ""
-
-#: my-evolution/Locations.h:1814
-msgid "Puebla"
-msgstr ""
-
-#: my-evolution/Locations.h:1815
-msgid "Pueblo"
-msgstr ""
-
-#: my-evolution/Locations.h:1816
-msgid "Puerto Barrios"
-msgstr ""
-
-#: my-evolution/Locations.h:1817
-msgid "Puerto Cabezas"
-msgstr ""
-
-#: my-evolution/Locations.h:1818
-msgid "Puerto Escondido"
-msgstr ""
-
-#: my-evolution/Locations.h:1819
-msgid "Puerto Lempira"
-msgstr ""
-
-#: my-evolution/Locations.h:1820
-msgid "Puerto Limon"
-msgstr ""
-
-#: my-evolution/Locations.h:1821
-msgid "Puerto Maldonado"
-msgstr ""
-
-#: my-evolution/Locations.h:1822
-msgid "Puerto Montt"
-msgstr ""
-
-#: my-evolution/Locations.h:1823
-msgid "Puerto Plata"
-msgstr ""
-
-#: my-evolution/Locations.h:1825
-msgid "Puerto Suarez"
-msgstr ""
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "contént"
 
-#: my-evolution/Locations.h:1826
-msgid "Puerto Vallarta"
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
 msgstr ""
 
-#: my-evolution/Locations.h:1827
-msgid "Pula"
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
 msgstr ""
 
-#: my-evolution/Locations.h:1828
-msgid "Pullman"
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
 msgstr ""
 
-#: my-evolution/Locations.h:1829
-msgid "Punta Arenas"
-msgstr ""
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Disfacé"
 
-#: my-evolution/Locations.h:1830
-msgid "Punta Cana"
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
 msgstr ""
 
-#: my-evolution/Locations.h:1831
-msgid "Punta Gorda"
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
 msgstr ""
 
-#: my-evolution/Locations.h:1832
-msgid "Puntilla Lake"
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
 msgstr ""
 
-#: my-evolution/Locations.h:1833
-msgid "Pusan/Kimhae"
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
 msgstr ""
 
-#: my-evolution/Locations.h:1834
-msgid "Pyongtaek Ab"
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
 msgstr ""
 
-#: my-evolution/Locations.h:1835
-msgid "Pyongyang"
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
 msgstr ""
 
-#: my-evolution/Locations.h:1837
-msgid "Quantico"
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
 msgstr ""
 
-#: my-evolution/Locations.h:1838
-msgid "Quebec"
-msgstr "Québec"
-
-#: my-evolution/Locations.h:1839
-msgid "Quebec City"
-msgstr ""
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Brouyon"
 
-#: my-evolution/Locations.h:1840
-msgid "Queretaro"
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
 msgstr ""
 
-#: my-evolution/Locations.h:1841
-msgid "Quillayute"
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
 msgstr ""
 
-#: my-evolution/Locations.h:1842
-msgid "Quimper"
+#: mail/em-filter-i18n.h:23
+msgid "exists"
 msgstr ""
 
-#: my-evolution/Locations.h:1843
-msgid "Quincy"
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
 msgstr ""
 
-#: my-evolution/Locations.h:1844
-msgid "Quito/Mariscal Sucre"
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
 msgstr ""
 
-#: my-evolution/Locations.h:1845
-msgid "Rabat"
+#: mail/em-filter-i18n.h:27
+msgid "is"
 msgstr ""
 
-#: my-evolution/Locations.h:1846
-msgid "Raduzhny"
+#: mail/em-filter-i18n.h:28
+msgid "is after"
 msgstr ""
 
-#: my-evolution/Locations.h:1847
-msgid "Rafha"
+#: mail/em-filter-i18n.h:29
+msgid "is before"
 msgstr ""
 
-#: my-evolution/Locations.h:1848
-msgid "Raleigh-Durham"
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
 msgstr ""
 
-#: my-evolution/Locations.h:1849
-msgid "Randolph AFB"
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
 msgstr ""
 
-#: my-evolution/Locations.h:1850
-msgid "Rapid City"
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
 msgstr ""
 
-#: my-evolution/Locations.h:1851
-msgid "Rapid City-Ellsworth AFB"
+#: mail/em-filter-i18n.h:33
+msgid "is not"
 msgstr ""
 
-#: my-evolution/Locations.h:1852
-msgid "Ras Al Khaimah"
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
 msgstr ""
 
-#: my-evolution/Locations.h:1853
-msgid "Rawlins"
-msgstr ""
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Djun"
 
-#: my-evolution/Locations.h:1854
-msgid "Reading"
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
 msgstr ""
 
-#: my-evolution/Locations.h:1855
-msgid "Rebun Island"
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
 msgstr ""
 
-#: my-evolution/Locations.h:1856
-msgid "Recife"
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
 msgstr ""
 
-#: my-evolution/Locations.h:1857
-msgid "Red Bluff"
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
 msgstr ""
 
-#: my-evolution/Locations.h:1858
-msgid "Redding"
-msgstr ""
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Messaedjes"
 
-#: my-evolution/Locations.h:1859
-msgid "Redig"
+#: mail/em-filter-i18n.h:42
+msgid "Message is not Junk"
 msgstr ""
 
-#: my-evolution/Locations.h:1860
-msgid "Redmond"
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
 msgstr ""
 
-#: my-evolution/Locations.h:1861
-msgid "Red Oak"
-msgstr ""
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Moussî foû di ci programe chal"
 
-#: my-evolution/Locations.h:1862
-msgid "Redwood Falls"
-msgstr ""
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Djower son:"
 
-#: my-evolution/Locations.h:1863
-msgid "Reggio Calabria"
-msgstr ""
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lere"
 
-#: my-evolution/Locations.h:1864
-msgid "Regina"
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
 msgstr ""
 
-#: my-evolution/Locations.h:1865
-msgid "Reims-Champagne"
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
 msgstr ""
 
-#: my-evolution/Locations.h:1866
-msgid "Rennes"
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
 msgstr ""
 
-#: my-evolution/Locations.h:1867
-msgid "Reno"
+#: mail/em-filter-i18n.h:50
+msgid "returns"
 msgstr ""
 
-#: my-evolution/Locations.h:1868
-msgid "Renton"
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
 msgstr ""
 
-#: my-evolution/Locations.h:1869
-msgid "Resistencia"
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
 msgstr ""
 
-#: my-evolution/Locations.h:1870
-msgid "Reus"
-msgstr ""
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Enonder programe:"
 
-#: my-evolution/Locations.h:1871
-msgid "Reyes"
-msgstr ""
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Ponts"
 
-#: my-evolution/Locations.h:1872
-msgid "Reykjavik"
-msgstr ""
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Evoyeu"
 
-#: my-evolution/Locations.h:1873
-msgid "Reynosa"
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
 msgstr ""
 
-#: my-evolution/Locations.h:1874
-msgid "Rhinelander"
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
 msgstr ""
 
-#: my-evolution/Locations.h:1875
-msgid "Rhode Island"
-msgstr "Rhode Island"
-
-#: my-evolution/Locations.h:1876
-msgid "Riberalta"
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
 msgstr ""
 
-#: my-evolution/Locations.h:1877
-msgid "Richmond"
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
 msgstr ""
 
-#: my-evolution/Locations.h:1878
-msgid "Rickenbacker"
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
 msgstr ""
 
-#: my-evolution/Locations.h:1879
-msgid "Rieti"
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
 msgstr ""
 
-#: my-evolution/Locations.h:1880
-msgid "Rifle"
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
 msgstr ""
 
-#: my-evolution/Locations.h:1881
-msgid "Riga"
-msgstr ""
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Sudjet"
 
-#: my-evolution/Locations.h:1882
-msgid "Rijeka"
-msgstr ""
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Etats Unis"
 
-#: my-evolution/Locations.h:1883
-msgid "Rimini"
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+msgid "<b>Then</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:1884
-msgid "Rio De Janeiro"
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: my-evolution/Locations.h:1885
-msgid "Rio Gallegos"
-msgstr ""
+#: mail/em-folder-properties.c:122
+#, fuzzy
+msgid "Folder Properties"
+msgstr "Prôpietés"
 
-#: my-evolution/Locations.h:1886
-msgid "Rio Grande"
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Messaedje shuvant"
+msgstr[1] "Messaedje shuvant"
+
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Messaedje nén léjhou shuvant"
+msgstr[1] "Messaedje nén léjhou shuvant"
+
+#: mail/em-folder-selection-button.c:120
+msgid "<click here to select a folder>"
 msgstr ""
 
-#: my-evolution/Locations.h:1887
-msgid "Rioja"
-msgstr ""
+#: mail/em-folder-selector.c:166
+#, fuzzy
+msgid "Create New Folder"
+msgstr "Fé on novea ridant"
 
-#: my-evolution/Locations.h:1888
-msgid "Rio / Jacarepagua"
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
+msgid "Specify where to create the folder:"
 msgstr ""
 
-#: my-evolution/Locations.h:1889
-msgid "Rionegro/J.M.Cordova"
-msgstr ""
+#: mail/em-folder-selector.c:300
+#, fuzzy
+msgid "Create"
+msgstr "Crowåceye"
 
-#: my-evolution/Locations.h:1890
-msgid "Rishiri Island"
-msgstr ""
+#: mail/em-folder-selector.c:304
+#, fuzzy
+msgid "Folder _name:"
+msgstr "No do fitchî:"
 
-#: my-evolution/Locations.h:1891
-msgid "Rivas"
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
 msgstr ""
 
-#: my-evolution/Locations.h:1892
-msgid "Rivera"
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
 msgstr ""
 
-#: my-evolution/Locations.h:1893
-msgid "Riverside"
-msgstr ""
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Dji tchedje..."
 
-#: my-evolution/Locations.h:1894
-msgid "Riverside/March AFB"
+#: mail/em-folder-tree.c:846
+#, c-format
+msgid "Moving folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:1895
-msgid "Riverton"
+#: mail/em-folder-tree.c:848
+#, c-format
+msgid "Copying folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:1896
-msgid "Rivne"
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
+#, c-format
+msgid "Moving messages into folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:1897
-msgid "Rivolto"
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
+#, c-format
+msgid "Copying messages into folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:1898
-msgid "Riyadh"
+#: mail/em-folder-tree.c:873
+msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: my-evolution/Locations.h:1899
-msgid "Roanoke"
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
 msgstr ""
 
-#: my-evolution/Locations.h:1900
-msgid "Roatan"
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
 msgstr ""
 
-#: my-evolution/Locations.h:1901
-msgid "Robore"
-msgstr ""
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
+#, fuzzy
+msgid "_Move"
+msgstr "Bodjî"
 
-#: my-evolution/Locations.h:1902
-msgid "Rochester"
-msgstr ""
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Rinoncî"
 
-#: my-evolution/Locations.h:1903
-msgid "Rockford"
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
+msgid "Select folder"
 msgstr ""
 
-#: my-evolution/Locations.h:1904
-msgid "Rockland"
-msgstr ""
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
+#, fuzzy
+msgid "C_opy"
+msgstr "Copyî"
 
-#: my-evolution/Locations.h:1905
-msgid "Rockport"
-msgstr ""
+#: mail/em-folder-tree.c:2144
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Fé on novea ridant"
 
-#: my-evolution/Locations.h:1906
-msgid "Rock Springs"
-msgstr ""
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
+#, fuzzy
+msgid "Create folder"
+msgstr "Fé on novea ridant"
 
-#: my-evolution/Locations.h:1907
-msgid "Rocky Mount"
+#: mail/em-folder-tree.c:2526
+#, c-format
+msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: my-evolution/Locations.h:1908
-msgid "Rodos"
-msgstr ""
+#: mail/em-folder-tree.c:2528
+#, fuzzy
+msgid "Rename Folder"
+msgstr "Tchoezi ridant"
 
-#: my-evolution/Locations.h:1909
-msgid "Rogers"
-msgstr ""
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+msgid "_View"
+msgstr "_Vey"
 
-#: my-evolution/Locations.h:1910
-msgid "Roma/Ciampino"
-msgstr ""
+#: mail/em-folder-tree.c:2604
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Drovi dins on novea purnea"
 
-#: my-evolution/Locations.h:1911
-msgid "Roma/Fiumicino"
-msgstr ""
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "C_opyî..."
 
-#: my-evolution/Locations.h:1913
-msgid "Roma/Urbe"
-msgstr ""
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Bodjî..."
 
-#: my-evolution/Locations.h:1914
-msgid "Rome-Russell"
-msgstr ""
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2613
+#, fuzzy
+msgid "_New Folder..."
+msgstr "_Novea ridant"
 
-#: my-evolution/Locations.h:1915
-msgid "Ronchi de' Legionari"
-msgstr ""
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "_Rilomer..."
 
-#: my-evolution/Locations.h:1916
-msgid "Ronneby"
-msgstr ""
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Prôpietés"
 
-#: my-evolution/Locations.h:1917
-msgid "Roosevelt"
+#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
+#: ui/evolution-mail-message.xml.h:113
+msgid "_Edit as New Message..."
 msgstr ""
 
-#: my-evolution/Locations.h:1918
-msgid "Roros"
-msgstr ""
+#: mail/em-folder-view.c:901
+msgid "_Print"
+msgstr "_Imprimer"
 
-#: my-evolution/Locations.h:1919
-msgid "Rorvik/Ryum"
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
+msgid "_Reply to Sender"
 msgstr ""
 
-#: my-evolution/Locations.h:1920
-msgid "Rosario"
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:88
+msgid "Reply to _List"
 msgstr ""
 
-#: my-evolution/Locations.h:1921
-msgid "Roseburg"
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
+#: ui/evolution-mail-message.xml.h:87
+msgid "Reply to _All"
 msgstr ""
 
-#: my-evolution/Locations.h:1922
-msgid "Roseglen"
-msgstr ""
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
+#: ui/evolution-mail-message.xml.h:114
+msgid "_Forward"
+msgstr "En _avant"
 
-#: my-evolution/Locations.h:1923
-msgid "Rost"
+#: mail/em-folder-view.c:910
+msgid "Follo_w Up..."
 msgstr ""
 
-#: my-evolution/Locations.h:1924
-msgid "Rostov-Na-Donu"
-msgstr ""
+#: mail/em-folder-view.c:911
+#, fuzzy
+msgid "Fla_g Completed"
+msgstr "Tot fwait"
 
-#: my-evolution/Locations.h:1925
-msgid "Roswell"
-msgstr ""
+#: mail/em-folder-view.c:912
+#, fuzzy
+msgid "Cl_ear Flag"
+msgstr "Netyî"
 
-#: my-evolution/Locations.h:1926
-msgid "Rotterdam"
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
+msgid "Mar_k as Read"
 msgstr ""
 
-#: my-evolution/Locations.h:1927
-msgid "Rouen-Valle de Seine"
+#: mail/em-folder-view.c:916
+msgid "Mark as _Unread"
 msgstr ""
 
-#: my-evolution/Locations.h:1928
-msgid "Ruidoso-Sierra Blanca"
+#: mail/em-folder-view.c:917
+msgid "Mark as _Important"
 msgstr ""
 
-#: my-evolution/Locations.h:1929
-msgid "Rurrenabaque"
+#: mail/em-folder-view.c:918
+msgid "_Mark as Unimportant"
 msgstr ""
 
-#: my-evolution/Locations.h:1930
-msgid "Russell"
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
+msgid "Mark as _Junk"
 msgstr ""
 
-#: my-evolution/Locations.h:1931
-msgid "Russia"
-msgstr "Russeye"
-
-#: my-evolution/Locations.h:1932
-msgid "Rutland"
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
+msgid "Mark as _Not Junk"
 msgstr ""
 
-#: my-evolution/Locations.h:1933
-msgid "Rygge"
-msgstr ""
+#: mail/em-folder-view.c:924
+#, fuzzy
+msgid "U_ndelete"
+msgstr "_Disrafacer"
 
-#: my-evolution/Locations.h:1934
-msgid "Rzeszow"
-msgstr ""
+#: mail/em-folder-view.c:927
+#, fuzzy
+msgid "Mo_ve to Folder..."
+msgstr "_Novea ridant"
 
-#: my-evolution/Locations.h:1935
-msgid "Saarbrucken"
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
+msgid "_Copy to Folder..."
 msgstr ""
 
-#: my-evolution/Locations.h:1936
-msgid "Sabine Pass"
+#: mail/em-folder-view.c:936
+msgid "Add Sender to Address_book"
 msgstr ""
 
-#: my-evolution/Locations.h:1937
-msgid "Sacramento"
-msgstr ""
+#: mail/em-folder-view.c:939
+#, fuzzy
+msgid "Appl_y Filters"
+msgstr "Passetes"
 
-#: my-evolution/Locations.h:1938
-msgid "Sacramento-Woodland"
-msgstr ""
+#: mail/em-folder-view.c:940
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Rîles po les passetes"
 
-#: my-evolution/Locations.h:1939
-msgid "Safford-Municipal Airport"
+#: mail/em-folder-view.c:943
+msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: my-evolution/Locations.h:1940
-msgid "Saginaw"
+#: mail/em-folder-view.c:944
+msgid "VFolder on _Subject"
 msgstr ""
 
-#: my-evolution/Locations.h:1941
-msgid "Saint Anthony"
+#: mail/em-folder-view.c:945
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: my-evolution/Locations.h:1942
-msgid "Saint-Brieuc-Armor"
+#: mail/em-folder-view.c:946
+msgid "VFolder on _Recipients"
 msgstr ""
 
-#: my-evolution/Locations.h:1943
-msgid "Saint-Dizier-Robinson"
+#: mail/em-folder-view.c:947
+msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: my-evolution/Locations.h:1944
-msgid "Saint-Etienne-Boutheon"
+#: mail/em-folder-view.c:951
+msgid "Filter on Sub_ject"
 msgstr ""
 
-#: my-evolution/Locations.h:1945
-msgid "Saint Mary's"
+#: mail/em-folder-view.c:952
+msgid "Filter on Sen_der"
 msgstr ""
 
-#: my-evolution/Locations.h:1946
-msgid "Saint Mawgan"
+#: mail/em-folder-view.c:953
+msgid "Filter on Re_cipients"
 msgstr ""
 
-#: my-evolution/Locations.h:1947
-msgid "Saint-Nazaire-Montoir"
+#: mail/em-folder-view.c:954
+msgid "Filter on _Mailing List"
 msgstr ""
 
-#: my-evolution/Locations.h:1948
-msgid "Saint Paul"
-msgstr ""
+#. default charset used in mail view
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
+#: mail/mail-config.glade.h:68
+msgid "Default"
+msgstr "Prémetou"
 
-#: my-evolution/Locations.h:1949
-msgid "Saiq"
+#: mail/em-folder-view.c:1851
+msgid "Print Message"
 msgstr ""
 
-#: my-evolution/Locations.h:1950
-msgid "Salalah"
-msgstr ""
+#: mail/em-folder-view.c:2112
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "Copyî l' eplaeçmint do loyén"
 
-#: my-evolution/Locations.h:1951
-msgid "Salem"
+#: mail/em-folder-view.c:2377
+#, c-format
+msgid "Click to mail %s"
 msgstr ""
 
-#: my-evolution/Locations.h:1952
-msgid "Salida"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: my-evolution/Locations.h:1953
-msgid "Salida-Harriet"
-msgstr ""
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Nén defineye"
 
-#: my-evolution/Locations.h:1954
-msgid "Salina"
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: my-evolution/Locations.h:1955
-msgid "Salinas"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
 msgstr ""
 
-#: my-evolution/Locations.h:1956
-msgid "Salisbury"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr ""
 
-#: my-evolution/Locations.h:1957
-msgid "Salmon"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
 msgstr ""
 
-#: my-evolution/Locations.h:1958
-msgid "Salmon (2)"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: my-evolution/Locations.h:1959
-msgid "Salta"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: my-evolution/Locations.h:1960
-msgid "Saltillo"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: my-evolution/Locations.h:1961
-msgid "Salt Lake City"
-msgstr ""
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Nén defineye"
 
-#: my-evolution/Locations.h:1962
-msgid "Salto"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: my-evolution/Locations.h:1963
-msgid "Salt point"
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
 msgstr ""
 
-#: my-evolution/Locations.h:1964
-msgid "Salvador"
+#: mail/em-format-html-display.c:651
+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 ""
 
-#: my-evolution/Locations.h:1965
-msgid "Salzburg"
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
 msgstr ""
 
-#: my-evolution/Locations.h:1966
-msgid "Samara"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
-#: my-evolution/Locations.h:1967
-msgid "Samos"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
 msgstr ""
 
-#: my-evolution/Locations.h:1968
-msgid "Samsun"
+#: mail/em-format-html-display.c:653
+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 ""
 
-#: my-evolution/Locations.h:1969
-msgid "Sana'A"
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
 msgstr ""
 
-#: my-evolution/Locations.h:1970
-msgid "San Andres Isla/Sesquicentenario"
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: my-evolution/Locations.h:1971
-msgid "San Angelo"
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: my-evolution/Locations.h:1972
-msgid "San Antonio"
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
 msgstr ""
 
-#: my-evolution/Locations.h:1973
-msgid "San Antonio Del Tachira"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: my-evolution/Locations.h:1974
-msgid "San Antonio-Kelly AFB"
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
 msgstr ""
 
-#: my-evolution/Locations.h:1975
-msgid "San Antonio-Stinson"
-msgstr ""
+#: mail/em-format-html-display.c:1086
+#, fuzzy
+msgid "_Hide"
+msgstr "Catchî"
 
-#: my-evolution/Locations.h:1976
-msgid "San Carlos"
-msgstr ""
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "Pådje %d di %d"
 
-#: my-evolution/Locations.h:1977
-msgid "Sandane"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: my-evolution/Locations.h:1978
-msgid "Sandberg"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: my-evolution/Locations.h:1979
-msgid "Sanderson"
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
 msgstr ""
 
-#: my-evolution/Locations.h:1980
-msgid "San Diego"
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: my-evolution/Locations.h:1981
-msgid "San Diego-Brown"
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: my-evolution/Locations.h:1982
-msgid "San Diego-Miramar"
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: my-evolution/Locations.h:1983
-msgid "San Diego-Montgomery"
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: my-evolution/Locations.h:1984
-msgid "San Diego-North Island"
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: my-evolution/Locations.h:1985
-msgid "San Diego-Santee"
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
 msgstr ""
 
-#: my-evolution/Locations.h:1986
-msgid "Sandnessjoen/Stokka"
-msgstr ""
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Di"
 
-#: my-evolution/Locations.h:1987
-msgid "Sand Point"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
 msgstr ""
 
-#: my-evolution/Locations.h:1988
-msgid "San Fernando De Apure"
-msgstr ""
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "A"
 
-#: my-evolution/Locations.h:1989
-msgid "Sanford"
-msgstr ""
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
 
-#: my-evolution/Locations.h:1990
-msgid "San Francisco"
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
 msgstr ""
 
-#: my-evolution/Locations.h:1991
-msgid "Sangju"
-msgstr ""
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+#, fuzzy
+msgid "Mailer"
+msgstr "Emile"
 
-#: my-evolution/Locations.h:1992
-msgid "San Ignacio De Velasco"
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
-#: my-evolution/Locations.h:1993
-msgid "San Joaquin"
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: my-evolution/Locations.h:1994
-msgid "San Jose"
-msgstr "San José"
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Date"
 
-#: my-evolution/Locations.h:1995
-msgid "San Jose De Chiquitos"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: my-evolution/Locations.h:1996
-msgid "San Jose del Cabo"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: my-evolution/Locations.h:1997
-msgid "San Jose-Santa Clara"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: my-evolution/Locations.h:1998
-msgid "San Juan"
-msgstr "San Juan"
-
-#: my-evolution/Locations.h:1999
-msgid "Sankt-Peterburg"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: my-evolution/Locations.h:2000
-msgid "Sanliurfa"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: my-evolution/Locations.h:2001
-msgid "San Luis Obispo"
-msgstr ""
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Operåcion nén sopoirtêye"
 
-#: my-evolution/Locations.h:2002
-msgid "San Luis Potosi"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: my-evolution/Locations.h:2003
-msgid "San Miguel"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: my-evolution/Locations.h:2004
-msgid "San Nicholas Island"
+#: mail/em-junk-filter.c:86
+msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: my-evolution/Locations.h:2005
-msgid "San Salvador"
-msgstr ""
+#: mail/em-mailer-prefs.c:100
+#, fuzzy
+msgid "Every time"
+msgstr "Tchaeke"
 
-#: my-evolution/Locations.h:2006
-msgid "San Sebastian"
-msgstr ""
+#: mail/em-mailer-prefs.c:101
+#, fuzzy
+msgid "Once per day"
+msgstr "_On djoû"
 
-#: my-evolution/Locations.h:2007
-msgid "Santa Ana"
+#: mail/em-mailer-prefs.c:102
+msgid "Once per week"
 msgstr ""
 
-#: my-evolution/Locations.h:2008
-msgid "Santa Barbara"
+#: mail/em-mailer-prefs.c:103
+msgid "Once per month"
 msgstr ""
 
-#: my-evolution/Locations.h:2009
-msgid "Santa Cruz"
+#: mail/em-migrate.c:1168
+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 ""
 
-#: my-evolution/Locations.h:2010
-msgid "Santa Fe"
+#: mail/em-migrate.c:1602
+#, c-format
+msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2011
-msgid "Santa Maria"
+#: mail/em-migrate.c:1628
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2012
-msgid "Santa Marta/Simon Bolivar"
+#: mail/em-migrate.c:1811
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2013
-msgid "Santa Monica"
+#: mail/em-migrate.c:2015
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2014
-msgid "Santander"
+#: mail/em-migrate.c:2029
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2015
-msgid "Santarem"
+#: mail/em-migrate.c:2058
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2016
-msgid "Santa Rosa"
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2017
-msgid "Santa Rosa de Copan"
+#: mail/em-migrate.c:2576
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2018
-msgid "Santiago"
+#: mail/em-migrate.c:2594
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: my-evolution/Locations.h:2019
-msgid "Santiago de Cuba"
-msgstr ""
+#: mail/em-popup.c:700
+msgid "Save As..."
+msgstr "Schaper et rlomer..."
 
-#: my-evolution/Locations.h:2020
-msgid "Santiago Del Estero"
+#: mail/em-popup.c:718
+#, c-format
+msgid "untitled_image.%s"
 msgstr ""
 
-#: my-evolution/Locations.h:2021
-msgid "Santorini"
+#: mail/em-popup.c:808
+msgid "Set as _Background"
 msgstr ""
 
-#: my-evolution/Locations.h:2022
-msgid "Santos"
+#: mail/em-popup.c:810
+msgid "_Reply to sender"
 msgstr ""
 
-#: my-evolution/Locations.h:2023
-msgid "Sao Jose Dos Campo"
-msgstr ""
+#: mail/em-popup.c:859
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "Drovi dins on novea purnea"
 
-#: my-evolution/Locations.h:2024
-msgid "Sao Luiz"
+#: mail/em-popup.c:860
+msgid "Se_nd message to..."
 msgstr ""
 
-#: my-evolution/Locations.h:2025
-msgid "Sao Paulo"
-msgstr ""
+#: mail/em-popup.c:861
+#, fuzzy
+msgid "_Add to Addressbook"
+msgstr "Calpin d' adresses"
 
-#: my-evolution/Locations.h:2026
-msgid "Sapporo Ab"
+#: mail/em-popup.c:985
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: my-evolution/Locations.h:2027
-msgid "Sarajevo"
+#: mail/em-subscribe-editor.c:606
+msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: my-evolution/Locations.h:2028
-msgid "Saranac Lake"
-msgstr ""
+#: mail/em-subscribe-editor.c:635
+#, fuzzy
+msgid "Subscribed"
+msgstr "M' abouner"
 
-#: my-evolution/Locations.h:2029
-msgid "Sarasota"
-msgstr ""
+#: mail/em-subscribe-editor.c:639
+msgid "Folder"
+msgstr "Ridant"
 
-#: my-evolution/Locations.h:2030
-msgid "Saratov"
+#. FIXME: This is just to get the shadow, is there a better way?
+#: mail/em-subscribe-editor.c:852
+msgid "Please select a server."
 msgstr ""
 
-#: my-evolution/Locations.h:2031
-msgid "Sarzana"
+#: mail/em-subscribe-editor.c:873
+msgid "No server has been selected"
 msgstr ""
 
-#: my-evolution/Locations.h:2032
-msgid "Saskatchewan"
-msgstr "Saskatchewan"
-
-#: my-evolution/Locations.h:2033
-msgid "Saskatoon"
+#: mail/em-utils.c:102
+msgid "Don't show this message again."
 msgstr ""
 
-#: my-evolution/Locations.h:2034
-msgid "Sauce Viejo"
-msgstr ""
+#: mail/em-utils.c:292
+msgid "Filters"
+msgstr "Passetes"
 
-#: my-evolution/Locations.h:2036
-msgid "Sault Ste Marie"
-msgstr ""
+#: mail/em-utils.c:406
+#, fuzzy
+msgid "message"
+msgstr "Messaedje"
 
-#: my-evolution/Locations.h:2037
-msgid "Savannah"
-msgstr ""
+#: mail/em-utils.c:509
+#, fuzzy
+msgid "Save Message..."
+msgstr "Schaper et rlomer..."
 
-#: my-evolution/Locations.h:2038
-msgid "Savannah-Hunter AAF"
-msgstr ""
+#: mail/em-utils.c:558
+#, fuzzy
+msgid "Add address"
+msgstr "_Adresse:"
 
-#: my-evolution/Locations.h:2039
-msgid "Sawyer AFB"
-msgstr ""
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:1019
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Messaedjes"
 
-#: my-evolution/Locations.h:2040
-msgid "Sayun"
-msgstr ""
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Ridants"
 
-#: my-evolution/Locations.h:2041
-msgid "Scatsta"
-msgstr ""
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Radjouter"
 
-#: my-evolution/Locations.h:2042
-msgid "Schaffen"
-msgstr ""
+#: mail/em-vfolder-rule.c:574
+#, fuzzy
+msgid "VFolder source"
+msgstr "Ridants"
 
-#: my-evolution/Locations.h:2043
-msgid "Schenectady"
+#: mail/evolution-mail.schemas.in.in.h:1
+msgid "Automatic link recognition"
 msgstr ""
 
-#: my-evolution/Locations.h:2044
-msgid "Scilly Isles"
+#: mail/evolution-mail.schemas.in.in.h:2
+msgid "Automatic smiley recognition"
 msgstr ""
 
-#: my-evolution/Locations.h:2045
-msgid "Scottsbluff"
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: my-evolution/Locations.h:2046
-msgid "Scottsdale"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight color"
 msgstr ""
 
-#: my-evolution/Locations.h:2047
-msgid "Scranton"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight color."
 msgstr ""
 
-#: my-evolution/Locations.h:2048
-msgid "Seattle"
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
 msgstr ""
 
-#: my-evolution/Locations.h:2049
-msgid "Seattle-Boeing"
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
 msgstr ""
 
-#: my-evolution/Locations.h:2050
-msgid "Sedalia"
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to compose messages"
 msgstr ""
 
-#: my-evolution/Locations.h:2051
-msgid "Seeb"
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to compose messages."
 msgstr ""
 
-#: my-evolution/Locations.h:2052
-msgid "Selanik"
+#: mail/evolution-mail.schemas.in.in.h:10
+msgid "Default charset in which to display messages"
 msgstr ""
 
-#: my-evolution/Locations.h:2053
-msgid "Sendai Airport"
+#: mail/evolution-mail.schemas.in.in.h:11
+msgid "Default charset in which to display messages."
 msgstr ""
 
-#: my-evolution/Locations.h:2054
-msgid "Seoul E Ab"
-msgstr ""
+#: mail/evolution-mail.schemas.in.in.h:12
+#, fuzzy
+msgid "Default forward style"
+msgstr "Prumiristé prémetowe:"
 
-#: my-evolution/Locations.h:2055
-msgid "Seoul/Kimp'O International Airport"
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Default height of the Composer Window"
 msgstr ""
 
-#: my-evolution/Locations.h:2056
-msgid "Seoul/Yongdungp'O Rokaf Wc"
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Default height of the Message Window"
 msgstr ""
 
-#: my-evolution/Locations.h:2057
-msgid "Sept-Iles"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Default height of the Subscribe dialog"
 msgstr ""
 
-#: my-evolution/Locations.h:2058
-msgid "Seul Choix Pt"
-msgstr ""
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default reply style"
+msgstr "Prumiristé prémetowe:"
 
-#: my-evolution/Locations.h:2059
-msgid "Sevilla"
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Default width of the Composer Window"
 msgstr ""
 
-#: my-evolution/Locations.h:2060
-msgid "Seward"
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Default width of the Message Window"
 msgstr ""
 
-#: my-evolution/Locations.h:2061
-msgid "Sexton Summit"
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid "Default width of the Subscribe dialog"
 msgstr ""
 
-#: my-evolution/Locations.h:2062
-msgid "Shanghai"
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
 
-#: my-evolution/Locations.h:2063
-msgid "Shannon"
+#: mail/evolution-mail.schemas.in.in.h:21
+msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: my-evolution/Locations.h:2064
-msgid "Sharjah"
+#: mail/evolution-mail.schemas.in.in.h:22
+msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: my-evolution/Locations.h:2065
-msgid "Sharm El Sheikhintl"
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: my-evolution/Locations.h:2066
-msgid "Sharurah"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Enable/disable caret mode"
 msgstr ""
 
-#: my-evolution/Locations.h:2067
-msgid "Shawbury"
+#: mail/evolution-mail.schemas.in.in.h:25
+msgid "Height of the message-list pane"
 msgstr ""
 
-#: my-evolution/Locations.h:2068
-msgid "Shearwater"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
 msgstr ""
 
-#: my-evolution/Locations.h:2069
-msgid "Sheboygan"
+#: mail/evolution-mail.schemas.in.in.h:27
+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 ""
 
-#: my-evolution/Locations.h:2070
-msgid "Sheldon"
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
 msgstr ""
 
-#: my-evolution/Locations.h:2071
-msgid "Shelter Cove"
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: my-evolution/Locations.h:2072
-msgid "Shelton"
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "List of accepted licenses"
 msgstr ""
 
-#: my-evolution/Locations.h:2073
-msgid "Shenandoah"
+#: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
 msgstr ""
 
-#: my-evolution/Locations.h:2074
-msgid "Sheridan"
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
-#: my-evolution/Locations.h:2075
-msgid "Sherman-Denison"
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: my-evolution/Locations.h:2076
-msgid "Shimofusa Ab"
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: my-evolution/Locations.h:2077
-msgid "Shingle Point"
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: my-evolution/Locations.h:2078
-msgid "Shiraz"
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
-#: my-evolution/Locations.h:2079
-msgid "Shishmaref"
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: my-evolution/Locations.h:2080
-msgid "Shizuhama Ab"
+#: mail/evolution-mail.schemas.in.in.h:38
+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 ""
 
-#: my-evolution/Locations.h:2081
-msgid "Shoreham"
+#: mail/evolution-mail.schemas.in.in.h:39
+msgid "Log filter actions"
 msgstr ""
 
-#: my-evolution/Locations.h:2082
-msgid "Show Low"
+#: mail/evolution-mail.schemas.in.in.h:40
+msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: my-evolution/Locations.h:2083
-msgid "Shreveport Downtown"
+#: mail/evolution-mail.schemas.in.in.h:41
+msgid "Logfile to log filter actions"
 msgstr ""
 
-#: my-evolution/Locations.h:2084
-msgid "Shreveport Regional"
+#: mail/evolution-mail.schemas.in.in.h:42
+msgid "Logfile to log filter actions."
 msgstr ""
 
-#: my-evolution/Locations.h:2085
-msgid "Sidney"
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: my-evolution/Locations.h:2086
-msgid "Sigonella"
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: my-evolution/Locations.h:2087
-msgid "Siloam Springs"
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: my-evolution/Locations.h:2088
-msgid "Silver City"
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2089
-msgid "Sindal"
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Message Window default height"
 msgstr ""
 
-#: my-evolution/Locations.h:2091
-msgid "Sioux City"
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default width"
 msgstr ""
 
-#: my-evolution/Locations.h:2092
-msgid "Sioux Falls"
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: my-evolution/Locations.h:2093
-msgid "Sitka"
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: my-evolution/Locations.h:2094
-msgid "Sivas"
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: my-evolution/Locations.h:2095
-msgid "Sivrihisar"
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "New Mail Notify sound file"
 msgstr ""
 
-#: my-evolution/Locations.h:2096
-msgid "Skagway"
+#: mail/evolution-mail.schemas.in.in.h:53
+msgid "New Mail Notify type"
 msgstr ""
 
-#: my-evolution/Locations.h:2097
-msgid "Skiathos"
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Prompt on empty subject"
 msgstr ""
 
-#: my-evolution/Locations.h:2098
-msgid "Skien/Geiteryggen"
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: my-evolution/Locations.h:2099
-msgid "Skive"
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: my-evolution/Locations.h:2100
-msgid "Skopje"
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt when user expunges"
 msgstr ""
 
-#: my-evolution/Locations.h:2101
-msgid "Skwentna"
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: my-evolution/Locations.h:2102
-msgid "Slana"
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr ""
 
-#: my-evolution/Locations.h:2105
-msgid "Smithers"
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: my-evolution/Locations.h:2106
-msgid "Smyrna"
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: my-evolution/Locations.h:2107
-msgid "Snowshoe Lake"
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Recognize links in text and replace them."
 msgstr ""
 
-#: my-evolution/Locations.h:2108
-msgid "Sochi"
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
-#: my-evolution/Locations.h:2109
-msgid "Socorro"
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "Run junk test on incoming mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2110
-msgid "Socotra"
+#: mail/evolution-mail.schemas.in.in.h:65
+msgid "Send HTML mail by default"
 msgstr ""
 
-#: my-evolution/Locations.h:2111
-msgid "Soda Springs"
+#: mail/evolution-mail.schemas.in.in.h:66
+msgid "Send HTML mail by default."
 msgstr ""
 
-#: my-evolution/Locations.h:2112
-msgid "Sofia"
+#: mail/evolution-mail.schemas.in.in.h:67
+msgid "Show Animations"
 msgstr ""
 
-#: my-evolution/Locations.h:2113
-msgid "Sogndal"
+#: mail/evolution-mail.schemas.in.in.h:68
+msgid "Show animated images as animations."
 msgstr ""
 
-#: my-evolution/Locations.h:2114
-msgid "Soldotna"
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: my-evolution/Locations.h:2115
-msgid "Somerset"
+#: mail/evolution-mail.schemas.in.in.h:70
+msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: my-evolution/Locations.h:2116
-msgid "Sonderborg"
+#: mail/evolution-mail.schemas.in.in.h:71
+msgid "Show the \"Preview\" pane"
 msgstr ""
 
-#: my-evolution/Locations.h:2117
-msgid "Songmu Ab"
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
 msgstr ""
 
-#: my-evolution/Locations.h:2118
-msgid "Sorkjosen"
+#: mail/evolution-mail.schemas.in.in.h:73
+msgid "Sound file to play when new mail arrives."
 msgstr ""
 
-#: my-evolution/Locations.h:2120
-msgid "Southampton"
-msgstr "Southampton"
-
-#: my-evolution/Locations.h:2121
-msgid "South Bend"
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Specifies the type of New Mail Notification the user wishes to use."
 msgstr ""
 
-#: my-evolution/Locations.h:2122
-msgid "South Carolina"
-msgstr "Caroline nonnrece"
-
-#: my-evolution/Locations.h:2123
-msgid "South Dakota"
-msgstr "Dakota nonnrece"
-
-#: my-evolution/Locations.h:2124
-msgid "Southend"
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "Spell check inline"
 msgstr ""
 
-#: my-evolution/Locations.h:2125
-msgid "South Marsh Island"
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default height"
 msgstr ""
 
-#: my-evolution/Locations.h:2126
-msgid "South Timbalier"
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
 msgstr ""
 
-#: my-evolution/Locations.h:2128
-msgid "Sparrevohn"
-msgstr ""
+#: mail/evolution-mail.schemas.in.in.h:78
+#, fuzzy
+msgid "Terminal font"
+msgstr "Vermont"
 
-#: my-evolution/Locations.h:2129
-msgid "Spencer"
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
 msgstr ""
 
-#: my-evolution/Locations.h:2130
-msgid "Spickard"
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "The terminal font for mail display"
 msgstr ""
 
-#: my-evolution/Locations.h:2131
-msgid "Split"
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "The variable width font for mail display"
 msgstr ""
 
-#: my-evolution/Locations.h:2132
-msgid "Spokane"
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
-#: my-evolution/Locations.h:2133
-msgid "Spokane-Parkwater"
+#: mail/evolution-mail.schemas.in.in.h:83
+msgid "Thread the message list."
 msgstr ""
 
-#: my-evolution/Locations.h:2134
-msgid "Springbok"
+#: mail/evolution-mail.schemas.in.in.h:84
+msgid "Thread the message-list"
 msgstr ""
 
-#: my-evolution/Locations.h:2135
-msgid "Springfield"
+#: mail/evolution-mail.schemas.in.in.h:85
+msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: my-evolution/Locations.h:2136
-msgid "Stampede Pass"
+#: mail/evolution-mail.schemas.in.in.h:86
+msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: my-evolution/Locations.h:2137
-msgid "State College"
+#: mail/evolution-mail.schemas.in.in.h:87
+msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: my-evolution/Locations.h:2138
-msgid "Stauning"
+#: mail/evolution-mail.schemas.in.in.h:88
+msgid "UID string of the default account."
 msgstr ""
 
-#: my-evolution/Locations.h:2139
-msgid "Staunton"
+#: mail/evolution-mail.schemas.in.in.h:89
+msgid "Use Spamasssassin daemon and client"
 msgstr ""
 
-#: my-evolution/Locations.h:2140
-msgid "Stavanger/Sola"
+#: mail/evolution-mail.schemas.in.in.h:90
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: my-evolution/Locations.h:2141
-msgid "Staverton"
+#: mail/evolution-mail.schemas.in.in.h:91
+msgid "Use custom fonts"
 msgstr ""
 
-#: my-evolution/Locations.h:2142
-msgid "Stavropol"
+#: mail/evolution-mail.schemas.in.in.h:92
+msgid "Use custom fonts for displaying mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2143
-msgid "St Cloud"
+#: mail/evolution-mail.schemas.in.in.h:93
+msgid "Use only local spam tests."
 msgstr ""
 
-#: my-evolution/Locations.h:2144
-msgid "Steamboat Springs"
+#: mail/evolution-mail.schemas.in.in.h:94
+msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
-#: my-evolution/Locations.h:2145
-msgid "Stephenville"
+#: mail/evolution-mail.schemas.in.in.h:95
+msgid "Variable width font"
 msgstr ""
 
-#: my-evolution/Locations.h:2146
-msgid "St. George"
+#: mail/evolution-mail.schemas.in.in.h:96
+msgid "View/Bcc menu item is checked"
 msgstr ""
 
-#: my-evolution/Locations.h:2147
-msgid "Stillwater"
+#: mail/evolution-mail.schemas.in.in.h:97
+msgid "View/Bcc menu item is checked."
 msgstr ""
 
-#: my-evolution/Locations.h:2148
-msgid "St. John's"
+#: mail/evolution-mail.schemas.in.in.h:98
+msgid "View/Cc menu item is checked"
 msgstr ""
 
-#: my-evolution/Locations.h:2149
-msgid "St Johnsbury"
+#: mail/evolution-mail.schemas.in.in.h:99
+msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: my-evolution/Locations.h:2150
-msgid "St Joseph"
+#: mail/evolution-mail.schemas.in.in.h:100
+msgid "View/From menu item is checked"
 msgstr ""
 
-#: my-evolution/Locations.h:2151
-msgid "St Louis"
+#: mail/evolution-mail.schemas.in.in.h:101
+msgid "View/From menu item is checked."
 msgstr ""
 
-#: my-evolution/Locations.h:2152
-msgid "St Louis-Spirit"
+#: mail/evolution-mail.schemas.in.in.h:102
+msgid "View/PostTo menu item is checked"
 msgstr ""
 
-#: my-evolution/Locations.h:2153
-msgid "Stockholm (Arlanda)"
+#: mail/evolution-mail.schemas.in.in.h:103
+msgid "View/PostTo menu item is checked."
 msgstr ""
 
-#: my-evolution/Locations.h:2154
-msgid "Stockholm (Bromma)"
+#: mail/evolution-mail.schemas.in.in.h:104
+msgid "View/ReplyTo menu item is checked"
 msgstr ""
 
-#: my-evolution/Locations.h:2155
-msgid "Stockton"
+#: mail/evolution-mail.schemas.in.in.h:105
+msgid "View/ReplyTo menu item is checked."
 msgstr ""
 
-#: my-evolution/Locations.h:2156
-msgid "Stokmarknes/Skagen"
+#: mail/evolution-mail.schemas.in.in.h:106
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
-#: my-evolution/Locations.h:2157
-msgid "Stord/Sorstokken"
+#: mail/evolution-mail.schemas.in.in.h:107
+msgid "port for starting user runned spamd"
 msgstr ""
 
-#: my-evolution/Locations.h:2158
-msgid "Storm Lake"
-msgstr ""
+#: mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
+msgid "spamd port"
+msgstr "Abaguer"
 
-#: my-evolution/Locations.h:2159
-msgid "Stornoway"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: my-evolution/Locations.h:2160
-msgid "St Paul"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
 
-#: my-evolution/Locations.h:2161
-msgid "St Petersburg"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
 
-#: my-evolution/Locations.h:2162
-msgid "St Petersburg / Clearwater"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: my-evolution/Locations.h:2163
-msgid "Strasbourg"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
 msgstr ""
 
-#: my-evolution/Locations.h:2164
-msgid "Strevell"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
 
-#: my-evolution/Locations.h:2165
-msgid "St Simon's Island"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: my-evolution/Locations.h:2166
-msgid "Stumpy Point"
+#: mail/importers/elm-importer.c:88
+msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2167
-msgid "Sturgeon Bay"
+#: mail/importers/elm-importer.c:89
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+msgid "Importing..."
 msgstr ""
 
-#: my-evolution/Locations.h:2168
-msgid "Stuttgart"
-msgstr ""
+#: mail/importers/elm-importer.c:91
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+msgid "Please wait"
+msgstr "Tårdjîz on pô, s' i vs plait"
 
-#: my-evolution/Locations.h:2169
-msgid "Sucre"
+#: mail/importers/elm-importer.c:244
+msgid "Importing Elm data"
 msgstr ""
 
-#: my-evolution/Locations.h:2170
-msgid "Sumburgh"
+#: mail/importers/elm-importer.c:436
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: my-evolution/Locations.h:2171
-msgid "Sumter"
-msgstr ""
+#: mail/importers/elm-importer.c:444
+msgid "Elm"
+msgstr "Elm"
 
-#: my-evolution/Locations.h:2172
-msgid "Sumter (2)"
+#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
+msgid "Destination folder:"
 msgstr ""
 
-#: my-evolution/Locations.h:2173
-msgid "Sundsvall-Harnosand"
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
+msgid "Select folder to import into"
 msgstr ""
 
-#: my-evolution/Locations.h:2174
-msgid "Sungshan/Taipei"
-msgstr ""
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/mail-importer.c:226
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Abaguer"
 
-#: my-evolution/Locations.h:2175
-msgid "Superior"
+#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/mail-importer.c:140
+msgid "Importing mailbox"
 msgstr ""
 
-#: my-evolution/Locations.h:2177
-msgid "Sutton"
+#: mail/importers/mail-importer.c:360
+#, c-format
+msgid "Scanning %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2178
-msgid "Suwon Ab"
+#: mail/importers/netscape-importer.c:73
+#, c-format
+msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: my-evolution/Locations.h:2179
-msgid "Svalbard"
+#: mail/importers/netscape-importer.c:662
+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 ""
 
-#: my-evolution/Locations.h:2180
-msgid "Svolvaer/Helle"
+#: mail/importers/netscape-importer.c:686
+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 ""
 
-#: my-evolution/Locations.h:2182
-msgid "Swift Current"
+#: mail/importers/netscape-importer.c:703
+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 ""
 
-#: my-evolution/Locations.h:2184
-msgid "Sydney"
+#: mail/importers/netscape-importer.c:1250
+msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: my-evolution/Locations.h:2185
-msgid "Syktyvkar"
+#: mail/importers/netscape-importer.c:1707
+msgid "Importing Netscape data"
 msgstr ""
 
-#: my-evolution/Locations.h:2186
-msgid "Sympheropol"
-msgstr ""
+#: mail/importers/netscape-importer.c:1907
+msgid "Settings"
+msgstr "Apontiaedjes"
 
-#: my-evolution/Locations.h:2187
-msgid "Syracuse"
-msgstr ""
+#: mail/importers/netscape-importer.c:1912
+#, fuzzy
+msgid "Mail Filters"
+msgstr "Passetes"
 
-#: my-evolution/Locations.h:2188
-msgid "Szczecin"
+#: mail/importers/netscape-importer.c:1933
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
 
-#: my-evolution/Locations.h:2189
-msgid "Szombathely"
+#: mail/importers/pine-importer.c:116
+msgid "Evolution is importing your old Pine data"
 msgstr ""
 
-#: my-evolution/Locations.h:2190
-msgid "Tabatinga"
+#: mail/importers/pine-importer.c:314
+msgid "Importing Pine data"
 msgstr ""
 
-#: my-evolution/Locations.h:2191
-msgid "Tabriz"
-msgstr ""
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Calpin d' adresses"
 
-#: my-evolution/Locations.h:2192
-msgid "Tabuk"
+#: mail/importers/pine-importer.c:498
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
 
-#: my-evolution/Locations.h:2193
-msgid "Tachikawa Ab"
+#: mail/importers/pine-importer.c:506
+msgid "Pine"
 msgstr ""
 
-#: my-evolution/Locations.h:2194
-msgid "Tacna"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:155
+msgid "Evolution Account Editor"
 msgstr ""
 
-#: my-evolution/Locations.h:2195
-msgid "Tacoma"
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 msgstr ""
 
-#: my-evolution/Locations.h:2196
-msgid "Tacoma-Lakewood"
+#: mail/mail-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
 msgstr ""
 
-#: my-evolution/Locations.h:2197
-msgid "Tacuarembo"
-msgstr ""
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
+msgid "_Host:"
+msgstr "_Lodjoe:"
 
-#: my-evolution/Locations.h:2198
-msgid "Taegu"
-msgstr ""
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
+#, fuzzy
+msgid "User_name:"
+msgstr "No d' _uzeu:"
 
-#: my-evolution/Locations.h:2199
-msgid "Taegu Ab"
-msgstr ""
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
+msgid "_Path:"
+msgstr "_Tchimin:"
 
-#: my-evolution/Locations.h:2200
-msgid "Taejon"
+#: mail/mail-autofilter.c:74
+#, c-format
+msgid "Mail to %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2201
-msgid "Tahoe Valley"
+#: mail/mail-autofilter.c:238
+#, c-format
+msgid "Subject is %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2202
-msgid "Taichung"
+#: mail/mail-autofilter.c:254
+#, c-format
+msgid "Mail from %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2203
-msgid "Taif"
+#: mail/mail-autofilter.c:271
+#, c-format
+msgid "%s mailing list"
 msgstr ""
 
-#: my-evolution/Locations.h:2204
-msgid "Tainan"
+#: mail/mail-autofilter.c:326
+msgid "Add Filter Rule"
 msgstr ""
 
-#: my-evolution/Locations.h:2206
-msgid "Taiyuan"
-msgstr ""
+#: mail/mail-component.c:459
+#, fuzzy, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "Disfacé"
+msgstr[1] "Disfacé"
 
-#: my-evolution/Locations.h:2207
-msgid "Taiz"
-msgstr ""
+#: mail/mail-component.c:461
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2208
-msgid "Tajima"
-msgstr ""
+#: mail/mail-component.c:484
+#, fuzzy, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Brouyon"
+msgstr[1] "Brouyon"
 
-#: my-evolution/Locations.h:2209
-msgid "Takamatsu Airport"
-msgstr ""
+#: mail/mail-component.c:486
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2210
-msgid "Talara"
-msgstr ""
+#: mail/mail-component.c:488
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2211
-msgid "Talinn"
-msgstr ""
+#: mail/mail-component.c:492
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2212
-msgid "Talkeetna"
-msgstr ""
+#: mail/mail-component.c:494
+#, c-format
+msgid ", %d unread"
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2213
-msgid "Tallahassee"
+#: mail/mail-component.c:661
+msgid "New Mail Message"
 msgstr ""
 
-#: my-evolution/Locations.h:2214
-msgid "Tamanrasset"
+#: mail/mail-component.c:662
+msgid "_Mail Message"
 msgstr ""
 
-#: my-evolution/Locations.h:2215
-msgid "Tamanrasset/Aguenna"
+#: mail/mail-component.c:663
+msgid "Compose a new mail message"
 msgstr ""
 
-#: my-evolution/Locations.h:2216
-msgid "Tampa"
-msgstr ""
+#: mail/mail-component.c:669
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "_Novea ridant"
 
-#: my-evolution/Locations.h:2217
-msgid "Tampa-Macdill AFB"
-msgstr ""
+#: mail/mail-component.c:670
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "_Ridant"
 
-#: my-evolution/Locations.h:2218
-msgid "Tampere"
-msgstr ""
+#: mail/mail-component.c:671
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Fé on novea ridant"
 
-#: my-evolution/Locations.h:2219
-msgid "Tampico"
+#: mail/mail-component.c:803
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: my-evolution/Locations.h:2220
-msgid "Tanana"
-msgstr ""
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
+msgid "Identity"
+msgstr "Idintité"
 
-#: my-evolution/Locations.h:2221
-msgid "Tanegashima Airport"
+#: mail/mail-config-druid.c:364
+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 ""
 
-#: my-evolution/Locations.h:2222
-msgid "Taos"
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config.glade.h:119
+msgid "Receiving Mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2223
-msgid "Taoyuan"
+#: mail/mail-config-druid.c:372
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: my-evolution/Locations.h:2224
-msgid "Tapachula"
+#: mail/mail-config-druid.c:379
+msgid "Please select among the following options"
 msgstr ""
 
-#: my-evolution/Locations.h:2225
-msgid "Taranto"
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
+msgid "Sending Mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2226
-msgid "Tarbes"
+#: mail/mail-config-druid.c:384
+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 ""
 
-#: my-evolution/Locations.h:2227
-msgid "Tarija"
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
+msgid "Account Management"
 msgstr ""
 
-#: my-evolution/Locations.h:2228
-msgid "Tarvisio"
+#: mail/mail-config-druid.c:391
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
-#: my-evolution/Locations.h:2229
-msgid "Tatalina"
+#: mail/mail-config.c:895
+msgid "Checking Service"
 msgstr ""
 
-#: my-evolution/Locations.h:2230
-msgid "Tateyama Ab"
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
 msgstr ""
 
-#: my-evolution/Locations.h:2231
-msgid "Taunton"
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
 msgstr ""
 
-#: my-evolution/Locations.h:2232
-msgid "Tebessa"
+#: mail/mail-config.glade.h:2
+msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: my-evolution/Locations.h:2233
-msgid "Tees-Side"
+#: mail/mail-config.glade.h:5
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:2234
-msgid "Tegucigalpa"
+#: mail/mail-config.glade.h:6
+msgid "<b>S_ignatures</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:2235
-msgid "Tehran-Mehrabad"
-msgstr ""
+#: mail/mail-config.glade.h:7
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Lingaedje"
 
-#: my-evolution/Locations.h:2236
-msgid "Tela"
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
-#: my-evolution/Locations.h:2237
-msgid "Temple"
+#: mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2238
-msgid "Tennessee"
-msgstr "Tennessee"
-
-#: my-evolution/Locations.h:2239
-msgid "Tepic"
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2240
-msgid "Teresina"
+#: mail/mail-config.glade.h:11
+msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2241
-msgid "Terre Haute"
+#: mail/mail-config.glade.h:12
+msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2242
-msgid "Terrell"
+#: mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2243
-msgid "Teterboro"
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2244
-msgid "Texarkana"
+#: mail/mail-config.glade.h:15
+msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2245
-msgid "Texas"
-msgstr "Texas"
-
-#: my-evolution/Locations.h:2246
-msgid "The Dalles"
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2247
-msgid "Thessaloniki"
+#: mail/mail-config.glade.h:17
+msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2248
-msgid "Thief River Falls"
+#: mail/mail-config.glade.h:18
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2249
-msgid "Thiruvananthapuram"
+#: mail/mail-config.glade.h:19
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2250
-msgid "Thisted"
+#: mail/mail-config.glade.h:20
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2251
-msgid "Thompson Falls"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2252
-msgid "Thumrait"
+#: mail/mail-config.glade.h:22
+msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2253
-msgid "Tianjin"
+#: mail/mail-config.glade.h:23
+msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2254
-msgid "Tijuana"
+#: mail/mail-config.glade.h:24
+msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2255
-msgid "Timisoara"
+#: mail/mail-config.glade.h:25
+msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2256
-msgid "Tin City"
+#: mail/mail-config.glade.h:26
+msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2257
-msgid "Tirana"
+#: mail/mail-config.glade.h:27
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2258
-msgid "Tiree"
+#: mail/mail-config.glade.h:28
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2259
-msgid "Tirgu Mures"
+#: mail/mail-config.glade.h:29
+msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2260
-msgid "Tiruchchirapalli"
+#: mail/mail-config.glade.h:30
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2261
-msgid "Titusville"
+#: mail/mail-config.glade.h:31
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2262
-msgid "Tivat"
+#: mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2263
-msgid "Tlemcen Zenata"
+#: mail/mail-config.glade.h:33
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2264
-msgid "Tobias Bolanos"
+#: mail/mail-config.glade.h:34
+msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2265
-msgid "Tocumen"
+#: mail/mail-config.glade.h:35
+msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2266
-msgid "Togiak Village"
-msgstr ""
+#: mail/mail-config.glade.h:36
+#, fuzzy
+msgid "Account Editor"
+msgstr "Conte"
 
-#: my-evolution/Locations.h:2267
-msgid "Tokachi GSDF"
+#: mail/mail-config.glade.h:38
+msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: my-evolution/Locations.h:2268
-msgid "Tokunoshima Island"
+#: mail/mail-config.glade.h:39
+msgid "Add _Script"
 msgstr ""
 
-#: my-evolution/Locations.h:2269
-msgid "Tokushima Ab"
+#: mail/mail-config.glade.h:40
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2270
-msgid "Tokyo Heliport"
+#: mail/mail-config.glade.h:41
+msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: my-evolution/Locations.h:2271
-msgid "Tokyo International Airport"
+#: mail/mail-config.glade.h:43
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: my-evolution/Locations.h:2272
-msgid "Tokyo New International Airport"
+#: mail/mail-config.glade.h:44
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: my-evolution/Locations.h:2273
-msgid "Toledo"
+#: mail/mail-config.glade.h:45
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: my-evolution/Locations.h:2274
-msgid "Toluca"
+#: mail/mail-config.glade.h:46
+msgid "Attach original message"
 msgstr ""
 
-#: my-evolution/Locations.h:2275
-msgid "Tonopah"
-msgstr ""
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Ataetchmint"
 
-#: my-evolution/Locations.h:2276
-msgid "Topeka"
+#: mail/mail-config.glade.h:48
+msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: my-evolution/Locations.h:2277
-msgid "Topeka-Forbes Field"
+#: mail/mail-config.glade.h:49
+msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: my-evolution/Locations.h:2278
-msgid "Torino/Bric Della Croce"
+#: mail/mail-config.glade.h:50
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: my-evolution/Locations.h:2279
-msgid "Torino/Caselle"
+#: mail/mail-config.glade.h:51
+msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: my-evolution/Locations.h:2280
-msgid "Toronto"
+#: mail/mail-config.glade.h:52
+msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: my-evolution/Locations.h:2281
-msgid "Torp"
+#: mail/mail-config.glade.h:53
+msgid "C_haracter set:"
 msgstr ""
 
-#: my-evolution/Locations.h:2282
-msgid "Torrance"
+#: mail/mail-config.glade.h:54
+msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: my-evolution/Locations.h:2283
-msgid "Torreon"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: my-evolution/Locations.h:2284
-msgid "Tottori Airport"
+#: mail/mail-config.glade.h:56
+msgid "Check spelling while I _type"
 msgstr ""
 
-#: my-evolution/Locations.h:2285
-msgid "Toulouse"
+#: mail/mail-config.glade.h:57
+msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: my-evolution/Locations.h:2286
-msgid "Toul-Rosieres"
+#: mail/mail-config.glade.h:58
+msgid "Color for _misspelled words:"
 msgstr ""
 
-#: my-evolution/Locations.h:2287
-msgid "Tours-St-Symphorien"
-msgstr ""
+#: mail/mail-config.glade.h:59
+#, fuzzy
+msgid "Colors"
+msgstr "Comores"
 
-#: my-evolution/Locations.h:2288
-msgid "Toussus-Le Noble"
+#: mail/mail-config.glade.h:60
+msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: my-evolution/Locations.h:2289
-msgid "Townsville"
+#: mail/mail-config.glade.h:61
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
 
-#: my-evolution/Locations.h:2290
-msgid "Toyama Airport"
+#: mail/mail-config.glade.h:67
+msgid "De_fault"
 msgstr ""
 
-#: my-evolution/Locations.h:2291
-msgid "Trabzon"
+#: mail/mail-config.glade.h:69
+msgid "Default character e_ncoding:"
 msgstr ""
 
-#: my-evolution/Locations.h:2292
-msgid "Trapani"
-msgstr "Trapani"
+#: mail/mail-config.glade.h:70
+msgid "Defaults"
+msgstr "Prémetowès valixhances"
 
-#: my-evolution/Locations.h:2293
-msgid "Traverse City"
+#: mail/mail-config.glade.h:72
+msgid "Do not quote original message"
 msgstr ""
 
-#: my-evolution/Locations.h:2294
-msgid "Trelew"
+#: mail/mail-config.glade.h:73
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: my-evolution/Locations.h:2295
-msgid "Trenton"
-msgstr ""
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
+msgid "Done"
+msgstr "Fwait"
 
-#: my-evolution/Locations.h:2296
-msgid "Trevico"
-msgstr ""
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "_Ridant"
 
-#: my-evolution/Locations.h:2297
-msgid "Treviso/Istrana"
-msgstr ""
+#: mail/mail-config.glade.h:77
+#, fuzzy
+msgid "Email Accounts"
+msgstr "Conte"
 
-#: my-evolution/Locations.h:2298
-msgid "Treviso/S.Angelo"
-msgstr ""
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Email _Address:"
+msgstr "Adresse _emile:"
 
-#: my-evolution/Locations.h:2299
-msgid "Trieste"
+#: mail/mail-config.glade.h:79
+msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: my-evolution/Locations.h:2300
-msgid "Trinidad"
+#: mail/mail-config.glade.h:80
+msgid "Encry_ption certificate:"
 msgstr ""
 
-#: my-evolution/Locations.h:2301
-msgid "Tripoli"
+#: mail/mail-config.glade.h:81
+msgid "Evolution Account Assistant"
 msgstr ""
 
-#: my-evolution/Locations.h:2302
-msgid "Tromso/Langnes"
+#: mail/mail-config.glade.h:82
+msgid "Execute Command..."
 msgstr ""
 
-#: my-evolution/Locations.h:2303
-msgid "Trondheim/Vaernes"
+#: mail/mail-config.glade.h:83
+msgid "Fi_xed-width:"
 msgstr ""
 
-#: my-evolution/Locations.h:2304
-msgid "Troutdale"
-msgstr ""
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Font Properties"
+msgstr "Prôpietés"
 
-#: my-evolution/Locations.h:2305
-msgid "Troyes/Barberey"
+#: mail/mail-config.glade.h:85
+msgid "Format messages in _HTML"
 msgstr ""
 
-#: my-evolution/Locations.h:2306
-msgid "Truckee"
-msgstr ""
+#: mail/mail-config.glade.h:87
+#, fuzzy
+msgid "HTML Mail"
+msgstr "Emile"
 
-#: my-evolution/Locations.h:2307
-msgid "Truth or Consequences"
-msgstr ""
+#: mail/mail-config.glade.h:88
+#, fuzzy
+msgid "Headers"
+msgstr "Tiestire"
 
-#: my-evolution/Locations.h:2308
-msgid "Tsuiki Ab"
+#: mail/mail-config.glade.h:89
+msgid "Highlight _quotations with"
 msgstr ""
 
-#: my-evolution/Locations.h:2309
-msgid "Tsushima Airport"
+#: mail/mail-config.glade.h:90
+msgid "IMAPv4 "
 msgstr ""
 
-#: my-evolution/Locations.h:2310
-msgid "Tucson"
+#: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
 msgstr ""
 
-#: my-evolution/Locations.h:2311
-msgid "Tucson-Davis AFB"
+#: mail/mail-config.glade.h:94
+msgid "Inline"
 msgstr ""
 
-#: my-evolution/Locations.h:2312
-msgid "Tucuman"
+#: mail/mail-config.glade.h:96
+msgid "Kerberos "
 msgstr ""
 
-#: my-evolution/Locations.h:2313
-msgid "Tucumcari"
-msgstr ""
+#: mail/mail-config.glade.h:98
+msgid "Mail Configuration"
+msgstr "Apontiaedje di l' emilaedje"
 
-#: my-evolution/Locations.h:2314
-msgid "Tucurui"
+#: mail/mail-config.glade.h:100
+msgid "Mailbox location"
 msgstr ""
 
-#: my-evolution/Locations.h:2315
-msgid "Tulancingo"
-msgstr ""
+#: mail/mail-config.glade.h:101
+#, fuzzy
+msgid "Message Composer"
+msgstr "Messaedjes"
 
-#: my-evolution/Locations.h:2316
-msgid "Tulcea"
+#: mail/mail-config.glade.h:104
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
-#: my-evolution/Locations.h:2317
-msgid "Tulsa"
-msgstr ""
+#: mail/mail-config.glade.h:105
+#, fuzzy
+msgid "Or_ganization:"
+msgstr "Organizåcion"
 
-#: my-evolution/Locations.h:2318
-msgid "Tupelo"
+#: mail/mail-config.glade.h:106
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: my-evolution/Locations.h:2319
-msgid "Turaif"
+#: mail/mail-config.glade.h:111
+msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: my-evolution/Locations.h:2320
-msgid "Turin"
+#: mail/mail-config.glade.h:112
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: my-evolution/Locations.h:2322
-msgid "Turku"
+#: mail/mail-config.glade.h:113
+msgid "Qmail maildir "
 msgstr ""
 
-#: my-evolution/Locations.h:2323
-msgid "Tuscaloosa"
+#: mail/mail-config.glade.h:114
+msgid "Quote original message"
 msgstr ""
 
-#: my-evolution/Locations.h:2324
-msgid "Tuxtla Gutierrez"
+#: mail/mail-config.glade.h:115
+msgid "Quoted"
 msgstr ""
 
-#: my-evolution/Locations.h:2325
-msgid "Twenthe"
-msgstr ""
+#: mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Re_member password"
+msgstr "Si rmimbrer di ci scret chal"
 
-#: my-evolution/Locations.h:2326
-msgid "Twentynine Palms"
-msgstr ""
+#: mail/mail-config.glade.h:117
+#, fuzzy
+msgid "Re_ply-To:"
+msgstr "Responde a:"
 
-#: my-evolution/Locations.h:2327
-msgid "Twin Falls"
+#: mail/mail-config.glade.h:118
+msgid "Receiving Email"
 msgstr ""
 
-#: my-evolution/Locations.h:2328
-msgid "Tyler"
+#: mail/mail-config.glade.h:120
+msgid "Receiving Options"
 msgstr ""
 
-#: my-evolution/Locations.h:2329
-msgid "Tyndall AFB"
-msgstr ""
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Remember _password"
+msgstr "Si rmimbrer di ci scret chal"
 
-#: my-evolution/Locations.h:2330
-msgid "Tyumen"
+#: mail/mail-config.glade.h:123
+msgid "S_tandard Font:"
 msgstr ""
 
-#: my-evolution/Locations.h:2331
-msgid "Uberaba"
-msgstr ""
+#: mail/mail-config.glade.h:124
+msgid "Security"
+msgstr "Såvrité"
 
-#: my-evolution/Locations.h:2332
-msgid "Ufa"
+#: mail/mail-config.glade.h:125
+msgid "Select HTML fixed width font"
 msgstr ""
 
-#: my-evolution/Locations.h:2333
-msgid "Ukiah"
+#: mail/mail-config.glade.h:126
+msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: my-evolution/Locations.h:2335
-msgid "Ulan-Ude"
+#: mail/mail-config.glade.h:127
+msgid "Select HTML variable width font"
 msgstr ""
 
-#: my-evolution/Locations.h:2336
-msgid "Ulsan"
+#: mail/mail-config.glade.h:128
+msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: my-evolution/Locations.h:2337
-msgid "Ulyanovsk"
-msgstr ""
+#: mail/mail-config.glade.h:129
+#, fuzzy
+msgid "Select..."
+msgstr "Tchuze:"
 
-#: my-evolution/Locations.h:2338
-msgid "Umea"
+#: mail/mail-config.glade.h:130
+msgid "Sending Email"
 msgstr ""
 
-#: my-evolution/Locations.h:2339
-msgid "Umiat"
+#: mail/mail-config.glade.h:133
+msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: my-evolution/Locations.h:2340
-msgid "Unalakleet"
+#: mail/mail-config.glade.h:134
+msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: my-evolution/Locations.h:2341
-msgid "United Arab Emirates "
+#: mail/mail-config.glade.h:135
+msgid "Server _Type: "
 msgstr ""
 
-#: my-evolution/Locations.h:2344
-msgid "Unst"
+#: mail/mail-config.glade.h:136
+msgid "Si_gning certificate:"
 msgstr ""
 
-#: my-evolution/Locations.h:2345
-msgid "Upington"
-msgstr ""
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "Singapour"
 
-#: my-evolution/Locations.h:2346
-msgid "Uruapan"
-msgstr ""
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "Signatures"
+msgstr "Singapour"
 
-#: my-evolution/Locations.h:2347
-msgid "Uruguaiana"
+#: mail/mail-config.glade.h:139
+msgid "Specify _filename:"
 msgstr ""
 
-#: my-evolution/Locations.h:2349
-msgid "Urumqi"
+#: mail/mail-config.glade.h:140
+msgid "Spell Checking"
 msgstr ""
 
-#: my-evolution/Locations.h:2350
-msgid "Utah"
-msgstr "Utah"
-
-#: my-evolution/Locations.h:2351
-msgid "Utica"
+#: mail/mail-config.glade.h:141
+msgid "Standard Unix mbox"
 msgstr ""
 
-#: my-evolution/Locations.h:2352
-msgid "Utrecht/Soesterberg"
+#: mail/mail-config.glade.h:142
+msgid "T_erminal Font:"
 msgstr ""
 
-#: my-evolution/Locations.h:2353
-msgid "Utsunomiya Ab"
-msgstr ""
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "T_ype: "
+msgstr "Sôre:"
 
-#: my-evolution/Locations.h:2354
-msgid "Uzhgorod"
+#: mail/mail-config.glade.h:144
+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 ""
 
-#: my-evolution/Locations.h:2355
-msgid "Vadso"
+#: mail/mail-config.glade.h:147
+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 ""
 
-#: my-evolution/Locations.h:2356
-msgid "Vaerlose"
+#: mail/mail-config.glade.h:149
+msgid ""
+"Type the name by which you would like to refer to this account.\n"
+"For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: my-evolution/Locations.h:2357
-msgid "Vagar"
-msgstr ""
+#: mail/mail-config.glade.h:152
+#, fuzzy
+msgid "V_ariable-width:"
+msgstr "Variåve"
 
-#: my-evolution/Locations.h:2358
-msgid "Valdez 2"
+#: mail/mail-config.glade.h:153
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin. "
 msgstr ""
 
-#: my-evolution/Locations.h:2359
-msgid "Valdosta"
+#: mail/mail-config.glade.h:158
+msgid "_Add Signature"
 msgstr ""
 
-#: my-evolution/Locations.h:2360
-msgid "Valdosta-Moody AFB"
+#: mail/mail-config.glade.h:159
+msgid "_Always load images from the Internet"
 msgstr ""
 
-#: my-evolution/Locations.h:2361
-msgid "Valencia"
+#: mail/mail-config.glade.h:160
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: my-evolution/Locations.h:2362
-msgid "Valentine"
+#: mail/mail-config.glade.h:161
+msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: my-evolution/Locations.h:2363
-msgid "Valera*"
-msgstr ""
+#: mail/mail-config.glade.h:163
+#, fuzzy
+msgid "_Enable"
+msgstr "Mete en alaedje"
 
-#: my-evolution/Locations.h:2364
-msgid "Valkenburg"
+#: mail/mail-config.glade.h:164
+msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: my-evolution/Locations.h:2365
-msgid "Valley"
-msgstr ""
+#: mail/mail-config.glade.h:165
+#, fuzzy
+msgid "_Forward style:"
+msgstr "En _avant"
 
-#: my-evolution/Locations.h:2366
-msgid "Valparaiso"
+#: mail/mail-config.glade.h:168
+msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: my-evolution/Locations.h:2367
-msgid "Valparaiso-Eglin AFB"
+#: mail/mail-config.glade.h:169
+msgid "_Make this my default account"
 msgstr ""
 
-#: my-evolution/Locations.h:2368
-msgid "Van"
+#: mail/mail-config.glade.h:170
+msgid "_Mark messages as read after"
 msgstr ""
 
-#: my-evolution/Locations.h:2369
-msgid "Vancouver"
+#: mail/mail-config.glade.h:172
+msgid "_Never load images from the Internet"
 msgstr ""
 
-#: my-evolution/Locations.h:2370
-msgid "Vandel"
+#: mail/mail-config.glade.h:174
+msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: my-evolution/Locations.h:2371
-msgid "Vandenberg AFB"
+#: mail/mail-config.glade.h:175
+msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: my-evolution/Locations.h:2372
-msgid "Vandenberg Range"
+#: mail/mail-config.glade.h:176
+msgid "_Reply style:"
 msgstr ""
 
-#: my-evolution/Locations.h:2373
-msgid "Van Nuys"
-msgstr ""
+#: mail/mail-config.glade.h:177
+#, fuzzy
+msgid "_Script:"
+msgstr "Såvrité"
 
-#: my-evolution/Locations.h:2374
-msgid "Varadero"
+#: mail/mail-config.glade.h:178
+msgid "_Show animated images"
 msgstr ""
 
-#: my-evolution/Locations.h:2375
-msgid "Varanasi/Babatpur"
+#: mail/mail-config.glade.h:179
+msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: my-evolution/Locations.h:2376
-msgid "Varna"
+#: mail/mail-config.glade.h:180
+msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: my-evolution/Locations.h:2377
-msgid "Vasteras"
-msgstr ""
+#: mail/mail-config.glade.h:181
+#, fuzzy
+msgid "color"
+msgstr "Colorado"
 
-#: my-evolution/Locations.h:2378
-msgid "Vaxjo"
-msgstr ""
+#: mail/mail-config.glade.h:182
+msgid "description"
+msgstr "discrijhaedje"
 
-#: my-evolution/Locations.h:2379
-msgid "Venezia"
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
 msgstr ""
 
-#: my-evolution/Locations.h:2381
-msgid "Venice"
+#: mail/mail-dialogs.glade.h:7
+msgid "<b>vFolder Sources</b>"
 msgstr ""
 
-#: my-evolution/Locations.h:2382
-msgid "Veracruz"
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2383
-msgid "Vermillion"
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:2384
-msgid "Vermont"
-msgstr "Vermont"
-
-#: my-evolution/Locations.h:2385
-msgid "Vernal"
-msgstr ""
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Accepter"
 
-#: my-evolution/Locations.h:2386
-msgid "Vero Beach"
-msgstr ""
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+#, fuzzy
+msgid "C_ompleted"
+msgstr "Tot fwait"
 
-#: my-evolution/Locations.h:2387
-msgid "Vicenza"
-msgstr "Vicenza"
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Grandès <> ptitès letes"
 
-#: my-evolution/Locations.h:2388
-msgid "Vichy-Charmeil"
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
 msgstr ""
 
-#: my-evolution/Locations.h:2389
-msgid "Vichy-Rolla"
-msgstr ""
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Trover:"
 
-#: my-evolution/Locations.h:2390
-msgid "Vicksburg"
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
 msgstr ""
 
-#: my-evolution/Locations.h:2391
-msgid "Victoria"
-msgstr ""
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "discrijhaedje"
 
-#: my-evolution/Locations.h:2393
-msgid "Vigo"
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
 msgstr ""
 
-#: my-evolution/Locations.h:2394
-msgid "Vilhena"
-msgstr ""
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "Tchoezi çu ki n' esteut _nén tchoezi"
 
-#: my-evolution/Locations.h:2395
-msgid "Villacoublay"
-msgstr ""
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "No do _sierveu:"
 
-#: my-evolution/Locations.h:2396
-msgid "Villafranca"
-msgstr ""
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Informåcions sol conte"
 
-#: my-evolution/Locations.h:2397
-msgid "Villahermosa"
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 
-#: my-evolution/Locations.h:2398
-msgid "Villamontes"
+#: mail/mail-dialogs.glade.h:25
+msgid "Tick this to accept the license agreement"
 msgstr ""
 
-#: my-evolution/Locations.h:2399
-msgid "Villa Reynolds"
-msgstr ""
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Date ki li bouye doet esse _fwaite:"
 
-#: my-evolution/Locations.h:2400
-msgid "Vilnius"
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
 msgstr ""
 
-#: my-evolution/Locations.h:2401
-msgid "Virginia"
-msgstr "Virdjineye"
-
-#: my-evolution/Locations.h:2402
-msgid "Virginia Beach"
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
 msgstr ""
 
-#: my-evolution/Locations.h:2403
-msgid "Virginia Tech Airport"
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
 msgstr ""
 
-#: my-evolution/Locations.h:2404
-msgid "Viru-Viru"
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
 msgstr ""
 
-#: my-evolution/Locations.h:2405
-msgid "Visalia"
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
 msgstr ""
 
-#: my-evolution/Locations.h:2406
-msgid "Visby"
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
 msgstr ""
 
-#: my-evolution/Locations.h:2407
-msgid "Viterbo"
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
 msgstr ""
 
-#: my-evolution/Locations.h:2408
-msgid "Vitoria"
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Nén valåbe"
 
-#: my-evolution/Locations.h:2409
-msgid "Vladikavkaz"
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: my-evolution/Locations.h:2410
-msgid "Vladivostok"
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
 
-#: my-evolution/Locations.h:2411
-msgid "Vlieland"
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: my-evolution/Locations.h:2412
-msgid "Vojens/Skrydstrup"
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: my-evolution/Locations.h:2413
-msgid "Volgograd"
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: my-evolution/Locations.h:2414
-msgid "Volkel"
-msgstr ""
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
+msgid "_Send"
+msgstr "Evoyî"
 
-#: my-evolution/Locations.h:2415
-msgid "Volk Field"
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+msgid "Are you sure you want to send a message without a subject?"
 msgstr ""
 
-#: my-evolution/Locations.h:2416
-msgid "Voronezh"
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
-#: my-evolution/Locations.h:2417
-msgid "Voslau"
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr ""
 
-#: my-evolution/Locations.h:2418
-msgid "Waco"
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: my-evolution/Locations.h:2419
-msgid "Wadi Al Dawasser Airport"
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: my-evolution/Locations.h:2420
-msgid "Wainwright"
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
-#: my-evolution/Locations.h:2421
-msgid "Wakefield"
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: my-evolution/Locations.h:2422
-msgid "Wakkanai Airport"
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
 
-#: my-evolution/Locations.h:2423
-msgid "Walla Walla"
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
 
-#: my-evolution/Locations.h:2424
-msgid "Wallops Island"
-msgstr ""
+#: mail/mail-errors.xml.h:41
+#, fuzzy
+msgid "Use _Default"
+msgstr "Prémetou"
 
-#: my-evolution/Locations.h:2425
-msgid "Walnut Ridge"
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
 
-#: my-evolution/Locations.h:2426
-msgid "Warner Robins"
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: my-evolution/Locations.h:2427
-msgid "Warroad"
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: my-evolution/Locations.h:2428
-msgid "Warszawa"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
 
-#: my-evolution/Locations.h:2429
-msgid "Washington"
-msgstr "Washington"
+#: mail/mail-errors.xml.h:51
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "_Vudî l' batch"
 
-#: my-evolution/Locations.h:2430
-msgid "Washington/Dulles"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: my-evolution/Locations.h:2431
-msgid "Waterbury"
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
-#: my-evolution/Locations.h:2432
-msgid "Waterloo"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: my-evolution/Locations.h:2433
-msgid "Watertown"
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 msgstr ""
 
-#: my-evolution/Locations.h:2434
-msgid "Waterville"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
 msgstr ""
 
-#: my-evolution/Locations.h:2435
-msgid "Waukesha"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: my-evolution/Locations.h:2436
-msgid "Wausau"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: my-evolution/Locations.h:2437
-msgid "Waycross"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: my-evolution/Locations.h:2438
-msgid "Waynesboro"
-msgstr ""
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+#, fuzzy
+msgid "Enter password."
+msgstr "Tapez li scret"
 
-#: my-evolution/Locations.h:2439
-msgid "Webster City"
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
 msgstr ""
 
-#: my-evolution/Locations.h:2440
-msgid "Wejh"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2441
-msgid "Wellington"
-msgstr ""
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:2442
-msgid "Wenatchee"
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: my-evolution/Locations.h:2443
-msgid "Wendover"
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: my-evolution/Locations.h:2444
-msgid "West Atlanta"
-msgstr ""
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "Li fitchî egzisteye dedja, el sipotchî?"
 
-#: my-evolution/Locations.h:2445
-msgid "West Burke"
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
 msgstr ""
 
-#: my-evolution/Locations.h:2446
-msgid "Westerland"
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2447
-msgid "Westfield"
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2448
-msgid "Westhampton"
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: my-evolution/Locations.h:2449
-msgid "West Palm Beach"
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2450
-msgid "West Virginia"
-msgstr "Virdjineye di l' ouwess"
-
-#: my-evolution/Locations.h:2451
-msgid "West Yellowstone"
-msgstr ""
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Disfacer"
 
-#: my-evolution/Locations.h:2452
-msgid "West Yellowstone (2)"
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: my-evolution/Locations.h:2453
-msgid "Wheeling"
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: my-evolution/Locations.h:2454
-msgid "Whidbey Island"
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2455
-msgid "Whitefield"
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
 
-#: my-evolution/Locations.h:2456
-msgid "White Plains"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2457
-msgid "White Sulphur"
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2458
-msgid "Whittier"
-msgstr ""
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:2459
-msgid "Wichita"
-msgstr ""
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:2460
-msgid "Wichita Falls"
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2461
-msgid "Wichita-Jabara"
-msgstr ""
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Fé on novea ridant"
 
-#: my-evolution/Locations.h:2462
-msgid "Wichita-McConnell AFB"
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Drovi on fitchî"
 
-#: my-evolution/Locations.h:2463
-msgid "Wick"
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
 
-#: my-evolution/Locations.h:2464
-msgid "Wien"
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: my-evolution/Locations.h:2465
-msgid "Wildwood"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: my-evolution/Locations.h:2466
-msgid "Wilkes - Barre"
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
 msgstr ""
 
-#: my-evolution/Locations.h:2467
-msgid "Williams Field"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: my-evolution/Locations.h:2468
-msgid "Williamsport"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: my-evolution/Locations.h:2469
-msgid "Williston"
-msgstr ""
+#: mail/mail-errors.xml.h:169
+#, fuzzy
+msgid "Don't delete"
+msgstr "_Disrafacer"
 
-#: my-evolution/Locations.h:2470
-msgid "Willoughby"
-msgstr ""
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Dji n' sai inicyî Bonobo"
 
-#: my-evolution/Locations.h:2471
-msgid "Willow Airport"
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2472
-msgid "Wilmington"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2473
-msgid "Winchester"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: my-evolution/Locations.h:2474
-msgid "Windsor"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: my-evolution/Locations.h:2475
-msgid "Windsor Locks"
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
 msgstr ""
+"%s egzisteye dedja\n"
+"El voloz spotchî?"
 
-#: my-evolution/Locations.h:2476
-msgid "Wink"
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: my-evolution/Locations.h:2477
-msgid "Winnemucca"
-msgstr ""
+#: mail/mail-errors.xml.h:184
+#, fuzzy
+msgid "_Discard changes"
+msgstr "_Håynaedje"
 
-#: my-evolution/Locations.h:2478
-msgid "Winnipeg"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr ""
 
-#: my-evolution/Locations.h:2479
-msgid "Winslow"
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: my-evolution/Locations.h:2480
-msgid "Winston-Salem"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2481
-msgid "Winter Haven"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: my-evolution/Locations.h:2482
-msgid "Winter Park"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: my-evolution/Locations.h:2483
-msgid "Wiscasset"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: my-evolution/Locations.h:2484
-msgid "Wisconsin"
-msgstr "Wisconsin"
-
-#: my-evolution/Locations.h:2485
-msgid "Wisconsin Rapids"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: my-evolution/Locations.h:2486
-msgid "Wise"
+#. mail:no-folder primary
+#: mail/mail-errors.xml.h:210
+msgid "Missing folder."
 msgstr ""
 
-#: my-evolution/Locations.h:2487
-msgid "Woensdrecht"
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
 msgstr ""
 
-#: my-evolution/Locations.h:2488
-msgid "Wolf Point"
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+msgid "You must name this vFolder."
 msgstr ""
 
-#: my-evolution/Locations.h:2489
-msgid "Woong Cheon"
-msgstr ""
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Tchoezi çu ki n' esteut _nén tchoezi"
 
-#: my-evolution/Locations.h:2490
-msgid "Wooster"
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
 msgstr ""
 
-#: my-evolution/Locations.h:2491
-msgid "Worcester"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:2492
-msgid "Worland"
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:226
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: my-evolution/Locations.h:2493
-msgid "Worthington"
+#: mail/mail-errors.xml.h:230
+msgid "Ignore"
 msgstr ""
 
-#: my-evolution/Locations.h:2494
-msgid "Wrangell"
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
 msgstr ""
 
-#: my-evolution/Locations.h:2495
-msgid "Wrightstown / Mcguire AFB"
-msgstr ""
+#: mail/mail-errors.xml.h:232
+#, fuzzy
+msgid "_Append"
+msgstr "_Drovi"
 
-#: my-evolution/Locations.h:2496
-msgid "Wuchia Observatory"
+#: mail/mail-folder-cache.c:785
+#, c-format
+msgid "Pinging %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2497
-msgid "Wyoming"
-msgstr "Wyoming"
-
-#: my-evolution/Locations.h:2498
-msgid "Xiamen"
+#: mail/mail-ops.c:98
+msgid "Filtering Folder"
 msgstr ""
 
-#: my-evolution/Locations.h:2499
-msgid "Yacuiba"
+#: mail/mail-ops.c:259
+msgid "Fetching Mail"
 msgstr ""
 
-#: my-evolution/Locations.h:2500
-msgid "Yakima"
+#: mail/mail-ops.c:542
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2501
-msgid "Yakushima"
+#: mail/mail-ops.c:567
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local `Sent' folder instead."
 msgstr ""
 
-#: my-evolution/Locations.h:2502
-msgid "Yakutat"
+#: mail/mail-ops.c:576
+#, c-format
+msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2503
-msgid "Yakutsk"
+#: mail/mail-ops.c:672
+#, c-format
+msgid "Sending message %d of %d"
 msgstr ""
 
-#: my-evolution/Locations.h:2504
-msgid "Yamagata Airport"
+#: mail/mail-ops.c:703
+#, c-format
+msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: my-evolution/Locations.h:2505
-msgid "Yamaguchi Ube Airport"
+#: mail/mail-ops.c:707
+msgid "Complete."
 msgstr ""
 
-#: my-evolution/Locations.h:2506
-msgid "Yankton"
+#: mail/mail-ops.c:804
+msgid "Saving message to folder"
 msgstr ""
 
-#: my-evolution/Locations.h:2507
-msgid "Yao Airport"
+#: mail/mail-ops.c:889
+#, c-format
+msgid "Moving messages to %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2508
-msgid "Yechon Ab"
+#: mail/mail-ops.c:889
+#, c-format
+msgid "Copying messages to %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2509
-msgid "Yekaterinburg"
+#: mail/mail-ops.c:1002
+#, c-format
+msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: my-evolution/Locations.h:2510
-msgid "Yellowknife"
+#: mail/mail-ops.c:1115
+msgid "Forwarded messages"
 msgstr ""
 
-#: my-evolution/Locations.h:2511
-msgid "Yellowstone"
+#: mail/mail-ops.c:1158
+#, c-format
+msgid "Opening folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2513
-msgid "Yenbo"
+#: mail/mail-ops.c:1230
+#, c-format
+msgid "Opening store %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2514
-msgid "Yeoju Range"
+#: mail/mail-ops.c:1308
+#, c-format
+msgid "Removing folder %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2515
-msgid "Yeonpyeungdo"
+#: mail/mail-ops.c:1402
+#, c-format
+msgid "Storing folder '%s'"
 msgstr ""
 
-#: my-evolution/Locations.h:2516
-msgid "Yeovilton"
+#: mail/mail-ops.c:1467
+#, c-format
+msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: my-evolution/Locations.h:2517
-msgid "Yokosuka Fwf"
+#: mail/mail-ops.c:1468
+#, c-format
+msgid "Storing account '%s'"
 msgstr ""
 
-#: my-evolution/Locations.h:2518
-msgid "Yokota Ab"
+#: mail/mail-ops.c:1523
+msgid "Refreshing folder"
 msgstr ""
 
-#: my-evolution/Locations.h:2519
-msgid "Yongsan/H-208 Hp"
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
+msgid "Expunging folder"
 msgstr ""
 
-#: my-evolution/Locations.h:2520
-msgid "Yoro"
+#: mail/mail-ops.c:1607
+#, c-format
+msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: my-evolution/Locations.h:2521
-msgid "Yosu"
+#: mail/mail-ops.c:1608
+msgid "Local Folders"
 msgstr ""
 
-#: my-evolution/Locations.h:2522
-msgid "Youngstown"
+#: mail/mail-ops.c:1691
+#, c-format
+msgid "Retrieving message %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2523
-msgid "Ypsilanti"
-msgstr ""
+#: mail/mail-ops.c:1763
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Messaedje nén léjhou shuvant"
+msgstr[1] "Messaedje nén léjhou shuvant"
 
-#: my-evolution/Locations.h:2525
-msgid "Yukon"
-msgstr ""
+#: mail/mail-ops.c:1849
+#, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: my-evolution/Locations.h:2526
-msgid "Yuma MCAS"
+#: mail/mail-ops.c:1899
+#, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2527
-msgid "Yurimaguas"
+#: mail/mail-ops.c:1927
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2528
-msgid "Yuzhno-Sakhalinsk"
+#: mail/mail-ops.c:1998
+msgid "Saving attachment"
 msgstr ""
 
-#: my-evolution/Locations.h:2529
-msgid "Zacatecas"
+#: mail/mail-ops.c:2010
+#, c-format
+msgid ""
+"Cannot create output file: %s:\n"
+" %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2530
-msgid "Zadar"
+#: mail/mail-ops.c:2020
+#, c-format
+msgid "Could not write data: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2531
-msgid "Zagreb"
+#: mail/mail-ops.c:2168
+#, c-format
+msgid "Disconnecting from %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2532
-msgid "Zakinthos"
+#: mail/mail-ops.c:2168
+#, c-format
+msgid "Reconnecting to %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2533
-msgid "Zama Airfield"
+#: mail/mail-send-recv.c:157
+msgid "Cancelling..."
 msgstr ""
 
-#: my-evolution/Locations.h:2534
-msgid "Zanesville"
+#: mail/mail-send-recv.c:264
+#, c-format
+msgid "Server: %s, Type: %s"
 msgstr ""
 
-#: my-evolution/Locations.h:2535
-msgid "Zaragoza"
-msgstr "Zaragoza"
-
-#: my-evolution/Locations.h:2536
-msgid "Zell Am See"
-msgstr "Zell Am See"
-
-#: my-evolution/Locations.h:2537
-msgid "Zuni Pueblo"
-msgstr "Zuni Pueblo"
-
-#: my-evolution/Locations.h:2538
-msgid "Zurich"
-msgstr "Zurich"
-
-#: my-evolution/component-factory.c:44
-msgid "Folder containing the Evolution Summary"
+#: mail/mail-send-recv.c:266
+#, c-format
+msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: my-evolution/component-factory.c:153
-msgid "Cannot initialize Evolution's Summary component."
+#: mail/mail-send-recv.c:268
+#, c-format
+msgid "Type: %s"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
-msgid "Appointments"
+#: mail/mail-send-recv.c:320
+msgid "Send & Receive Mail"
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:366
-msgid "No appointments"
-msgstr "Nou radjoû"
+#: mail/mail-send-recv.c:323
+#, fuzzy
+msgid "Cancel _All"
+msgstr "Rinoncî"
 
-#: my-evolution/e-summary-calendar.c:400
-msgid "%k:%M %d %B"
+#: mail/mail-send-recv.c:412
+msgid "Updating..."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:402
-msgid "%l:%M %d %B"
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
+msgid "Waiting..."
 msgstr ""
 
-#: my-evolution/e-summary-calendar.c:420
-msgid "No description"
+#: mail/mail-session.c:240
+msgid "User canceled operation."
 msgstr ""
 
-#: my-evolution/e-summary-mail.c:120
-msgid "Mail summary"
+#: mail/mail-session.c:274
+#, c-format
+msgid "Enter Password for %s"
 msgstr ""
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:82
-#: my-evolution/e-summary-weather.c:603
-msgid "KBOS"
-msgstr ""
+#: mail/mail-session.c:276
+msgid "Enter Password"
+msgstr "Tapez li scret"
 
-#: my-evolution/e-summary-preferences.c:453
-msgid "Dictionary.com Word of the Day"
+#: mail/mail-session.c:304
+msgid "_Remember this password"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:474
-msgid "Quotes of the Day"
+#: mail/mail-session.c:305
+msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:735
-msgid "Add a news feed"
+#: mail/mail-signature-editor.c:371
+msgid "Edit signature"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:743
-msgid "Enter the URL of the news feed you wish to add"
+#: mail/mail-signature-editor.c:411
+msgid "Enter a name for this signature."
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:747
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "No:"
 
-#: my-evolution/e-summary-preferences.c:1225
-msgid "Summary Settings"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:300
-msgid "Error downloading RDF"
-msgstr ""
-
-#: my-evolution/e-summary-rdf.c:444
-msgid "News Feed"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:251
-msgid "No tasks"
-msgstr ""
-
-#: my-evolution/e-summary-tasks.c:291
-msgid "(No Description)"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:71
-msgid "My Weather"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:279
-msgid "There was an error downloading data for"
-msgstr ""
-
-#: my-evolution/e-summary-weather.c:501
-msgid "Weather"
-msgstr ""
-
-#: my-evolution/e-summary.c:190
-msgid "%A, %B %e %Y"
-msgstr ""
-
-#: my-evolution/e-summary.c:475
-msgid "Please wait..."
-msgstr "Tårdjîz on po, s' i vs plait..."
-
-#: my-evolution/e-summary.c:566 ui/my-evolution.xml.h:3
-msgid "Print Summary"
-msgstr ""
-
-#: my-evolution/e-summary.c:612
-msgid "Printing of Summary failed"
-msgstr ""
-
-#: my-evolution/main.c:65
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr ""
-
-#: my-evolution/metar.c:29
-msgid " F"
-msgstr ""
-
-#: my-evolution/metar.c:29
-msgid " C"
-msgstr ""
-
-#: my-evolution/metar.c:33
-msgid "knots"
-msgstr "nouks"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr "km/h"
-
-#: my-evolution/metar.c:38
-msgid "inHg"
-msgstr ""
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr "mmHg"
-
-#: my-evolution/metar.c:41
-msgid "miles"
-msgstr "meyes"
-
-#: my-evolution/metar.c:41
-msgid "kilometers"
-msgstr "kilometes"
-
-#: my-evolution/metar.c:44
-msgid "Clear sky"
-msgstr ""
-
-#: my-evolution/metar.c:45
-msgid "Broken clouds"
-msgstr ""
-
-#: my-evolution/metar.c:46
-msgid "Scattered clouds"
-msgstr ""
-
-#: my-evolution/metar.c:47
-msgid "Few clouds"
-msgstr ""
-
-#: my-evolution/metar.c:48
-msgid "Overcast"
-msgstr ""
-
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
-msgid "Invalid"
-msgstr "Nén valåbe"
-
-#: my-evolution/metar.c:63
-msgid "Variable"
-msgstr "Variåve"
-
-#: my-evolution/metar.c:64
-msgid "North"
-msgstr "Nôr"
-
-#: my-evolution/metar.c:64
-msgid "North - NorthEast"
-msgstr "Nôr - Nôresse"
-
-#: my-evolution/metar.c:64
-msgid "Northeast"
-msgstr "Nôresse"
-
-#: my-evolution/metar.c:64
-msgid "East - NorthEast"
-msgstr "Esse - Nôresse"
-
-#: my-evolution/metar.c:65
-msgid "East"
-msgstr "Esse"
-
-#: my-evolution/metar.c:65
-msgid "East - Southeast"
-msgstr "Esse - Sudesse"
-
-#: my-evolution/metar.c:65
-msgid "Southeast"
-msgstr "Sudesse"
-
-#: my-evolution/metar.c:65
-msgid "South - Southeast"
-msgstr "Sud - Sudesse"
-
-#: my-evolution/metar.c:66
-msgid "South"
-msgstr "Sud"
-
-#: my-evolution/metar.c:66
-msgid "South - Southwest"
-msgstr "Sud - Sudouwesse"
-
-#: my-evolution/metar.c:66
-msgid "Southwest"
-msgstr "Sudouwesse"
-
-#: my-evolution/metar.c:66
-msgid "West - Southwest"
-msgstr "Ouwesse - Sudouwesse"
-
-#: my-evolution/metar.c:67
-msgid "West"
-msgstr "Ouwesse"
-
-#: my-evolution/metar.c:67
-msgid "West - Northwest"
-msgstr "Ouwesse - Nôrouwesse"
-
-#: my-evolution/metar.c:67
-msgid "Northwest"
-msgstr "Nôrouwesse"
-
-#: my-evolution/metar.c:67
-msgid "North - Northwest"
-msgstr "Nôr - Nôrouwesse"
-
-#. DRIZZLE
-#: my-evolution/metar.c:127
-msgid "Drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:128
-msgid "Drizzle in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:129
-msgid "Light drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:130
-msgid "Moderate drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:131
-msgid "Heavy drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:132
-msgid "Shallow drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:133
-msgid "Patches of drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:134
-msgid "Partial drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
-msgid "Thunderstorm"
-msgstr ""
-
-#: my-evolution/metar.c:136
-msgid "Windy drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:137
-msgid "Showers"
-msgstr ""
-
-#: my-evolution/metar.c:138
-msgid "Drifting drizzle"
-msgstr ""
-
-#: my-evolution/metar.c:139
-msgid "Freezing drizzle"
-msgstr ""
-
-#. RAIN
-#: my-evolution/metar.c:142
-msgid "Rain"
-msgstr "Plouve"
-
-#: my-evolution/metar.c:143
-msgid "Rain in the vicinity"
-msgstr "Plouve dins l' vijhnaedje"
-
-#: my-evolution/metar.c:144
-msgid "Light rain"
-msgstr ""
-
-#: my-evolution/metar.c:145
-msgid "Moderate rain"
-msgstr "Plovinaedje"
-
-#: my-evolution/metar.c:146
-msgid "Heavy rain"
-msgstr ""
-
-#: my-evolution/metar.c:147
-msgid "Shallow rain"
-msgstr ""
-
-#: my-evolution/metar.c:148
-msgid "Patches of rain"
-msgstr ""
-
-#: my-evolution/metar.c:149
-msgid "Partial rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:151
-msgid "Blowing rainfall"
-msgstr ""
-
-#: my-evolution/metar.c:152
-msgid "Rain showers"
-msgstr ""
-
-#: my-evolution/metar.c:153
-msgid "Drifting rain"
-msgstr ""
-
-#: my-evolution/metar.c:154
-msgid "Freezing rain"
-msgstr ""
-
-#. SNOW
-#: my-evolution/metar.c:157
-msgid "Snow"
-msgstr "Nive"
-
-#: my-evolution/metar.c:158
-msgid "Snow in the vicinity"
-msgstr "Nive dins l' vijhnaedje"
-
-#: my-evolution/metar.c:159
-msgid "Light snow"
-msgstr ""
-
-#: my-evolution/metar.c:160
-msgid "Moderate snow"
-msgstr "Nivtaedje"
-
-#: my-evolution/metar.c:161
-msgid "Heavy snow"
-msgstr ""
-
-#: my-evolution/metar.c:162
-msgid "Shallow snow"
-msgstr ""
-
-#: my-evolution/metar.c:163
-msgid "Patches of snow"
-msgstr ""
-
-#: my-evolution/metar.c:164
-msgid "Partial snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
-msgid "Snowstorm"
-msgstr "Timpesse di nive"
-
-#: my-evolution/metar.c:166
-msgid "Blowing snowfall"
-msgstr ""
-
-#: my-evolution/metar.c:167
-msgid "Snow showers"
-msgstr ""
-
-#: my-evolution/metar.c:168
-msgid "Drifting snow"
-msgstr ""
-
-#: my-evolution/metar.c:169
-msgid "Freezing snow"
-msgstr ""
-
-#. SNOW_GRAINS
-#: my-evolution/metar.c:172
-msgid "Snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:173
-msgid "Snow grains in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:174
-msgid "Light snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:175
-msgid "Moderate snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:176
-msgid "Heavy snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:177
-msgid "Shallow snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:178
-msgid "Patches of snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:179
-msgid "Partial snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:181
-msgid "Blowing snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:182
-msgid "Snow grain showers"
-msgstr ""
-
-#: my-evolution/metar.c:183
-msgid "Drifting snow grains"
-msgstr ""
-
-#: my-evolution/metar.c:184
-msgid "Freezing snow grains"
-msgstr ""
-
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:187
-msgid "Ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:188
-msgid "Ice crystals in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:189
-msgid "Few ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:190
-msgid "Moderate ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:191
-msgid "Heavy ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:193
-msgid "Patches of ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:194
-msgid "Partial ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:195
-msgid "Ice crystal storm"
-msgstr ""
-
-#: my-evolution/metar.c:196
-msgid "Blowing ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:197
-msgid "Showers of ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:198
-msgid "Drifting ice crystals"
-msgstr ""
-
-#: my-evolution/metar.c:199
-msgid "Freezing ice crystals"
-msgstr ""
-
-#. ICE_PELLETS
-#: my-evolution/metar.c:202
-msgid "Ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:203
-msgid "Ice pellets in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:204
-msgid "Few ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:205
-msgid "Moderate ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:206
-msgid "Heavy ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:207
-msgid "Shallow ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:208
-msgid "Patches of ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:209
-msgid "Partial ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:210
-msgid "Ice pellet storm"
-msgstr ""
-
-#: my-evolution/metar.c:211
-msgid "Blowing ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:212
-msgid "Showers of ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:213
-msgid "Drifting ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:214
-msgid "Freezing ice pellets"
-msgstr ""
-
-#: my-evolution/metar.c:218
-msgid "Hail in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
-msgid "Light hail"
-msgstr ""
-
-#: my-evolution/metar.c:220
-msgid "Moderate hail"
-msgstr ""
-
-#: my-evolution/metar.c:221
-msgid "Heavy hail"
-msgstr ""
-
-#: my-evolution/metar.c:222
-msgid "Shallow hail"
-msgstr ""
-
-#: my-evolution/metar.c:223
-msgid "Patches of hail"
-msgstr ""
-
-#: my-evolution/metar.c:224
-msgid "Partial hail"
-msgstr ""
-
-#: my-evolution/metar.c:225
-msgid "Hailstorm"
-msgstr ""
-
-#: my-evolution/metar.c:226
-msgid "Blowing hail"
-msgstr ""
-
-#: my-evolution/metar.c:227
-msgid "Hail showers"
-msgstr ""
-
-#: my-evolution/metar.c:228
-msgid "Drifting hail"
-msgstr ""
-
-#: my-evolution/metar.c:229
-msgid "Freezing hail"
-msgstr ""
-
-#. SMALL_HAIL
-#: my-evolution/metar.c:232
-msgid "Small hail"
-msgstr ""
-
-#: my-evolution/metar.c:233
-msgid "Small hail in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:235
-msgid "Moderate small hail"
-msgstr ""
-
-#: my-evolution/metar.c:236
-msgid "Heavy small hail"
-msgstr ""
-
-#: my-evolution/metar.c:237
-msgid "Shallow small hail"
-msgstr ""
-
-#: my-evolution/metar.c:238
-msgid "Patches of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:239
-msgid "Partial small hail"
-msgstr ""
-
-#: my-evolution/metar.c:240
-msgid "Small hailstorm"
-msgstr ""
-
-#: my-evolution/metar.c:241
-msgid "Blowing small hail"
-msgstr ""
-
-#: my-evolution/metar.c:242
-msgid "Showers of small hail"
-msgstr ""
-
-#: my-evolution/metar.c:243
-msgid "Drifting small hail"
-msgstr ""
-
-#: my-evolution/metar.c:244
-msgid "Freezing small hail"
-msgstr ""
-
-#. PRECIPITATION
-#: my-evolution/metar.c:247
-msgid "Unknown precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:248
-msgid "Precipitation in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:249
-msgid "Light precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:250
-msgid "Moderate precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:251
-msgid "Heavy precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:252
-msgid "Shallow precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:253
-msgid "Patches of precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:254
-msgid "Partial precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:255
-msgid "Unknown thunderstorm"
-msgstr ""
-
-#: my-evolution/metar.c:256
-msgid "Blowing precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:257
-msgid "Showers, type unknown"
-msgstr ""
-
-#: my-evolution/metar.c:258
-msgid "Drifting precipitation"
-msgstr ""
-
-#: my-evolution/metar.c:259
-msgid "Freezing precipitation"
-msgstr ""
-
-#. MIST
-#: my-evolution/metar.c:262
-msgid "Mist"
-msgstr ""
-
-#: my-evolution/metar.c:263
-msgid "Mist in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:264
-msgid "Light mist"
-msgstr ""
-
-#: my-evolution/metar.c:265
-msgid "Moderate mist"
-msgstr ""
-
-#: my-evolution/metar.c:266
-msgid "Thick mist"
-msgstr ""
-
-#: my-evolution/metar.c:267
-msgid "Shallow mist"
-msgstr ""
-
-#: my-evolution/metar.c:268
-msgid "Patches of mist"
-msgstr ""
-
-#: my-evolution/metar.c:269
-msgid "Partial mist"
-msgstr ""
-
-#: my-evolution/metar.c:271
-msgid "Mist with wind"
-msgstr ""
-
-#: my-evolution/metar.c:273
-msgid "Drifting mist"
-msgstr ""
-
-#: my-evolution/metar.c:274
-msgid "Freezing mist"
-msgstr ""
-
-#. FOG
-#: my-evolution/metar.c:277
-msgid "Fog"
-msgstr ""
-
-#: my-evolution/metar.c:278
-msgid "Fog in the vicinity"
-msgstr ""
-
-#: my-evolution/metar.c:279
-msgid "Light fog"
-msgstr ""
-
-#: my-evolution/metar.c:280
-msgid "Moderate fog"
-msgstr ""
-
-#: my-evolution/metar.c:281
-msgid "Thick fog"
-msgstr ""
-
-#: my-evolution/metar.c:282
-msgid "Shallow fog"
-msgstr ""
-
-#: my-evolution/metar.c:283
-msgid "Patches of fog"
-msgstr ""
-
-#: my-evolution/metar.c:284
-msgid "Partial fog"
-msgstr ""
-
-#: my-evolution/metar.c:286
-msgid "Fog with wind"
-msgstr ""
-
-#: my-evolution/metar.c:288
-msgid "Drifting fog"
-msgstr ""
-
-#: my-evolution/metar.c:289
-msgid "Freezing fog"
-msgstr ""
-
-#. SMOKE
-#: my-evolution/metar.c:292
-msgid "Smoke"
+#: mail/mail-tools.c:114
+#, c-format
+msgid "Could not create spool directory `%s': %s"
 msgstr ""
 
-#: my-evolution/metar.c:293
-msgid "Smoke in the vicinity"
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: my-evolution/metar.c:294
-msgid "Thin smoke"
+#: mail/mail-tools.c:276
+#, c-format
+msgid "Forwarded message - %s"
 msgstr ""
 
-#: my-evolution/metar.c:295
-msgid "Moderate smoke"
+#: mail/mail-tools.c:278
+msgid "Forwarded message"
 msgstr ""
 
-#: my-evolution/metar.c:296
-msgid "Thick smoke"
+#: mail/mail-tools.c:319
+#, c-format
+msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: my-evolution/metar.c:297
-msgid "Shallow smoke"
+#: mail/mail-vfolder.c:87
+#, c-format
+msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: my-evolution/metar.c:298
-msgid "Patches of smoke"
+#: mail/mail-vfolder.c:235
+#, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr ""
 
-#: my-evolution/metar.c:299
-msgid "Partial smoke"
+#: mail/mail-vfolder.c:242
+#, c-format
+msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: my-evolution/metar.c:300
-msgid "Thunderous smoke"
+#: mail/mail-vfolder.c:942
+msgid "vFolders"
 msgstr ""
 
-#: my-evolution/metar.c:301
-msgid "Smoke with wind"
+#: mail/mail-vfolder.c:981
+msgid "Edit VFolder"
 msgstr ""
 
-#: my-evolution/metar.c:303
-msgid "Drifting smoke"
+#: mail/mail-vfolder.c:1065
+msgid "New VFolder"
 msgstr ""
 
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:307
-msgid "Volcanic ash"
+#: mail/message-list.c:948
+msgid "Unseen"
 msgstr ""
 
-#: my-evolution/metar.c:308
-msgid "Volcanic ash in the vicinity"
-msgstr "Cindes di volcan dins l' vijhnaedje"
-
-#: my-evolution/metar.c:310
-msgid "Moderate volcanic ash"
+#: mail/message-list.c:949
+msgid "Seen"
 msgstr ""
 
-#: my-evolution/metar.c:311
-msgid "Thick volcanic ash"
+#: mail/message-list.c:950
+msgid "Answered"
 msgstr ""
 
-#: my-evolution/metar.c:312
-msgid "Shallow volcanic ash"
+#: mail/message-list.c:951
+msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: my-evolution/metar.c:313
-msgid "Patches of volcanic ash"
+#: mail/message-list.c:952
+msgid "Multiple Messages"
 msgstr ""
 
-#: my-evolution/metar.c:314
-msgid "Partial volcanic ash"
+#: mail/message-list.c:956
+msgid "Lowest"
 msgstr ""
 
-#: my-evolution/metar.c:315
-msgid "Thunderous volcanic ash"
+#: mail/message-list.c:957
+msgid "Lower"
 msgstr ""
 
-#: my-evolution/metar.c:316
-msgid "Blowing volcanic ash"
+#: mail/message-list.c:961
+msgid "Higher"
 msgstr ""
 
-#: my-evolution/metar.c:317
-msgid "Showers of volcanic ash"
+#: mail/message-list.c:962
+msgid "Highest"
 msgstr ""
 
-#: my-evolution/metar.c:318
-msgid "Drifting volcanic ash"
-msgstr ""
+#: mail/message-list.c:1285
+msgid "?"
+msgstr "?"
 
-#: my-evolution/metar.c:319
-msgid "Freezing volcanic ash"
+#: mail/message-list.c:1292
+msgid "Today %l:%M %p"
 msgstr ""
 
-#. SAND
-#: my-evolution/metar.c:322
-msgid "Sand"
-msgstr "Såvlon"
-
-#: my-evolution/metar.c:323
-msgid "Sand in the vicinity"
-msgstr "Såvlon dins l' vijhnaedje"
-
-#: my-evolution/metar.c:324
-msgid "Light sand"
+#: mail/message-list.c:1301
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: my-evolution/metar.c:325
-msgid "Moderate sand"
+#: mail/message-list.c:1313
+msgid "%a %l:%M %p"
 msgstr ""
 
-#: my-evolution/metar.c:326
-msgid "Heavy sand"
+#: mail/message-list.c:1321
+msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: my-evolution/metar.c:328
-msgid "Patches of sand"
+#: mail/message-list.c:1323
+msgid "%b %d %Y"
 msgstr ""
 
-#: my-evolution/metar.c:329
-msgid "Partial sand"
+#: mail/message-list.c:3324
+msgid "Generating message list"
 msgstr ""
 
-#: my-evolution/metar.c:331
-msgid "Blowing sand"
+#: mail/message-list.etspec.h:3
+msgid "Due By"
 msgstr ""
 
-#: my-evolution/metar.c:333
-msgid "Drifting sand"
+#: mail/message-list.etspec.h:4
+msgid "Flag Status"
 msgstr ""
 
-#. HAZE
-#: my-evolution/metar.c:337
-msgid "Haze"
+#: mail/message-list.etspec.h:5
+msgid "Flagged"
 msgstr ""
 
-#: my-evolution/metar.c:338
-msgid "Haze in the vicinity"
+#: mail/message-list.etspec.h:6
+msgid "Follow Up Flag"
 msgstr ""
 
-#: my-evolution/metar.c:339
-msgid "Light haze"
-msgstr ""
+#: mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Original Location"
+msgstr "Plaeçmint"
 
-#: my-evolution/metar.c:340
-msgid "Moderate haze"
+#: mail/message-list.etspec.h:9
+msgid "Received"
 msgstr ""
 
-#: my-evolution/metar.c:341
-msgid "Thick haze"
-msgstr ""
+#: mail/message-list.etspec.h:11
+msgid "Size"
+msgstr "Grandeu"
 
-#: my-evolution/metar.c:342
-msgid "Shallow haze"
-msgstr ""
+#: mail/message-tag-followup.c:73
+#, fuzzy
+msgid "Call"
+msgstr "Rinoncî"
 
-#: my-evolution/metar.c:343
-msgid "Patches of haze"
-msgstr ""
+#: mail/message-tag-followup.c:74
+#, fuzzy
+msgid "Do Not Forward"
+msgstr "En avant"
 
-#: my-evolution/metar.c:344
-msgid "Partial haze"
+#: mail/message-tag-followup.c:75
+msgid "Follow-Up"
 msgstr ""
 
-#: my-evolution/metar.c:346
-msgid "Haze with wind"
-msgstr ""
+#: mail/message-tag-followup.c:76
+#, fuzzy
+msgid "For Your Information"
+msgstr "Informåcions sol conte"
 
-#: my-evolution/metar.c:348
-msgid "Drifting haze"
-msgstr ""
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
+msgid "Forward"
+msgstr "En avant"
 
-#: my-evolution/metar.c:349
-msgid "Freezing haze"
+#: mail/message-tag-followup.c:78
+msgid "No Response Necessary"
 msgstr ""
 
-#. SPRAY
-#: my-evolution/metar.c:352
-msgid "Spray"
-msgstr ""
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
+msgid "Reply"
+msgstr "Responde"
 
-#: my-evolution/metar.c:353
-msgid "Spray in the vicinity"
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
+msgid "Reply to All"
 msgstr ""
 
-#: my-evolution/metar.c:354
-msgid "Light spray"
-msgstr ""
+#: mail/message-tag-followup.c:82
+#, fuzzy
+msgid "Review"
+msgstr "Vey divant"
 
-#: my-evolution/metar.c:355
-msgid "Moderate spray"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
 msgstr ""
 
-#: my-evolution/metar.c:356
-msgid "Heavy spray"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
 msgstr ""
 
-#: my-evolution/metar.c:357
-msgid "Shallow spray"
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
 msgstr ""
 
-#: my-evolution/metar.c:358
-msgid "Patches of spray"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
 msgstr ""
 
-#: my-evolution/metar.c:359
-msgid "Partial spray"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
 msgstr ""
 
-#: my-evolution/metar.c:361
-msgid "Blowing spray"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
 msgstr ""
 
-#: my-evolution/metar.c:363
-msgid "Drifting spray"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
 msgstr ""
 
-#: my-evolution/metar.c:364
-msgid "Freezing spray"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
 msgstr ""
 
-#. DUST
-#: my-evolution/metar.c:367
-msgid "Dust"
-msgstr "Poussire"
-
-#: my-evolution/metar.c:368
-msgid "Dust in the vicinity"
-msgstr "Poussire dins l' vijhnaedje"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution"
 
-#: my-evolution/metar.c:369
-msgid "Light dust"
-msgstr ""
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: my-evolution/metar.c:370
-msgid "Moderate dust"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
 msgstr ""
 
-#: my-evolution/metar.c:371
-msgid "Heavy dust"
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+msgid "480"
 msgstr ""
 
-#: my-evolution/metar.c:373
-msgid "Patches of dust"
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: my-evolution/metar.c:374
-msgid "Partial dust"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+#, fuzzy
+msgid "Default window height"
+msgstr "Prumiristé prémetowe:"
 
-#: my-evolution/metar.c:376
-msgid "Blowing dust"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+#, fuzzy
+msgid "Default window width"
+msgstr "Prumiristé prémetowe:"
 
-#: my-evolution/metar.c:378
-msgid "Drifting dust"
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+msgid "Evolution configuration version"
 msgstr ""
 
-#. SQUALL
-#: my-evolution/metar.c:382
-msgid "Squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
-#: my-evolution/metar.c:383
-msgid "Squall in the vicinity"
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
 
-#: my-evolution/metar.c:384
-msgid "Light squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
 
-#: my-evolution/metar.c:385
-msgid "Moderate squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
-#: my-evolution/metar.c:386
-msgid "Heavy squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
 msgstr ""
 
-#: my-evolution/metar.c:389
-msgid "Partial squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: my-evolution/metar.c:390
-msgid "Thunderous squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: my-evolution/metar.c:391
-msgid "Blowing squall"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: my-evolution/metar.c:393
-msgid "Drifting squall"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "mail"
+msgstr "Emile"
 
-#: my-evolution/metar.c:394
-msgid "Freezing squall"
+#: shell/e-active-connection-dialog.glade.h:1
+msgid "<b>Active Connections</b>"
 msgstr ""
 
-#. SANDSTORM
-#: my-evolution/metar.c:397
-msgid "Sandstorm"
-msgstr "Timpesse di såvlon"
-
-#: my-evolution/metar.c:398
-msgid "Sandstorm in the vicinity"
-msgstr "Timpesse di såvlon dins l' vijhnaedje"
-
-#: my-evolution/metar.c:399
-msgid "Light standstorm"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
 msgstr ""
 
-#: my-evolution/metar.c:400
-msgid "Moderate sandstorm"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
 msgstr ""
 
-#: my-evolution/metar.c:401
-msgid "Heavy sandstorm"
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+msgid "(Untitled)"
 msgstr ""
 
-#: my-evolution/metar.c:402
-msgid "Shallow sandstorm"
+#: shell/e-shell-importer.c:146
+msgid "Choose the type of importer to run:"
 msgstr ""
 
-#: my-evolution/metar.c:404
-msgid "Partial sandstorm"
+#: shell/e-shell-importer.c:149
+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 ""
 
-#: my-evolution/metar.c:405
-msgid "Thunderous sandstorm"
+#: shell/e-shell-importer.c:155
+msgid "Choose the destination for this import"
 msgstr ""
 
-#: my-evolution/metar.c:406
-msgid "Blowing sandstorm"
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+msgid "Please select the information that you would like to import:"
 msgstr ""
 
-#: my-evolution/metar.c:408
-msgid "Drifting sandstorm"
+#: shell/e-shell-importer.c:161
+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 ""
 
-#: my-evolution/metar.c:409
-msgid "Freezing sandstorm"
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
 msgstr ""
 
-#. DUSTSTORM
-#: my-evolution/metar.c:412
-msgid "Duststorm"
-msgstr "Timpesse di poussire"
-
-#: my-evolution/metar.c:413
-msgid "Duststorm in the vicinity"
-msgstr "Timpesse di poussire dins l' vijhnaedje"
-
-#: my-evolution/metar.c:414
-msgid "Light duststorm"
-msgstr ""
+#: shell/e-shell-importer.c:333
+#, fuzzy
+msgid "Select importer"
+msgstr "Tchoezi ridant"
 
-#: my-evolution/metar.c:415
-msgid "Moderate duststorm"
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#, c-format
+msgid "File %s does not exist"
 msgstr ""
 
-#: my-evolution/metar.c:416
-msgid "Heavy duststorm"
+#: shell/e-shell-importer.c:459
+msgid "Importing"
 msgstr ""
 
-#: my-evolution/metar.c:417
-msgid "Shallow duststorm"
-msgstr ""
+#: shell/e-shell-importer.c:467
+#, fuzzy, c-format
+msgid "Importing %s.\n"
+msgstr "Abaguer"
 
-#: my-evolution/metar.c:419
-msgid "Partial duststorm"
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#, c-format
+msgid "Error loading %s"
 msgstr ""
 
-#: my-evolution/metar.c:420
-msgid "Thunderous duststorm"
+#: shell/e-shell-importer.c:495
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
 msgstr ""
 
-#: my-evolution/metar.c:421
-msgid "Blowing duststorm"
-msgstr ""
+#: shell/e-shell-importer.c:570
+msgid "Automatic"
+msgstr "Otomatike"
 
-#: my-evolution/metar.c:423
-msgid "Drifting duststorm"
-msgstr ""
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "No d' fitchî:"
 
-#: my-evolution/metar.c:424
-msgid "Freezing duststorm"
-msgstr ""
+#: shell/e-shell-importer.c:631
+msgid "Select a file"
+msgstr "Tchoezi on fitchî"
 
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
-msgid "Funnel cloud"
-msgstr ""
+#: shell/e-shell-importer.c:642
+#, fuzzy
+msgid "File _type:"
+msgstr "Sôre di fitchî:"
 
-#: my-evolution/metar.c:428
-msgid "Funnel cloud in the vicinity"
+#: shell/e-shell-importer.c:681
+msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: my-evolution/metar.c:429
-msgid "Light funnel cloud"
+#: shell/e-shell-importer.c:684
+msgid "Import a _single file"
 msgstr ""
 
-#: my-evolution/metar.c:430
-msgid "Moderate funnel cloud"
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
 msgstr ""
 
-#: my-evolution/metar.c:431
-msgid "Thick funnel cloud"
+#: shell/e-shell-importer.c:756
+msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: my-evolution/metar.c:432
-msgid "Shallow funnel cloud"
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#, c-format
+msgid "From %s:"
 msgstr ""
 
-#: my-evolution/metar.c:433
-msgid "Patches of funnel clouds"
+#: shell/e-shell-importer.c:1073
+#, c-format
+msgid "No importer available for file %s"
 msgstr ""
 
-#: my-evolution/metar.c:434
-msgid "Partial funnel clouds"
+#: shell/e-shell-importer.c:1085
+msgid "Unable to execute importer"
 msgstr ""
 
-#: my-evolution/metar.c:436
-msgid "Funnel cloud w/ wind"
-msgstr ""
+#: shell/e-shell-importer.c:1199
+#, fuzzy
+msgid "_Import"
+msgstr "Abaguer"
 
-#: my-evolution/metar.c:438
-msgid "Drifting funnel cloud"
+#: shell/e-shell-offline-handler.c:594
+msgid "Closing connections..."
 msgstr ""
 
-#. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
-msgid "Tornado"
-msgstr ""
+#: shell/e-shell-settings-dialog.c:326
+#, fuzzy
+msgid "Evolution Settings"
+msgstr "Evolution"
 
-#: my-evolution/metar.c:443
-msgid "Tornado in the vicinity"
+#: shell/e-shell-startup-wizard.c:575
+msgid "Starting import"
 msgstr ""
 
-#: my-evolution/metar.c:445
-msgid "Moderate tornado"
+#: shell/e-shell-startup-wizard.c:795
+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/metar.c:446
-msgid "Raging tornado"
+#: shell/e-shell-utils.c:116
+msgid "No folder name specified."
 msgstr ""
 
-#: my-evolution/metar.c:449
-msgid "Partial tornado"
+#: shell/e-shell-utils.c:123
+msgid "Folder name cannot contain the Return character."
 msgstr ""
 
-#: my-evolution/metar.c:450
-msgid "Thunderous tornado"
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
 msgstr ""
 
-#: my-evolution/metar.c:453
-msgid "Drifting tornado"
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
 msgstr ""
 
-#: my-evolution/metar.c:454
-msgid "Freezing tornado"
+#: shell/e-shell-utils.c:141
+msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#. DUST_WHIRLS
-#: my-evolution/metar.c:457
-msgid "Dust whirls"
+#: shell/e-shell-window-commands.c:66
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: my-evolution/metar.c:458
-msgid "Dust whirls in the vicinity"
+#: shell/e-shell-window-commands.c:74
+#, c-format
+msgid "Error executing %s."
 msgstr ""
 
-#: my-evolution/metar.c:459
-msgid "Light dust whirls"
+#: shell/e-shell-window-commands.c:123
+msgid "Bug buddy is not installed."
 msgstr ""
 
-#: my-evolution/metar.c:460
-msgid "Moderate dust whirls"
+#: shell/e-shell-window-commands.c:131
+msgid "Bug buddy could not be run."
 msgstr ""
 
-#: my-evolution/metar.c:461
-msgid "Heavy dust whirls"
+#: shell/e-shell-window-commands.c:322
+msgid "Groupware Suite"
 msgstr ""
 
-#: my-evolution/metar.c:462
-msgid "Shallow dust whirls"
+#: shell/e-shell-window-commands.c:562
+msgid "_Work Online"
 msgstr ""
 
-#: my-evolution/metar.c:463
-msgid "Patches of dust whirls"
-msgstr ""
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
+msgid "_Work Offline"
+msgstr "Ovrer _foû raloyaedje"
 
-#: my-evolution/metar.c:464
-msgid "Partial dust whirls"
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
+msgid "Work Offline"
 msgstr ""
 
-#: my-evolution/metar.c:466
-msgid "Blowing dust whirls"
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: my-evolution/metar.c:468
-msgid "Drifting dust whirls"
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "Add n_ews feed"
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:2
-msgid "C_elsius"
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:4
-msgid "How many days should the calendar display at once?"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:5
-msgid "Ma_x number of items shown:"
-msgstr ""
+#: shell/e-shell.c:774
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Aroke nén cnoxhowe"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "News Feed Settings"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
-msgstr ""
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Aroke djenerike"
 
-#: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
-msgstr ""
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Novea"
 
-#: my-evolution/my-evolution.glade.h:11
-msgid "S_how full path for folders"
+#: shell/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
+#: shell/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
+#: shell/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
 msgstr ""
 
-#: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
-msgstr "Mostrer les timperateures e:"
-
-#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
-msgstr "Bouyes "
-
-#: my-evolution/my-evolution.glade.h:16
-msgid "Weather settings"
-msgstr "Apontiaedjes pol meteyo"
-
-#: my-evolution/my-evolution.glade.h:17
-msgid "_Fahrenheit"
-msgstr "_Fahrenheit"
-
-#: my-evolution/my-evolution.glade.h:18
-msgid "_Five days"
-msgstr "_Cénk djoûs"
-
-#: my-evolution/my-evolution.glade.h:19
-msgid "_Mail"
-msgstr "_Emile"
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Bénvnowe"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "_News Feeds"
+#: shell/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 ""
 
-#: my-evolution/my-evolution.glade.h:21
-msgid "_One day"
-msgstr "_On djoû"
-
-#: my-evolution/my-evolution.glade.h:22
-msgid "_Schedule"
+#: shell/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 ""
 
-#: my-evolution/my-evolution.glade.h:23
-msgid "_Weather"
-msgstr "_Meteyo"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Noû Djersey"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:3
-msgid "Factory for the Evolution notes component."
-msgstr ""
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "Sayî"
 
-#: notes/GNOME_Evolution_Notes.oaf.in.h:4
-msgid "Factory for the Notes control"
-msgstr ""
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "Fé on novea radjoû"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-msgid "The Evolution shell."
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
 
-#: shell/e-activity-handler.c:160
-msgid "Show Details"
-msgstr "Håyner spepieuzmint"
-
-#: shell/e-activity-handler.c:162
-msgid "Cancel Operation"
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Assistant"
 msgstr ""
 
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1052
-msgid "Inbox"
-msgstr "Messaedjes en intrêye"
-
-#: shell/e-local-storage.c:175
-msgid "Outbox"
-msgstr "Messaedjes e rexhowe"
-
-#: shell/e-local-storage.c:636
-msgid "Local Folders"
-msgstr ""
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Import File"
+msgstr "Fitchî d' intrêye"
 
-#: shell/e-setup.c:124
-msgid "Evolution installation"
-msgstr ""
+#: shell/importer/import.glade.h:4
+#, fuzzy
+msgid "Import Location"
+msgstr "Informåcion"
 
-#: shell/e-setup.c:128
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Importer Type"
+msgstr "Abaguer"
 
-#: shell/e-setup.c:129
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
+#: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers"
+msgstr "Tchoezi ridant"
 
-#: shell/e-setup.c:169
-msgid "Could not update files correctly"
-msgstr ""
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File"
+msgstr "Tchoezi on fitchî"
 
-#: shell/e-setup.c:192
-#, c-format
+#: shell/importer/import.glade.h:8
 msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
+"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 ""
 
-#: shell/e-setup.c:207
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
+#: shell/importer/intelligent.c:193
+msgid "Importers"
 msgstr ""
 
-#: shell/e-setup.c:280
-#, c-format
-msgid ""
-"Evolution could not create directory\n"
-"%s:\n"
-"%s"
-msgstr ""
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+msgid "Import"
+msgstr "Abaguer"
 
-#: shell/e-setup.c:298
-#, c-format
-msgid ""
-"Directory %s\n"
-"does not have the right permissions. Please make it\n"
-"readable and executable and restart Evolution."
+#: shell/importer/intelligent.c:199
+msgid "Don't import"
 msgstr ""
 
-#: shell/e-setup.c:304
-#, c-format
-msgid ""
-"File %s\n"
-"should be removed to allow Evolution to work correctly.\n"
-"Please remove this file and restart Evolution."
-msgstr ""
+#: shell/importer/intelligent.c:203
+msgid "Don't ask me again"
+msgstr "Nén dmander li côp ki vint"
 
-#: shell/e-setup.c:327
-#, 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."
+#: shell/importer/intelligent.c:211
+msgid "Evolution can import data from the following files:"
 msgstr ""
 
-#: shell/e-setup.c:341
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:225
+#, no-c-format
 msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/e-setup.c:366
-#, c-format
+#: shell/main.c:249
 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."
+"Thanks\n"
+"The Evolution Team\n"
 msgstr ""
 
-#: shell/e-shell-about-box.c:40
-msgid "Evolution "
-msgstr ""
-
-#: shell/e-shell-about-box.c:41
-msgid "Copyright 1999, 2000, 2001, 2002 Ximian, Inc."
-msgstr ""
-
-#: shell/e-shell-about-box.c:43
-msgid "Brought to you by"
-msgstr ""
+#: shell/main.c:256
+#, fuzzy
+msgid "Don't tell me again"
+msgstr "Nén dmander li côp ki vint"
 
-#: shell/e-shell-folder-commands.c:176
-msgid "Cannot move a folder over itself."
+#: shell/main.c:461
+msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:178
-msgid "Cannot copy a folder over itself."
+#: shell/main.c:463
+msgid "Start in offline mode"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:192
-msgid "Cannot move a folder into one of its descendants."
+#: shell/main.c:465
+msgid "Start in online mode"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:307
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
+#: shell/main.c:468
+msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:312
-msgid "Copy folder"
+#: shell/main.c:472
+msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:354
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
+#: shell/main.c:475
+msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:359
-msgid "Move folder"
-msgstr ""
+#: shell/main.c:502
+msgid "Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-folder-commands.c:385
+#: shell/main.c:506
 #, c-format
 msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:401
-#, c-format
-msgid "Delete \"%s\""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
 msgstr ""
 
-#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:411
-#, c-format
-msgid "Are you sure you want to remove the \"%s\" folder?"
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:488
-#, c-format
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
 msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:537
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:544
-msgid "Rename folder"
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:554
-#: shell/e-shell-folder-creation-dialog.c:168
-#, c-format
-msgid "The specified folder name is not valid: %s"
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:125
-#, c-format
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
 msgid ""
-"Cannot create the specified folder:\n"
-"%s"
+"Upgrade from previous version failed:\n"
+"{0}"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:304
-msgid "Evolution - Create new folder"
-msgstr ""
-
-#: shell/e-shell-folder-selection-dialog.c:98
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
 msgid ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:376
-msgid "New..."
-msgstr "Novea..."
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "contént"
 
-#: shell/e-shell-folder-title-bar.c:713 shell/e-shell-folder-title-bar.c:714
-msgid "(Untitled)"
-msgstr ""
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Evolution"
 
-#: shell/e-shell-importer.c:142
-msgid "Choose the type of importer to run:"
-msgstr ""
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution"
 
-#: shell/e-shell-importer.c:145
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
+"Your system configuration does not match your Evolution configuration.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#: shell/e-shell-importer.c:151 shell/e-shell-startup-wizard.c:803
-msgid "Please select the information that you would like to import:"
+"Click help for details"
 msgstr ""
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:243
-#, c-format
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
 msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
 msgstr ""
 
-#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
+#: smime/gui/ca-trust-dialog.c:91
 #, c-format
 msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/e-shell-importer.c:409
-#, c-format
-msgid "File %s does not exist"
-msgstr ""
-
-#: shell/e-shell-importer.c:410 shell/e-shell-importer.c:420
-#: shell/e-shell-importer.c:436 shell/e-shell-importer.c:486
-msgid "Evolution Error"
-msgstr ""
-
-#: shell/e-shell-importer.c:420
-msgid "You may only import to local folders"
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
 msgstr ""
 
-#: shell/e-shell-importer.c:435
-#, c-format
+#: smime/gui/cert-trust-dialog.c:145
 msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-
-#: shell/e-shell-importer.c:445
-msgid "Importing"
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
 msgstr ""
 
-#: shell/e-shell-importer.c:453
-#, c-format
+#: smime/gui/cert-trust-dialog.c:149
 msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/e-shell-importer.c:466
-#, c-format
-msgid "Error starting %s"
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
 msgstr ""
 
-#: shell/e-shell-importer.c:485
-#, c-format
-msgid "Error loading %s"
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
+msgid "Select a cert to import..."
 msgstr ""
 
-#: shell/e-shell-importer.c:502
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
+msgid "Certificate Name"
 msgstr ""
 
-#: shell/e-shell-importer.c:572
-msgid "Automatic"
-msgstr "Otomatike"
-
-#: shell/e-shell-importer.c:623
-msgid "Filename:"
-msgstr "No d' fitchî:"
-
-#: shell/e-shell-importer.c:628
-msgid "Select a file"
-msgstr "Tchoezi on fitchî"
-
-#: shell/e-shell-importer.c:638
-msgid "File type:"
-msgstr "Sôre di fitchî:"
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#, fuzzy
+msgid "Purposes"
+msgstr "Avançmint"
 
-#: shell/e-shell-importer.c:663
-msgid "Import data and settings from older programs"
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
+msgid "Serial Number"
 msgstr ""
 
-#: shell/e-shell-importer.c:667
-msgid "Import a single file"
+#: smime/gui/certificate-manager.c:271
+msgid "Expires"
 msgstr ""
 
-#: shell/e-shell-importer.c:732 shell/e-shell-startup-wizard.c:632
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-
-#: shell/e-shell-importer.c:735 shell/e-shell-startup-wizard.c:635
-msgid "Starting Intelligent Importers"
-msgstr ""
+#: smime/gui/certificate-manager.c:446
+#, fuzzy
+msgid "E-Mail Address"
+msgstr "Adresse _emile:"
 
-#: shell/e-shell-importer.c:859 shell/e-shell-startup-wizard.c:758
+#: smime/gui/certificate-viewer.c:334
 #, c-format
-msgid "From %s:"
+msgid "Certificate Viewer: %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1027
-msgid "Select folder"
-msgstr ""
+#: smime/gui/component.c:45
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "Tapez li scret"
 
-#: shell/e-shell-importer.c:1028
-msgid "Select a destination folder for importing this data"
+#. we're setting the password initially
+#: smime/gui/component.c:68
+msgid "Enter new password for certificate database"
 msgstr ""
 
-#: shell/e-shell-importer.c:1140 shell/importer/intelligent.c:193
-msgid "Import"
-msgstr "Abaguer"
-
-#: shell/e-shell-offline-handler.c:572
-msgid "Closing connections..."
-msgstr ""
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Tapez li scret"
 
-#: shell/e-shell-startup-wizard.c:159
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
+"Issued to:\n"
+"  Subject: %s\n"
 msgstr ""
 
-#: shell/e-shell-user-creatable-items-handler.c:503
-#: shell/e-shell-user-creatable-items-handler.c:548
-#: widgets/misc/e-charset-picker.c:104
-msgid "New"
-msgstr "Novea"
-
-#: shell/e-shell-utils.c:114
-msgid "No folder name specified."
-msgstr ""
-
-#: shell/e-shell-utils.c:121
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-utils.c:127
-msgid "Folder name cannot contain slashes."
-msgstr ""
-
-#: shell/e-shell-utils.c:133
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:165
-msgid "Bug buddy was not found in your $PATH."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:173
-msgid "Bug buddy could not be run."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:215
-msgid "About Ximian Evolution"
+#: smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:427
-msgid "Go to folder..."
-msgstr ""
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Tchoezi on fitchî"
 
-#: shell/e-shell-view-menu.c:428
-msgid "Select the folder that you want to open"
+#: smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:548
-msgid "Create a new shortcut"
+#: smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:549
-msgid "Select the folder you want the shortcut to point to:"
+#: smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:580
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
+#: smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:588
-#, c-format
-msgid "Error executing %s."
+#: smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:691
-msgid "_Work Online"
+#: smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:704 ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Ovrer _foû raloyaedje"
-
-#: shell/e-shell-view-menu.c:717 ui/evolution.xml.h:30
-msgid "Work Offline"
+#: smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
 msgstr ""
 
-#: shell/e-shell-view.c:220
-msgid "(No folder displayed)"
+#: smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
 msgstr ""
 
-#: shell/e-shell-view.c:1699
-#, c-format
-msgid "%s (%d)"
+#: smime/gui/smime-ui.glade.h:9
+msgid "<b>Validity</b>"
 msgstr ""
 
-#: shell/e-shell-view.c:1701
-msgid "(None)"
-msgstr "(Nouk)"
+#: smime/gui/smime-ui.glade.h:10
+#, fuzzy
+msgid "Authorities"
+msgstr "Otomatike"
 
-#: shell/e-shell-view.c:1748
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+#: smime/gui/smime-ui.glade.h:11
+msgid "Backup"
 msgstr ""
 
-#: shell/e-shell-view.c:1755
-msgid "Ximian Evolution is in the process of going offline."
+#: smime/gui/smime-ui.glade.h:12
+msgid "Backup All"
 msgstr ""
 
-#: shell/e-shell-view.c:1761
+#: smime/gui/smime-ui.glade.h:13
 msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 msgstr ""
 
-#: shell/e-shell.c:651
-#, c-format
-msgid "Cannot set up local storage -- %s"
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+msgid "Certificate"
 msgstr ""
 
-#: shell/e-shell.c:1706
-#, 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."
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
 msgstr ""
 
-#: shell/e-shell.c:1933
-msgid "Invalid arguments"
+#: smime/gui/smime-ui.glade.h:16
+msgid "Certificate details"
 msgstr ""
 
-#: shell/e-shell.c:1935
-msgid "Cannot register on OAF"
+#: smime/gui/smime-ui.glade.h:17
+msgid "Common Name (CN)"
 msgstr ""
 
-#: shell/e-shell.c:1937
-msgid "Configuration Database not found"
+#: smime/gui/smime-ui.glade.h:18
+msgid "Contact Certificates"
 msgstr ""
 
-#: shell/e-shell.c:1939 shell/e-storage.c:500
-msgid "Generic error"
-msgstr "Aroke djenerike"
-
-#: shell/e-shortcuts-view.c:74
-msgid "Create new shortcut group"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:75
-msgid "Group name:"
-msgstr "No do groupe:"
-
-#: shell/e-shortcuts-view.c:175
-#, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
+#: smime/gui/smime-ui.glade.h:21
+msgid "Dummy window only"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:180
-msgid "Don't remove"
-msgstr ""
+#: smime/gui/smime-ui.glade.h:22
+#, fuzzy
+msgid "Edit"
+msgstr "_Candjî"
 
-#: shell/e-shortcuts-view.c:209
-msgid "Rename Shortcut Group"
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Certificate Trust Settings"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:210
-msgid "Rename selected shortcut group to:"
+#: smime/gui/smime-ui.glade.h:24
+msgid "Email Recipient Certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:224
-msgid "_Small Icons"
+#: smime/gui/smime-ui.glade.h:25
+msgid "Email Signer Certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:225
-msgid "Show the shortcuts as small icons"
+#: smime/gui/smime-ui.glade.h:26
+msgid "Expires On"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:227
-msgid "_Large Icons"
+#: smime/gui/smime-ui.glade.h:29
+msgid "Issued On"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:228
-msgid "Show the shortcuts as large icons"
+#: smime/gui/smime-ui.glade.h:30
+msgid "MD5 Fingerprint"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:239
-msgid "_New Group..."
-msgstr ""
+#: smime/gui/smime-ui.glade.h:31
+#, fuzzy
+msgid "Organization (O)"
+msgstr "Organizåcion"
 
-#: shell/e-shortcuts-view.c:240
-msgid "Create a new shortcut group"
-msgstr ""
+#: smime/gui/smime-ui.glade.h:32
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Organizåcion"
 
-#: shell/e-shortcuts-view.c:242
-msgid "_Remove this Group..."
+#: smime/gui/smime-ui.glade.h:33
+msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:243
-msgid "Remove this shortcut group"
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+msgid "SSL Client Certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:245
-msgid "Re_name this Group..."
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+msgid "SSL Server Certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:246
-msgid "Rename this shortcut group"
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:251
-msgid "_Hide the Shortcut Bar"
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify email users."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:252
-msgid "Hide the shortcut bar"
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:371
-msgid "Rename shortcut"
+#: smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify web sites."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:372
-msgid "Rename selected shortcut to:"
-msgstr ""
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View"
+msgstr "_Vey"
 
-#: shell/e-shortcuts-view.c:384
-msgid "Open the folder linked to this shortcut"
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
-msgid "Open in New _Window"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:386
-msgid "Open the folder linked to this shortcut in a new window"
+#: smime/gui/smime-ui.glade.h:44
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:389
-msgid "_Rename"
-msgstr "_Rilomer"
-
-#: shell/e-shortcuts-view.c:389
-msgid "Rename this shortcut"
+#: smime/gui/smime-ui.glade.h:45
+msgid "Your Certificates"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
-msgid "Re_move"
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:391
-msgid "Remove this shortcut from the shortcut bar"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
 msgstr ""
 
-#: shell/e-shortcuts.c:640
-msgid "Error saving shortcuts."
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+msgid "%d/%m/%Y"
 msgstr ""
 
-#: shell/e-shortcuts.c:1043
-msgid "Shortcuts"
-msgstr "Rascourtis"
-
-#: shell/e-storage-set-view.c:658
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Espagne"
 
-#: shell/e-storage.c:181 shell/e-storage.c:187
-msgid "(No name)"
-msgstr ""
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Edjipe"
 
-#: shell/e-storage.c:498
-msgid "No error"
-msgstr "Nole aroke"
+#: smime/lib/e-cert.c:530
+#, fuzzy
+msgid "Version"
+msgstr "Vermont"
 
-#: shell/e-storage.c:502
-msgid "A folder with the same name already exists"
-msgstr ""
+#: smime/lib/e-cert.c:545
+#, fuzzy
+msgid "Version 1"
+msgstr "Vermont"
 
-#: shell/e-storage.c:504
-msgid "The specified folder type is not valid"
-msgstr ""
+#: smime/lib/e-cert.c:548
+#, fuzzy
+msgid "Version 2"
+msgstr "Vermont"
 
-#: shell/e-storage.c:506
-msgid "I/O error"
-msgstr "Aroke d' I/R"
+#: smime/lib/e-cert.c:551
+#, fuzzy
+msgid "Version 3"
+msgstr "Vermont"
 
-#: shell/e-storage.c:508
-msgid "Not enough space to create the folder"
+#: smime/lib/e-cert.c:633
+msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: shell/e-storage.c:510
-msgid "The folder is not empty"
+#: smime/lib/e-cert.c:636
+msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: shell/e-storage.c:512
-msgid "The specified folder was not found"
+#: smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: shell/e-storage.c:514
-msgid "Function not implemented in this storage"
-msgstr ""
+#: smime/lib/e-cert.c:642
+#, fuzzy
+msgid "C"
+msgstr "Cc"
 
-#: shell/e-storage.c:518
-msgid "Operation not supported"
-msgstr ""
+#: smime/lib/e-cert.c:645
+#, fuzzy
+msgid "CN"
+msgstr "N"
 
-#: shell/e-storage.c:520
-msgid "The specified type is not supported in this storage"
+#: smime/lib/e-cert.c:648
+msgid "OU"
 msgstr ""
 
-#: shell/e-storage.c:522
-msgid "The specified folder cannot be modified or removed"
-msgstr ""
+#: smime/lib/e-cert.c:651
+#, fuzzy
+msgid "O"
+msgstr "I Va"
 
-#: shell/e-storage.c:524
-msgid "Cannot make a folder a child of one of its descendants"
+#: smime/lib/e-cert.c:654
+msgid "L"
 msgstr ""
 
-#: shell/e-storage.c:526
-msgid "Cannot create a folder with that name"
-msgstr ""
+#: smime/lib/e-cert.c:657
+#, fuzzy
+msgid "DN"
+msgstr "N"
 
-#: shell/e-task-widget.c:191
-#, c-format
-msgid "%s (...)"
+#: smime/lib/e-cert.c:660
+msgid "DC"
 msgstr ""
 
-#: shell/e-task-widget.c:196
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr ""
+#: smime/lib/e-cert.c:663
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
+#: smime/lib/e-cert.c:666
+msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
+#: smime/lib/e-cert.c:669
+msgid "Certificate Key Usage"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
+#: smime/lib/e-cert.c:672
+msgid "Netscape Certificate Type"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1022
-msgid "CORBA error"
-msgstr "Aroke CORBA"
-
-#: shell/evolution-shell-component.c:1024
-msgid "Interrupted"
+#: smime/lib/e-cert.c:675
+msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1026
-msgid "Invalid argument"
+#: smime/lib/e-cert.c:678
+msgid "UID"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1028
-msgid "Already has an owner"
+#: smime/lib/e-cert.c:687
+#, c-format
+msgid "Object Identifier (%s)"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1030
-msgid "No owner"
+#: smime/lib/e-cert.c:738
+msgid "Algorithm Identifier"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1032
-msgid "Not found"
+#: smime/lib/e-cert.c:746
+msgid "Algorithm Parameters"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1034
-msgid "Unsupported type"
+#: smime/lib/e-cert.c:768
+msgid "Subject Public Key Info"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1036
-msgid "Unsupported schema"
+#: smime/lib/e-cert.c:773
+msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1038
-msgid "Unsupported operation"
-msgstr "Operåcion nén sopoirtêye"
-
-#: shell/evolution-shell-component.c:1040
-msgid "Internal error"
-msgstr "Divintrinne aroke"
-
-#: shell/evolution-shell-component.c:1044
-msgid "Exists"
+#: smime/lib/e-cert.c:788
+msgid "Subject's Public Key"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1046
-msgid "Invalid URI"
-msgstr "Hårdêye nén valåve"
-
-#: shell/evolution-shell-component.c:1050
-msgid "Has subfolders"
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+msgid "Error: Unable to process extension"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1052
-msgid "No space left"
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+msgid "Object Signer"
 msgstr ""
 
-#: shell/evolution-shell-component.c:1054
-msgid "Old owner has died"
+#: smime/lib/e-cert.c:834
+msgid "SSL Certificate Authority"
 msgstr ""
 
-#: shell/evolution-test-component.c:41
-msgid "Test type"
+#: smime/lib/e-cert.c:838
+msgid "Email Certificate Authority"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
+#: smime/lib/e-cert.c:866
+msgid "Signing"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
+#: smime/lib/e-cert.c:870
+msgid "Non-repudiation"
 msgstr ""
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Lodjoe"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
-msgid "The following connections are currently active:"
+#: smime/lib/e-cert.c:874
+msgid "Key Encipherment"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
+#: smime/lib/e-cert.c:878
+msgid "Data Encipherment"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
+#: smime/lib/e-cert.c:882
+msgid "Key Agreement"
 msgstr ""
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
+#: smime/lib/e-cert.c:886
+msgid "Certificate Signer"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Evolution Setup Assistant"
+#: smime/lib/e-cert.c:890
+msgid "CRL Signer"
 msgstr ""
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Importing Files"
-msgstr ""
+#: smime/lib/e-cert.c:938
+#, fuzzy
+msgid "Critical"
+msgstr "Crowåceye"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
-msgid "Timezone "
-msgstr ""
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#, fuzzy
+msgid "Not Critical"
+msgstr "Caroline bijhrece"
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
-msgid "Welcome"
-msgstr "Bénvnowe"
+#: smime/lib/e-cert.c:964
+#, fuzzy
+msgid "Extensions"
+msgstr "Disrûlêyes"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Next\" button to continue. "
-msgstr ""
+#: smime/lib/e-cert.c:1035
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s a %s"
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to setup Evolution. \n"
-"\n"
-"Click the \"Finish\" button to save your settings. "
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
+#: smime/lib/e-cert.c:1100
+#, fuzzy
+msgid "Issuer"
+msgstr "_Sititchî"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Assistant"
+#: smime/lib/e-cert.c:1154
+msgid "Issuer Unique ID"
 msgstr ""
 
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Assistant"
+#: smime/lib/e-cert.c:1173
+msgid "Subject Unique ID"
 msgstr ""
 
-#: shell/importer/import.glade.h:4
-msgid "Import File (step 3 of 3)"
+#: smime/lib/e-cert.c:1216
+msgid "Certificate Signature Value"
 msgstr ""
 
-#: shell/importer/import.glade.h:5
-msgid "Importer Type (step 1 of 3)"
+#: smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
 msgstr ""
 
-#: shell/importer/import.glade.h:6
-msgid "Select Importers (step 2 of 3)"
+#: smime/lib/e-pkcs12.c:266
+msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: shell/importer/import.glade.h:7
-msgid "Select a File (step 2 of 3)"
+#: smime/lib/e-pkcs12.c:365
+msgid "Imported Certificate"
 msgstr ""
 
-#: shell/importer/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
+#: tools/evolution-launch-composer.c:324
+#, fuzzy
+msgid "An attachment to add."
+msgstr "Ataetchmint"
 
-#: shell/importer/intelligent.c:190
-msgid "Importers"
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
 msgstr ""
 
-#: shell/importer/intelligent.c:196
-msgid "Don't import"
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
 msgstr ""
 
-#: shell/importer/intelligent.c:198
-msgid "Don't ask me again"
-msgstr "Nén dmander li côp ki vint"
-
-#: shell/importer/intelligent.c:208
-msgid "Evolution can import data from the following files:"
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
 msgstr ""
 
-#: shell/main.c:88
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/main.c:94
-msgid "Evolution is now exiting ..."
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
 msgstr ""
 
-#: shell/main.c:223
-msgid "Cannot access the Ximian Evolution shell."
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
 msgstr ""
 
-#: shell/main.c:232
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:61
 #, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:302
-msgid "Disable splash screen"
+msgid "Could not execute '%s': %s\n"
 msgstr ""
 
-#: shell/main.c:303
-msgid "Start in offline mode"
-msgstr ""
-
-#: shell/main.c:304
-msgid "Start in online mode"
-msgstr ""
-
-#: shell/main.c:305
-msgid "Send the debugging output of all components to a file."
-msgstr ""
-
-#: shell/main.c:323
+#: tools/killev.c:76
 #, c-format
-msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
-msgstr ""
-
-#: shell/main.c:353
-msgid "Cannot initialize the Bonobo component system."
-msgstr ""
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
-#: tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr ""
-
-#: tools/evolution-addressbook-abuse.c:111
-#: tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Fitchî d' intrêye"
-
-#: tools/evolution-addressbook-export.c:46
-msgid "Output File"
-msgstr ""
-
-#: tools/evolution-addressbook-import.c:80
-msgid "No filename provided."
+msgid "Shutting down %s (%s)\n"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:3
 msgid "Copy Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Copyî li tchuze"
 
@@ -23877,257 +17416,256 @@ msgstr "Copyî li tchuze"
 msgid "Copy to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Create new contact"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:7
-msgid "Create new contact list"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:12
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Côper li tchuze"
 
-#: ui/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Dump"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:11
 msgid "Move Contact(s) to Another Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:12
 msgid "Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:23
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Aclaper çu k' i gn a e tchapea emacralé"
 
-#: ui/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:15
 msgid "Previews the contacts to be printed"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "_Vey divant"
+
+#: ui/evolution-addressbook.xml.h:18
 msgid "Print selected contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:23
+#: ui/evolution-addressbook.xml.h:20
 msgid "Save selected contacts as a VCard."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:24
+#: ui/evolution-addressbook.xml.h:21
 msgid "Select All"
 msgstr "Tchoezi totafwait"
 
-#: ui/evolution-addressbook.xml.h:25
+#: ui/evolution-addressbook.xml.h:22
 msgid "Select all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:26
-msgid "Send a mess to the selected contacts."
+#: ui/evolution-addressbook.xml.h:23
+msgid "Send a message to the selected contacts."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:27
+#: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:28
+#: ui/evolution-addressbook.xml.h:25
 msgid "Send selected contacts to another person."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:29
+#: ui/evolution-addressbook.xml.h:26
+msgid "Show contact preview window"
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:27
 msgid "Stop"
 msgstr "Arester"
 
-#: ui/evolution-addressbook.xml.h:30
+#: ui/evolution-addressbook.xml.h:28
 msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:31
+#: ui/evolution-addressbook.xml.h:29
 msgid "View the current contact"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
-#: ui/evolution-mail-global.xml.h:17 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:92 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-task-editor.xml.h:9 ui/evolution-tasks.xml.h:15
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
+#: 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:15
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:33
-msgid "_Addressbook Sources..."
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:35
-msgid "_Contact List"
-msgstr ""
-
-#: ui/evolution-addressbook.xml.h:39 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:43 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:106
-#: ui/my-evolution.xml.h:7
-msgid "_Print..."
-msgstr "_Imprimer..."
-
-#: ui/evolution-addressbook.xml.h:44
-msgid "_Save as VCard"
+#: ui/evolution-addressbook.xml.h:36
+msgid "_Move to Folder..."
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:45
-msgid "_Search for Contacts"
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+msgid "_Preview Pane"
 msgstr ""
 
-#: ui/evolution-addressbook.xml.h:46
+#: ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "Schaper et rlomer..."
+
+#: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
 msgstr "_Tchoezi Totafwait"
 
-#: ui/evolution-addressbook.xml.h:47
+#: ui/evolution-addressbook.xml.h:43
 msgid "_Send Message to Contact..."
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:2
-msgid "Configure the calendar's settings"
-msgstr ""
-
 #: ui/evolution-calendar.xml.h:4
-msgid "Create a New All Day _Event"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:5 ui/evolution-tasks.xml.h:5
-msgid "Create a New _Task"
-msgstr ""
+msgid "Day"
+msgstr "Djoû"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a _New Appointment"
+msgid "Delete All Occurrences"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Create a _New Meeting"
+msgid "Delete the appointment"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:8
-msgid "Create a new appointment"
-msgstr "Fé on novea radjoû"
+#, fuzzy
+msgid "Delete this Occurrence"
+msgstr "Disfacer ci cayet ci"
 
 #: ui/evolution-calendar.xml.h:9
-msgid "Create a new meeting request"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:10 ui/evolution-tasks.xml.h:6
-msgid "Create a new task"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:11
-msgid "Create an event for the whole day"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:13
-msgid "Day"
-msgstr "Djoû"
-
-#: ui/evolution-calendar.xml.h:14
-msgid "Delete the appointment"
-msgstr ""
+#, fuzzy
+msgid "Delete this occurrence"
+msgstr "Disfacer ci cayet ci"
 
-#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:39
+#: ui/evolution-calendar.xml.h:10
 msgid "Go To"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:11
 msgid "Go back"
 msgstr "Rivni en erî"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:12
 msgid "Go forward"
 msgstr "Aler pus lon"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Go to _Date"
-msgstr "Potchî a ene _date"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Go to a specific date"
-msgstr "Potchî a ene date metowe"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Go to today"
-msgstr "Potchî a enute"
+#: ui/evolution-calendar.xml.h:13
+#, fuzzy
+msgid "List"
+msgstr "djivêye"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Moes"
 
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Shuvant"
+
+#: ui/evolution-calendar.xml.h:17
 msgid "Previews the calendar to be printed"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25 ui/evolution-comp-editor.xml.h:9
-msgid "Print Pre_view"
-msgstr "_Vey divant"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Di dvant"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:22
 msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "Purg_e"
+msgstr "Pådje"
+
+#: ui/evolution-calendar.xml.h:24
+msgid "Purge old appointments and meetings"
+msgstr ""
+
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Tchoezi on fitchî"
+
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Potchî a ene date metowe"
+
 #: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Tchoezi ridant"
+
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show as list"
+msgstr "Håyner spepieuzmint"
+
+#: ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
-msgid "Week"
-msgstr "Samwinne"
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Ouy"
 
 #: ui/evolution-calendar.xml.h:35
-msgid "_Appointment..."
-msgstr "_Radjoû..."
+#, fuzzy
+msgid "View the current appointment"
+msgstr "Fé on novea radjoû"
 
 #: ui/evolution-calendar.xml.h:36
-msgid "_Calendar Settings..."
-msgstr ""
+msgid "Week"
+msgstr "Samwinne"
 
-#: ui/evolution-calendar.xml.h:40
-msgid "_Meeting..."
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:43
-msgid "_Publish Free/Busy Information"
-msgstr ""
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Open Appointment"
+msgstr "Novea _radjoû"
 
-#: ui/evolution-calendar.xml.h:44
-msgid "_Task..."
+#: 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 ""
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
+#: 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:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Clôre"
@@ -24136,12 +17674,12 @@ msgstr "Clôre"
 msgid "Close this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Disfacer ci cayet ci"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:16
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Mwaisse bår ås usteyes"
 
@@ -24149,87 +17687,115 @@ msgstr "Mwaisse bår ås usteyes"
 msgid "Preview the printed item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:11
-msgid "Print..."
-msgstr "Imprimer..."
-
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:240
-msgid "Save"
-msgstr "Schaper"
+#: 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 "Schaper et r_lomer..."
 
-#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
+#: 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:4
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:15
+#: 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
+#, fuzzy
+msgid "Save and _Close"
+msgstr "San José"
+
+#: ui/evolution-comp-editor.xml.h:14
 msgid "Save the item and close the dialog box"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:16
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save this item to disk"
 msgstr ""
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-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:48
-#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:36
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fitchî"
 
-#: ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-composer-entries.xml.h:1
+#, fuzzy
+msgid "Copy selected text to the clipboard"
+msgstr "Aclaper çu k' i gn a e tchapea emacralé"
+
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+msgid "Cu_t"
+msgstr "Cô_per"
+
+#: ui/evolution-composer-entries.xml.h:3
+#, fuzzy
+msgid "Cut selected text to the clipboard"
+msgstr "Aclaper çu k' i gn a e tchapea emacralé"
+
+#: ui/evolution-composer-entries.xml.h:4
+#, fuzzy
+msgid "Paste text from the clipboard"
+msgstr "Aclaper çu k' i gn a e tchapea emacralé"
+
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Tchoezi _tot"
+
+#: ui/evolution-composer-entries.xml.h:6
+#, fuzzy
+msgid "Select all text"
+msgstr "Tchoezi totafwait"
+
+#: ui/evolution-contact-editor.xml.h:6
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:21
-msgid "Save _As..."
-msgstr "Schaper et r_lomer..."
-
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:12
 msgid "Send _Message to Contact..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "_Schaper"
 
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr ""
-
 #: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
+msgid "Delete this list"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Save the list and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Se_nd list to other..."
 msgstr ""
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:10
 msgid "Send _message to list..."
 msgstr ""
 
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "_Disfacer"
+
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr ""
@@ -24246,24 +17812,24 @@ msgstr ""
 msgid "Forward this item via email"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:7
 msgid "Obtain the latest meeting information"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:8
 msgid "Re_fresh Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:9
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:10
 msgid "Schedule a meeting for this item"
 msgstr ""
 
 #: ui/evolution-executive-summary.xml.h:1
-msgid "Customise My Evolution"
+msgid "Customize My Evolution"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:2
@@ -24275,91 +17841,68 @@ msgid "Compose _New Message"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit mail accounts and other preferences"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:6
+#: ui/evolution-mail-global.xml.h:5
 msgid "Create or edit virtual folder definitions"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:7
+#: ui/evolution-mail-global.xml.h:6
 msgid "Empty _Trash"
 msgstr "_Vudî l' batch"
 
+#: ui/evolution-mail-global.xml.h:7
+msgid "Open a window for composing a mail message"
+msgstr ""
+
 #: ui/evolution-mail-global.xml.h:8
-msgid "Forget _Passwords"
+msgid "Permanently remove all deleted messages from all folders"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:9
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
+#, fuzzy
+msgid "Post Ne_w Message"
+msgstr "Messaedje shuvant"
 
 #: ui/evolution-mail-global.xml.h:10
-msgid "Open a window for composing a mail message"
+msgid "Post a message to a Public folder"
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:11
-msgid "Permanently remove all deleted messages from all folders"
+msgid "S_ubscribe to Folders..."
 msgstr ""
 
 #: ui/evolution-mail-global.xml.h:12
-msgid "Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:13
-msgid "Send queued mail and retrieve new mail"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:14
 msgid "Show message preview window"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-global.xml.h:13
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:16
+#: ui/evolution-mail-global.xml.h:14
 msgid "Virtual Folder _Editor..."
 msgstr ""
 
-#: ui/evolution-mail-global.xml.h:18
+#: ui/evolution-mail-global.xml.h:16
 msgid "_Filters..."
 msgstr "_Passetes..."
 
-#: ui/evolution-mail-global.xml.h:20
-msgid "_Mail Settings..."
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:21
-msgid "_Preview Pane"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:22
-msgid "_Send / Receive"
-msgstr ""
-
-#: ui/evolution-mail-global.xml.h:23
-msgid "_Subscribe to Folders..."
-msgstr ""
-
 #: ui/evolution-mail-list.xml.h:1
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected messages"
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+msgid "Copy selected message(s) to the clipboard"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:3
-msgid "Cu_t"
-msgstr "Cô_per"
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+msgid "Cut selected message(s) to the clipboard"
+msgstr ""
 
 #: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected messages"
+msgid "E_xpunge"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:5
@@ -24380,25 +17923,22 @@ msgid ""
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as R_ead"
+msgid "Mark All as _Read"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message in the clipboard"
-msgstr ""
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+#, fuzzy
+msgid "Paste message(s) from the clipboard"
+msgstr "Aclaper çu k' i gn a e tchapea emacralé"
 
 #: ui/evolution-mail-list.xml.h:12
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Tchoezi _tot"
-
 #: ui/evolution-mail-list.xml.h:14
 msgid "Select _Thread"
 msgstr ""
@@ -24435,420 +17975,449 @@ msgstr ""
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
-msgid "_Expunge"
-msgstr ""
-
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
+#: ui/evolution-mail-list.xml.h:25
 msgid "_Folder"
 msgstr "_Ridant"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Tchoezi çu ki n' esteut _nén tchoezi"
 
-#: ui/evolution-mail-list.xml.h:30
-msgid "_Properties..."
-msgstr "_Prôpietés..."
-
-#: ui/evolution-mail-list.xml.h:31
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:2
-msgid "Add Sender to Address _Book"
+#: ui/evolution-mail-message.xml.h:1
+msgid "A_dd Sender to Address Book"
 msgstr ""
 
+#: ui/evolution-mail-message.xml.h:2
+#, fuzzy
+msgid "A_pply Filters"
+msgstr "Passetes"
+
 #: ui/evolution-mail-message.xml.h:3
-msgid "Apply filter rules to the selected messages"
+msgid "Add Sender to Address Book"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:4
-msgid "Compose a reply to all of the recipients of the selected message"
+msgid "Apply filter rules to the selected messages"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to the mailing list of the selected message"
+msgid "Caret _Mode"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the sender of the selected message"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:8
+msgid "Compose a reply to the sender of the selected message"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:9
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create _Virtual Folder From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for these recipients"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this mailing list"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:19
 msgid "Create a virtual folder for this sender"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:20
 msgid "Create a virtual folder for this subject"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "Raptiti l' tecse"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "F_orward As..."
+msgstr "En avant"
+
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Rîles po les passetes"
+
+#: ui/evolution-mail-message.xml.h:34
 msgid "Filter on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:35
 msgid "Filter on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:37
 msgid "Filter on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:38
+msgid "Filter the selected messages for junk status"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:39
 msgid "Flag selected message(s) for follow-up"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Force images in HTML mail to be loaded"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Forward"
-msgstr "En avant"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:40
+#: ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "Ragrandi l' tecse"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:49
 msgid "Load _Images"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark as I_mportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:52
+msgid "Mark as U_nread"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:53
 msgid "Mark as Unimp_ortant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected message(s) as having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:57
 msgid "Mark the selected message(s) as important"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:58
+msgid "Mark the selected message(s) as junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:59
+msgid "Mark the selected message(s) as not being junk"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:60
 msgid "Mark the selected message(s) as not having been read"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:61
 msgid "Mark the selected message(s) as unimportant"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:62
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:63
 msgid "Move"
 msgstr "Bodjî"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:64
 msgid "Move selected message(s) to another folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Next"
-msgstr "Shuvant"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Next _Important Message"
+msgstr "Messaedje nén léjhou shuvant"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next Important Message"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:67
+#, fuzzy
+msgid "Next _Thread"
+msgstr "Olande"
 
-#: ui/evolution-mail-message.xml.h:55
-msgid "Next Message"
-msgstr "Messaedje shuvant"
+#: ui/evolution-mail-message.xml.h:68
+#, fuzzy
+msgid "Next _Unread Message"
+msgstr "Messaedje nén léjhou shuvant"
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Next Thread"
+#: ui/evolution-mail-message.xml.h:69
+msgid "Not Junk"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next Unread Message"
-msgstr "Messaedje nén léjhou shuvant"
-
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:70
 msgid "Open the selected message in a new window"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:59
-msgid "Open the selected message in the composer to re-send it"
+#: ui/evolution-mail-message.xml.h:71
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:61
-msgid "Preview the message to be printed"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:73
+#, fuzzy
+msgid "P_revious Unread Message"
+msgstr "Messaedje di dvant"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Previous"
-msgstr "Di dvant"
+#: ui/evolution-mail-message.xml.h:75
+msgid "Post a Repl_y"
+msgstr ""
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Previous Important Message"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Post a reply to a message in a Public folder"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Previous Message"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Pr_evious Important Message"
 msgstr "Messaedje di dvant"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Previous Unread Message"
+#: ui/evolution-mail-message.xml.h:78
+msgid "Preview the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:82
 msgid "Print this message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:83
 msgid "Re_direct"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:84
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Reply"
-msgstr "Responde"
-
-#: ui/evolution-mail-message.xml.h:72
-msgid "Reply to All"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:89
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:76
-msgid "S_earch Message..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "S_earch in Message..."
+msgstr "Dji cwir..."
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:91
 msgid "S_maller"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:78
+#: ui/evolution-mail-message.xml.h:92
 msgid "Save the message as a text file"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:93
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:80
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-message.xml.h:94
+#, fuzzy
+msgid "Set up the page settings for your current printer"
 msgstr "Apontyî li pådje po vosse sicrirece do moumint"
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:95
 msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:96
 msgid "Show Full _Headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:97
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr ""
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "Show message in the normal style"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:99
 msgid "Show message with all email headers"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:100
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:101
 msgid "Text Si_ze"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:102
 msgid "Un-delete the selected messages"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:103
 msgid "VFolder on Mailing _List..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:89
+#: ui/evolution-mail-message.xml.h:104
 msgid "VFolder on Se_nder..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:105
 msgid "VFolder on _Recipients..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:106
 msgid "VFolder on _Subject..."
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:93
-msgid "_Apply Filters"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:108
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "_Copy to Folder"
-msgstr ""
-
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:99
-msgid "_Forward Message"
+#: ui/evolution-mail-message.xml.h:115
+msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:101
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "_Move to Folder"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:120
+#, fuzzy
+msgid "_Next Message"
+msgstr "Messaedje shuvant"
 
-#: ui/evolution-mail-message.xml.h:104
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:124
+#, fuzzy
+msgid "_Previous Message"
+msgstr "Messaedje di dvant"
+
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110 ui/evolution.xml.h:49
-#: ui/my-evolution.xml.h:9
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Usteyes"
 
+#: ui/evolution-mail-message.xml.h:130
+msgid "_Undelete"
+msgstr "_Disrafacer"
+
 #: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Clôre ci purnea chal"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:45
-#: ui/evolution-signature-editor.xml.h:6 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:33
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Clôre"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:55 ui/evolution.xml.h:50
-msgid "_View"
-msgstr "_Vey"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Atatchî"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Clôre ci fitchî chal"
 
@@ -24864,171 +18433,171 @@ msgstr ""
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "H_TML"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:10
-msgid "Inline Text _File..."
+msgid "HT_ML"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:11
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:12
-msgid "Insert text file..."
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "Drovi on fitchî"
 
-#: ui/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:14
 msgid "S/MIME Encrypt"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:15
 msgid "S/MIME Sign"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Schaper"
+
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Schaper et rlomer"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save _Draft"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:24
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Save the current file"
 msgstr "Schaper li fitchî do moumint"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Schaper ci fitchî ci dzo on novea no"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr ""
 
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:11
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send this message"
+msgstr "Messaedje shuvant"
+
 #: ui/evolution-message-composer.xml.h:27
-msgid "Send"
-msgstr "Evoyî"
+msgid "Show / hide attachments"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:28
-msgid "Send _Later"
+msgid "Show _attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:29
-msgid "Send _later"
+msgid "Show attachments"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:30
-msgid "Send the mail in HTML format"
+msgid "Sign this message with your PGP key"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:31
-msgid "Send the message later"
+msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:32
-msgid "Send this message now"
+msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:33
-msgid "Show / hide attachments"
+msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:34
-msgid "Show _attachments"
+msgid "Toggles whether the From chooser is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:35
-msgid "Show attachments"
+msgid "Toggles whether the Post-To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:36
-msgid "Sign this message with your PGP key"
+msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:37
-msgid "Sign this message with your S/MIME Signature Certificate"
+msgid "Toggles whether the To field is displayed"
 msgstr ""
 
 #: ui/evolution-message-composer.xml.h:38
-msgid "Toggles whether the BCC field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:39
-msgid "Toggles whether the CC field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:40
-msgid "Toggles whether the From chooser is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:41
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:42
 msgid "_Attachment..."
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Delete all"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:45
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:50
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:14
 msgid "_Insert"
 msgstr "_Sititchî"
 
-#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Open..."
 msgstr "_Drovi..."
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:48
+msgid "_Post-To Field"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:49
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-message-composer.xml.h:51
 msgid "_Security"
 msgstr ""
 
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
-msgid "_Help"
-msgstr "_Aidance"
+#: ui/evolution-message-composer.xml.h:52
+msgid "_To Field"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:5
+msgid "H_TML"
+msgstr ""
+
+#: ui/evolution-signature-editor.xml.h:10
+#, fuzzy
+msgid "Save the current file and close the window"
+msgstr "Schaper li fitchî do moumint"
 
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
@@ -25082,312 +18651,309 @@ msgstr ""
 msgid "Re_fresh Task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:2
-msgid "Configure the task view's settings"
-msgstr ""
-
-#: ui/evolution-tasks.xml.h:4
+#: ui/evolution-tasks.xml.h:3
 msgid "Copy selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:5
 msgid "Cut selected task"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:9
 msgid "Mar_k as Complete"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Paste task from the clipboard"
 msgstr ""
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Tasks Settings..."
+#: ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
+#: ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
 msgstr ""
 
+#: ui/evolution-tasks.xml.h:18
+msgid "View the selected task"
+msgstr ""
+
+#: ui/evolution-tasks.xml.h:23
+#, fuzzy
+msgid "_Open Task"
+msgstr "_Drovi"
+
+#: ui/evolution.xml.h:1
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Evolution"
+
 #: ui/evolution.xml.h:2
-msgid "Add to _Shortcut Bar"
+msgid "Change Evolution's settings"
 msgstr ""
 
 #: ui/evolution.xml.h:3
-msgid "Change the name of this folder"
+msgid "Change the visibility of the toolbar"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "Copy this folder"
-msgstr ""
+#, fuzzy
+msgid "Create a new window displaying this folder"
+msgstr "Fé on novea ridant"
 
 #: ui/evolution.xml.h:7
-msgid "Create _New Folder..."
-msgstr ""
+msgid "E_xit"
+msgstr "Moussî _foû"
 
 #: ui/evolution.xml.h:8
-msgid "Create a link to this folder in the shortcut bar"
-msgstr ""
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
 
 #: ui/evolution.xml.h:9
-msgid "Create a new folder"
-msgstr "Fé on novea ridant"
+msgid "Exit the program"
+msgstr "Moussî foû di ci programe chal"
 
 #: ui/evolution.xml.h:10
-msgid "Delete this folder"
+msgid "Forget _Passwords"
 msgstr ""
 
 #: ui/evolution.xml.h:11
-msgid "Display a different folder"
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
 #: ui/evolution.xml.h:12
-msgid "E_xit"
-msgstr "Moussî _foû"
-
-#: ui/evolution.xml.h:13
-msgid "Evolution _Window"
+msgid "Import data from other programs"
 msgstr ""
 
 #: ui/evolution.xml.h:14
-msgid "Exit the program"
-msgstr "Moussî foû di ci programe chal"
+#, fuzzy
+msgid "New _Window"
+msgstr "Drovi dins on novea purnea"
 
 #: ui/evolution.xml.h:15
-msgid "Import data from other programs"
+#, fuzzy
+msgid "Pi_lot Settings..."
+msgstr "Apontiaedjes"
+
+#: ui/evolution.xml.h:16
+msgid "Send / Receive"
 msgstr ""
 
 #: ui/evolution.xml.h:17
-msgid "Move this folder to another place"
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
 #: ui/evolution.xml.h:18
-msgid "Open in New Window"
-msgstr "Drovi dins on novea purnea"
-
-#: ui/evolution.xml.h:20
-msgid "Open this folder in an other window"
-msgstr ""
+#, fuzzy
+msgid "Set up Pilot configuration"
+msgstr "Apontiaedje di l' emilaedje"
 
-#: ui/evolution.xml.h:21
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Evoyî on Rapoirt di Bug"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:25
-msgid "Toggle"
-msgstr ""
-
-#: ui/evolution.xml.h:26
-msgid "Toggle whether to show the folder bar"
-msgstr ""
-
-#: ui/evolution.xml.h:27
-msgid "Toggle whether to show the shortcut bar"
-msgstr ""
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Mwaisse bår ås usteyes"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:29
-msgid "View the selected folder"
-msgstr ""
-
-#: ui/evolution.xml.h:31
-msgid "Ximian Evolution _FAQ"
-msgstr ""
-
-#: ui/evolution.xml.h:32
-msgid "_About Ximian Evolution..."
-msgstr ""
-
-#: ui/evolution.xml.h:34
-msgid "_Copy..."
-msgstr "C_opyî..."
-
-#: ui/evolution.xml.h:38
-msgid "_Folder Bar"
-msgstr ""
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
 
-#: ui/evolution.xml.h:39
-msgid "_Go to Folder..."
-msgstr ""
+#: ui/evolution.xml.h:30
+msgid "_Help"
+msgstr "_Aidance"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:42
-msgid "_Move..."
-msgstr "_Bodjî..."
-
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novea"
 
-#: ui/evolution.xml.h:44
-msgid "_New Folder"
-msgstr "_Novea ridant"
-
-#: ui/evolution.xml.h:45
-msgid "_Pilot Settings..."
-msgstr ""
-
-#: ui/evolution.xml.h:46
-msgid "_Rename..."
-msgstr "_Rilomer..."
-
-#: ui/evolution.xml.h:47
-msgid "_Shortcut"
+#: ui/evolution.xml.h:33
+msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:48
-msgid "_Shortcut Bar"
+#: ui/evolution.xml.h:34
+msgid "_Send / Receive"
 msgstr ""
 
-#: ui/my-evolution.xml.h:1
-msgid "Change the settings for the summary"
-msgstr ""
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_Window"
+msgstr "_Trover"
 
-#: ui/my-evolution.xml.h:4
-msgid "Print summary"
-msgstr ""
+#: views/addressbook/galview.xml.h:1
+#, fuzzy
+msgid "By _Company"
+msgstr "Eterprijhe"
 
-#: ui/my-evolution.xml.h:5
-msgid "Reload"
-msgstr "Ritcherdjî"
+#: views/addressbook/galview.xml.h:2
+#, fuzzy
+msgid "_Address Cards"
+msgstr "_Adresse:"
 
-#: ui/my-evolution.xml.h:6
-msgid "Reload the view"
+#: views/addressbook/galview.xml.h:3
+msgid "_Phone List"
 msgstr ""
 
-#: ui/my-evolution.xml.h:8
-msgid "_Summary Settings..."
-msgstr ""
+#: views/calendar/galview.xml.h:1
+#, fuzzy
+msgid "W_eek View"
+msgstr "Vey samwinne"
 
-#: views/addressbook/galview.xml.h:1
-msgid "Address Cards"
-msgstr ""
+#: views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "_Day View"
+msgstr "Vey djoû"
 
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr ""
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "Håyner a vosse môde"
 
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr ""
+#: views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "_Month View"
+msgstr "Vey moes"
+
+#: views/calendar/galview.xml.h:5
+#, fuzzy
+msgid "_Work Week View"
+msgstr "Vey samwinne d' ovraedje"
 
 #: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
-msgstr ""
+#, fuzzy
+msgid "As _Sent Folder"
+msgstr "Tchoezi ridant"
 
 #: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
+#, fuzzy
+msgid "By S_tatus"
+msgstr "Estat"
 
 #: views/mail/galview.xml.h:3
-msgid "By Sender"
-msgstr ""
+#, fuzzy
+msgid "By Se_nder"
+msgstr "Evoyeu"
 
 #: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr ""
+#, fuzzy
+msgid "By Su_bject"
+msgstr "Sudjet"
 
 #: views/mail/galview.xml.h:5
-msgid "By Subject"
+msgid "By _Follow Up Flag"
 msgstr ""
 
 #: views/mail/galview.xml.h:6
-msgid "Messages"
+#, fuzzy
+msgid "_Messages"
 msgstr "Messaedjes"
 
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Due Date"
+msgstr "Date ki li bouye doet esse _fwaite:"
+
 #: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr ""
+#, fuzzy
+msgid "With _Status"
+msgstr "Estat"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:207
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:700
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "Select a Time Zone"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+msgid "<b>Time Zones</b>"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Selection:"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "<b>_Selection</b>"
 msgstr "Tchuze:"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
 msgstr ""
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 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."
+"Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:268
+#: widgets/menus/gal-view-menus.c:292
 msgid "_Current View"
 msgstr ""
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:324
+#: widgets/menus/gal-view-menus.c:351
 msgid "Custom View"
 msgstr "Håyner a vosse môde"
 
-#: widgets/menus/gal-view-menus.c:333
-msgid "Save Custom View"
-msgstr ""
+#: widgets/menus/gal-view-menus.c:360
+#, fuzzy
+msgid "Save Custom View..."
+msgstr "Håyner a vosse môde"
 
-#: widgets/menus/gal-view-menus.c:346
-msgid "Define Views"
+#: widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
+#: 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:1070
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Asteure"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
-msgid "Today"
-msgstr "Ouy"
-
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -25396,150 +18962,865 @@ msgstr ""
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:59
+#: widgets/misc/e-charset-picker.c:63
 msgid "Baltic"
 msgstr "Baltike"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:64
 msgid "Central European"
 msgstr "Europe cintråle"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:65
 msgid "Chinese"
 msgstr "Chinwès"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:66
 msgid "Cyrillic"
 msgstr "Cirilike"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:67
 msgid "Greek"
 msgstr "Grek"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:68
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:69
 msgid "Japanese"
 msgstr "Djaponès"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:70
 msgid "Korean"
 msgstr "Coreyin"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:71
 msgid "Turkish"
 msgstr "Turk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:72
 msgid "Unicode"
 msgstr "Unicôde"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:73
 msgid "Western European"
 msgstr "Europe di l' ouwess"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:74
+#, fuzzy
+msgid "Western European, New"
+msgstr "Europe di l' ouwess"
+
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:100
 msgid "Ukrainian"
 msgstr "Ucrinnyin"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:103
 msgid "Visual"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:162
+#: widgets/misc/e-charset-picker.c:171
 #, c-format
 msgid "Unknown character set: %s"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:204
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+msgid "Character Encoding"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:231
 msgid "Enter the character set to use"
 msgstr ""
 
-#: widgets/misc/e-charset-picker.c:279
+#: widgets/misc/e-charset-picker.c:338
 msgid "Other..."
 msgstr "Ôte..."
 
-#: widgets/misc/e-charset-picker.c:398
-msgid "Character Encoding"
-msgstr ""
-
 #: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:153
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
+msgid "Evolution Error"
+msgstr ""
+
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informåcions sol conte"
+
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:417
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
+#: widgets/misc/e-expander.c:181
+msgid "Expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
+msgstr ""
+
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "Nén defineye"
+
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
+msgstr ""
+
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "Espagne"
+
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
+msgstr ""
+
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
+msgstr ""
+
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
+msgstr ""
+
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
+msgstr ""
+
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: widgets/misc/e-expander.c:231
+msgid "Indicator Spacing"
+msgstr ""
+
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
+msgstr ""
+
+#: widgets/misc/e-filter-bar.c:195
+#, fuzzy
+msgid "_Searches"
+msgstr "_Cweri"
+
+#: widgets/misc/e-filter-bar.c:197
 msgid "Search Editor"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.c:169
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr ""
 
-#: widgets/misc/e-filter-bar.h:94
-msgid "Add to Saved Searches"
-msgstr ""
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+#, fuzzy
+msgid "_Save Search..."
+msgstr "Schaper et rlomer..."
 
-#: widgets/misc/e-filter-bar.h:95
-msgid "Clear"
-msgstr "Netyî"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+#, fuzzy
+msgid "_Edit Saved Searches..."
+msgstr "Schaper et rlomer..."
 
-#: widgets/misc/e-filter-bar.h:102
-msgid "Show All"
-msgstr "Mostrer tot"
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "_Advanced..."
+msgstr "Po les spepieus..."
 
-#: widgets/misc/e-messagebox.c:152
-msgid "Information"
-msgstr "Informåcion"
+#: widgets/misc/e-image-chooser.c:172
+msgid "Choose Image"
+msgstr ""
 
-#: widgets/misc/e-messagebox.c:173
-msgid "Question"
-msgstr "Kesse"
+#: widgets/misc/e-search-bar.c:540
+msgid "_Search"
+msgstr "_Cweri"
 
-#: widgets/misc/e-messagebox.c:180
-msgid "Message"
-msgstr "Messaedje"
+#: widgets/misc/e-search-bar.c:546
+msgid "_Find Now"
+msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+#, fuzzy
+msgid "_Clear"
+msgstr "Netyî"
+
+#: widgets/misc/e-search-bar.c:837
+msgid "Item ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:342
-msgid "Sear_ch"
+#: widgets/misc/e-search-bar.c:844
+msgid "Subitem ID"
 msgstr ""
 
-#: widgets/misc/e-search-bar.c:468
-msgid "Find Now"
+#: widgets/misc/e-search-bar.c:851
+#, fuzzy
+msgid "Text"
+msgstr "Sayî"
+
+#: widgets/misc/e-search-bar.c:931
+msgid "Find _Now"
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
-msgid "The Personal Addressbook Server"
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
 msgstr ""
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
-msgid "The Personal Calendar Server; calendar factory"
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
 msgstr ""
+"%s egzisteye dedja\n"
+"El voloz spotchî?"
 
-#: wombat/wombat.c:200
-msgid "setup_vfs(): could not initialize GNOME-VFS"
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
 msgstr ""
 
-#: wombat/wombat.c:212
-msgid "init_corba(): could not initialize GNOME"
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
 msgstr ""
 
-#: wombat/wombat.c:225
-msgid "init_bonobo(): could not initialize Bonobo"
+#: widgets/misc/e-task-widget.c:212
+#, c-format
+msgid "%s (...)"
+msgstr ""
+
+#: widgets/misc/e-task-widget.c:217
+#, c-format
+msgid "%s (%d%% complete)"
 msgstr ""
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "No do fitchî:"
+
+#~ msgid "URL:"
+#~ msgstr "Hårdêye:"
+
+#~ msgid "Primary"
+#~ msgstr "Prumioûle"
+
+#~ msgid "Prim"
+#~ msgstr "Prum."
+
+#~ msgid "Business"
+#~ msgstr "Ovraedje"
+
+#~ msgid "Bus"
+#~ msgstr "Ovr."
+
+#~ msgid "Comp"
+#~ msgstr "Eter."
+
+#~ msgid "Org"
+#~ msgstr "Org."
+
+#~ msgid "Mobile"
+#~ msgstr "Axhlåve"
+
+#~ msgid "Car"
+#~ msgstr "Vweteure"
+
+#~ msgid "Business 2"
+#~ msgstr "Ovraedje 2"
+
+#~ msgid "Bus 2"
+#~ msgstr "Ovr. 2"
+
+#~ msgid "Home 2"
+#~ msgstr "Måjhon 2"
+
+#~ msgid "ISDN"
+#~ msgstr "RDSI"
+
+#~ msgid "TTY"
+#~ msgstr "TTY"
+
+#~ msgid "Url"
+#~ msgstr "Hårdêye"
+
+#~ msgid "Department"
+#~ msgstr "Dépårtumint"
+
+#~ msgid "Off"
+#~ msgstr "Buro"
+
+#~ msgid "Prof"
+#~ msgstr "Mestî"
+
+#~ msgid "Man"
+#~ msgstr "Man."
+
+#~ msgid "Calendar URI"
+#~ msgstr "Hårdêye do calindrî"
+
+#~ msgid "Anniv"
+#~ msgstr "Aniv."
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "Advanced"
+#~ msgstr "Sipepieus"
+
+#~ msgid "Base"
+#~ msgstr "Båze"
+
+#~ msgid "One"
+#~ msgstr "Onk"
+
+#~ msgid "Server Name"
+#~ msgstr "No do sierveu"
+
+#~ msgid "Add_ress..."
+#~ msgstr "_Adresse..."
+
+#~ msgid "East Timor"
+#~ msgstr "Timor Esse"
+
+#~ msgid "Yugoslavia"
+#~ msgstr "Yugoslaveye"
+
+#~ msgid "Check Address"
+#~ msgstr "Verifyî adresse"
+
+#~ msgid "Check Full Name"
+#~ msgstr "Verifyî li no etir"
+
+#~ msgid "Time"
+#~ msgstr "Eure"
+
+#~ msgid "_General"
+#~ msgstr "_Djenerå"
+
+#~ msgid "_Other"
+#~ msgstr "_Ôte"
+
+#~ msgid "F_ree"
+#~ msgstr "_Libe"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_vé"
+
+#~ msgid "_Modify"
+#~ msgstr "_Candjî"
+
+#~ msgid "URL"
+#~ msgstr "Hårdêye"
+
+#~ msgid "_Options"
+#~ msgstr "_Tchuzes"
+
+#~ msgid "1 byte"
+#~ msgstr "1 octet"
+
+#~ msgid "%u bytes"
+#~ msgstr "%u octets"
+
+#~ msgid "Insert File"
+#~ msgstr "Sititchî on fitchî"
+
+#~ msgid "Error"
+#~ msgstr "Aroke"
+
+#~ msgid "year"
+#~ msgstr "anêye"
+
+#~ msgid "minute"
+#~ msgstr "munute"
+
+#~ msgid "Add action"
+#~ msgstr "Radjouter accion"
+
+#~ msgid "Execute Shell Command"
+#~ msgstr "Enonder ene kimande do shell"
+
+#~ msgid "Rules"
+#~ msgstr "Rîles"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "Composer"
+#~ msgstr "Compositeu"
+
+#~ msgid "Configuration"
+#~ msgstr "Apontiaedje"
+
+#~ msgid "Edit..."
+#~ msgstr "Candjî..."
+
+#~ msgid "News"
+#~ msgstr "Copinreyes (newsgroups)"
+
+#~ msgid "Sent"
+#~ msgstr "Evoyî"
+
+#~ msgid "Sources"
+#~ msgstr "Sourdants"
+
+#~ msgid "(No subject)"
+#~ msgstr "(Nou sudjet)"
+
+#~ msgid "Africa"
+#~ msgstr "Afrike"
+
+#~ msgid "Alabama"
+#~ msgstr "Alabama"
+
+#~ msgid "Alberta"
+#~ msgstr "Alberta"
+
+#~ msgid "Antalya"
+#~ msgstr "Antalya"
+
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Antigua eyet Barbuda"
+
+#~ msgid "Arizona"
+#~ msgstr "Arizona"
+
+#~ msgid "Arkansas"
+#~ msgstr "Arkansas"
+
+#~ msgid "Bari"
+#~ msgstr "Bari"
+
+#~ msgid "Berlin"
+#~ msgstr "Berlin"
+
+#~ msgid "Bosnia-Herzegovina"
+#~ msgstr "Bosneye ey Herzegovine"
+
+#~ msgid "British Columbia"
+#~ msgstr "Colombeye britanike"
+
+#~ msgid "California"
+#~ msgstr "Californeye"
+
+#~ msgid "Catania"
+#~ msgstr "Catania"
+
+#~ msgid "Central and South America"
+#~ msgstr "Amerike nonnrece et cintråle"
+
+#~ msgid "Chania"
+#~ msgstr "Chania"
+
+#~ msgid "Charleroi-Brussels South"
+#~ msgstr "Gochliye-Tchårlerwè"
+
+#~ msgid "Charleston"
+#~ msgstr "Charleston"
+
+#~ msgid "Chattanooga"
+#~ msgstr "Chattanooga"
+
+#~ msgid "Cheyenne"
+#~ msgstr "Tcheyinne"
+
+#~ msgid "Chinandega"
+#~ msgstr "Chinandega"
+
+#~ msgid "Cordoba"
+#~ msgstr "Córdoba"
+
+#~ msgid "Coventry"
+#~ msgstr "Coventry"
+
+#~ msgid "Delaware"
+#~ msgstr "Delaware"
+
+#~ msgid "District of Columbia"
+#~ msgstr "Washington D.C."
+
+#~ msgid "Europe"
+#~ msgstr "Europe"
+
+#~ msgid "Firenze"
+#~ msgstr "Firenze"
+
+#~ msgid "Florida"
+#~ msgstr "Floride"
+
+#~ msgid "Goteborg (Landvetter)"
+#~ msgstr "Göteborg (Landvetter)"
+
+#~ msgid "Goteborg (Save)"
+#~ msgstr "Göteborg (Save)"
+
+#~ msgid "Granada"
+#~ msgstr "Grenåde"
+
+#~ msgid "Hawaii"
+#~ msgstr "Hawaii"
+
+#~ msgid "Illinois"
+#~ msgstr "Illinois"
+
+#~ msgid "Indiana"
+#~ msgstr "Indiana"
+
+#~ msgid "Iowa"
+#~ msgstr "Iowa"
+
+#~ msgid "Istanbul"
+#~ msgstr "Istanbul"
+
+#~ msgid "Kansas"
+#~ msgstr "Kansas"
+
+#~ msgid "Kentucky"
+#~ msgstr "Kentucky"
+
+#~ msgid "Kerman"
+#~ msgstr "Kerman"
+
+#~ msgid "Korea, Republic of"
+#~ msgstr "Corêye (nonnrece)"
+
+#~ msgid "Larnaka"
+#~ msgstr "Larnaka"
+
+#~ msgid "Liege"
+#~ msgstr "Lidje"
+
+#~ msgid "Ljubljana"
+#~ msgstr "Ljubljana"
+
+#~ msgid "Maine"
+#~ msgstr "Maine"
+
+#~ msgid "Manitoba"
+#~ msgstr "Manitoba"
+
+#~ msgid "Maribor"
+#~ msgstr "Maribor"
+
+#~ msgid "Maryland"
+#~ msgstr "Maryland"
+
+#~ msgid "Massachusetts"
+#~ msgstr "Massachusetts"
+
+#~ msgid "Michigan"
+#~ msgstr "Michigan"
+
+#~ msgid "Minnesota"
+#~ msgstr "Minnesota"
+
+#~ msgid "Mississippi"
+#~ msgstr "Mississipi"
+
+#~ msgid "Missouri"
+#~ msgstr "Missouri"
+
+#~ msgid "Moldova"
+#~ msgstr "Moldova"
+
+#~ msgid "Montana"
+#~ msgstr "Montana"
+
+#~ msgid "Nebraska"
+#~ msgstr "Nebraska"
+
+#~ msgid "Nevada"
+#~ msgstr "Nevada"
+
+#~ msgid "New Brunswick"
+#~ msgstr "Noû Brunswick"
+
+#~ msgid "Newfoundland"
+#~ msgstr "Terre Neuve"
+
+#~ msgid "New Hampshire"
+#~ msgstr "Noû Hampshire"
+
+#~ msgid "New Mexico"
+#~ msgstr "Noû Mecsike"
+
+#~ msgid "Ohio"
+#~ msgstr "Ohio"
+
+#~ msgid "Oklahoma"
+#~ msgstr "Oklahoma"
+
+#~ msgid "Ontario"
+#~ msgstr "Ontario"
+
+#~ msgid "Oregon"
+#~ msgstr "Oregon"
+
+#~ msgid "Pennsylvania"
+#~ msgstr "Pensilvaneye"
+
+#~ msgid "People's Republic of China"
+#~ msgstr "Republike populaire di Chine"
+
+#~ msgid "Perugia"
+#~ msgstr "Perugia"
+
+#~ msgid "Quebec"
+#~ msgstr "Québec"
+
+#~ msgid "Rhode Island"
+#~ msgstr "Rhode Island"
+
+#~ msgid "Russia"
+#~ msgstr "Russeye"
+
+#~ msgid "San Juan"
+#~ msgstr "San Juan"
+
+#~ msgid "Saskatchewan"
+#~ msgstr "Saskatchewan"
+
+#~ msgid "Southampton"
+#~ msgstr "Southampton"
+
+#~ msgid "South Carolina"
+#~ msgstr "Caroline nonnrece"
+
+#~ msgid "South Dakota"
+#~ msgstr "Dakota nonnrece"
+
+#~ msgid "Tennessee"
+#~ msgstr "Tennessee"
+
+#~ msgid "Texas"
+#~ msgstr "Texas"
+
+#~ msgid "Trapani"
+#~ msgstr "Trapani"
+
+#~ msgid "Utah"
+#~ msgstr "Utah"
+
+#~ msgid "Vicenza"
+#~ msgstr "Vicenza"
+
+#~ msgid "Virginia"
+#~ msgstr "Virdjineye"
+
+#~ msgid "Washington"
+#~ msgstr "Washington"
+
+#~ msgid "West Virginia"
+#~ msgstr "Virdjineye di l' ouwess"
+
+#~ msgid "Wisconsin"
+#~ msgstr "Wisconsin"
+
+#~ msgid "Wyoming"
+#~ msgstr "Wyoming"
+
+#~ msgid "Zaragoza"
+#~ msgstr "Zaragoza"
+
+#~ msgid "Zell Am See"
+#~ msgstr "Zell Am See"
+
+#~ msgid "Zuni Pueblo"
+#~ msgstr "Zuni Pueblo"
+
+#~ msgid "Zurich"
+#~ msgstr "Zurich"
+
+#~ msgid "Please wait..."
+#~ msgstr "Tårdjîz on po, s' i vs plait..."
+
+#~ msgid "knots"
+#~ msgstr "nouks"
+
+#~ msgid "kph"
+#~ msgstr "km/h"
+
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
+
+#~ msgid "miles"
+#~ msgstr "meyes"
+
+#~ msgid "kilometers"
+#~ msgstr "kilometes"
+
+#~ msgid "North - NorthEast"
+#~ msgstr "Nôr - Nôresse"
+
+#~ msgid "Northeast"
+#~ msgstr "Nôresse"
+
+#~ msgid "East - NorthEast"
+#~ msgstr "Esse - Nôresse"
+
+#~ msgid "East"
+#~ msgstr "Esse"
+
+#~ msgid "East - Southeast"
+#~ msgstr "Esse - Sudesse"
+
+#~ msgid "Southeast"
+#~ msgstr "Sudesse"
+
+#~ msgid "South - Southeast"
+#~ msgstr "Sud - Sudesse"
+
+#~ msgid "South"
+#~ msgstr "Sud"
+
+#~ msgid "South - Southwest"
+#~ msgstr "Sud - Sudouwesse"
+
+#~ msgid "Southwest"
+#~ msgstr "Sudouwesse"
+
+#~ msgid "West - Southwest"
+#~ msgstr "Ouwesse - Sudouwesse"
+
+#~ msgid "West"
+#~ msgstr "Ouwesse"
+
+#~ msgid "West - Northwest"
+#~ msgstr "Ouwesse - Nôrouwesse"
+
+#~ msgid "Northwest"
+#~ msgstr "Nôrouwesse"
+
+#~ msgid "North - Northwest"
+#~ msgstr "Nôr - Nôrouwesse"
+
+#~ msgid "Rain"
+#~ msgstr "Plouve"
+
+#~ msgid "Rain in the vicinity"
+#~ msgstr "Plouve dins l' vijhnaedje"
+
+#~ msgid "Moderate rain"
+#~ msgstr "Plovinaedje"
+
+#~ msgid "Snow"
+#~ msgstr "Nive"
+
+#~ msgid "Snow in the vicinity"
+#~ msgstr "Nive dins l' vijhnaedje"
+
+#~ msgid "Moderate snow"
+#~ msgstr "Nivtaedje"
+
+#~ msgid "Snowstorm"
+#~ msgstr "Timpesse di nive"
+
+#~ msgid "Volcanic ash in the vicinity"
+#~ msgstr "Cindes di volcan dins l' vijhnaedje"
+
+#~ msgid "Dust"
+#~ msgstr "Poussire"
+
+#~ msgid "Dust in the vicinity"
+#~ msgstr "Poussire dins l' vijhnaedje"
+
+#~ msgid "Sandstorm"
+#~ msgstr "Timpesse di såvlon"
+
+#~ msgid "Sandstorm in the vicinity"
+#~ msgstr "Timpesse di såvlon dins l' vijhnaedje"
+
+#~ msgid "Duststorm"
+#~ msgstr "Timpesse di poussire"
+
+#~ msgid "Duststorm in the vicinity"
+#~ msgstr "Timpesse di poussire dins l' vijhnaedje"
+
+#~ msgid "Show temperatures in:"
+#~ msgstr "Mostrer les timperateures e:"
+
+#~ msgid "Weather settings"
+#~ msgstr "Apontiaedjes pol meteyo"
+
+#~ msgid "_Fahrenheit"
+#~ msgstr "_Fahrenheit"
+
+#~ msgid "_Five days"
+#~ msgstr "_Cénk djoûs"
+
+#~ msgid "Outbox"
+#~ msgstr "Messaedjes e rexhowe"
+
+#~ msgid "(None)"
+#~ msgstr "(Nouk)"
+
+#~ msgid "Group name:"
+#~ msgstr "No do groupe:"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Rascourtis"
+
+#~ msgid "I/O error"
+#~ msgstr "Aroke d' I/R"
+
+#~ msgid "CORBA error"
+#~ msgstr "Aroke CORBA"
+
+#~ msgid "Invalid URI"
+#~ msgstr "Hårdêye nén valåve"
+
+#~ msgid "Host"
+#~ msgstr "Lodjoe"
+
+#~ msgid "Go to _Date"
+#~ msgstr "Potchî a ene _date"
+
+#~ msgid "_Appointment..."
+#~ msgstr "_Radjoû..."
+
+#~ msgid "Print..."
+#~ msgstr "Imprimer..."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Prôpietés..."
+
+#~ msgid "Reload"
+#~ msgstr "Ritcherdjî"
+
+#~ msgid "Question"
+#~ msgstr "Kesse"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f17bf4d50d..379d8aada4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-18 19:14+0200\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-06-19 11:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -24,14 +24,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution 地址簿"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "联系人头衔："
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "当前地址簿文件夹 "
@@ -52,34 +44,257 @@ msgstr " 张卡片"
 msgid " card"
 msgstr " 张卡片"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "联系人头衔："
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "无法发送项目！\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+#, fuzzy
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 Caps "
+"Lock 灯可能为开。"
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "此存储不支持订阅，或订阅未启用。"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "无法从服务器获取组列表。"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "IMAP 服务器应答不含有 %s 信息"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "无法装入地址簿"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr "{0}"
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "没有描述。"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "保存在地址簿中"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "装入默认地址簿错误。"
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "无法处理脱机文件夹"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "您希望保存更改吗？"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "丢弃(_D)"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "以及另外 %d 个联系人。"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+#, fuzzy
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"您即将把联系人从一个地址簿移动到另外一个地址簿，但是无法从源地址簿删除该联系"
+"人。您想要换作复制联系人吗？"
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "无法分析邮件内容"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "添加联系人出错"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution 地址簿地址查看器"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "默认的同步地址："
 
-#: addressbook/conduit/address-conduit.c:1155
 #: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "无法装入地址簿"
 
-#: addressbook/conduit/address-conduit.c:1224
-#: addressbook/conduit/address-conduit.c:1227
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr "*Control*F2"
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "认证失败。\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "自动完成"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s为 %s 输入口令 (用户 %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "联系人(_O)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "证书"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "在此配置自动完成"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "联系人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿卡片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime 证书管理控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "在此管理您的 S/MIME 证书"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -110,7 +325,8 @@ msgid "New Contacts Group"
 msgstr "新建联系人组"
 
 #: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
 msgstr "联系人组(_C)"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,18 +349,14 @@ msgid "Migrating `%s':"
 msgstr "升迁“%s”："
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "在此计算机中"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -207,17 +419,17 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: addressbook/gui/component/addressbook-view.c:673
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
-#: addressbook/gui/component/addressbook-view.c:752
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "新地址簿"
 
-#: addressbook/gui/component/addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
@@ -227,17 +439,25 @@ msgstr "新地址簿"
 msgid "Delete"
 msgstr "删除"
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "属性..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:993
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "联系人"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名访问 LDAP 服务器"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "认证失败。\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s为 %s 输入口令 (用户 %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -257,58 +477,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr "*Control*F2"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "自动完成"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "联系人(_O)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "证书"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "在此配置自动完成"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿卡片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 证书管理控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "在此管理您的 S/MIME 证书"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -316,7 +484,7 @@ msgstr "在此管理您的 S/MIME 证书"
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -325,7 +493,7 @@ msgstr "在此管理您的 S/MIME 证书"
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-dialogs.glade.h:6
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -351,6 +519,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 msgid "<b>Authentication</b>"
 msgstr "<b>身份验证</b>"
 
@@ -392,13 +561,11 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:199
 msgid "Basic"
 msgstr "基本"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:208 mail/mail-dialogs.glade.h:13
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "细节"
 
@@ -617,33 +784,26 @@ msgid "cards"
 msgstr "卡片"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分钟"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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:208
+msgid "Remove All"
+msgstr "全部删除"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 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/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部删除"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "查看联系人列表"
@@ -666,15 +826,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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "从地址簿中选择联系人"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -696,6 +863,11 @@ msgstr "类别(_A)："
 msgid "_Find"
 msgstr "查找(_F)"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "搜索(_S)"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
 msgstr "<b>电子邮件</b>"
@@ -733,7 +905,7 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr "AIM"
@@ -755,7 +927,6 @@ msgid "Birthday:"
 msgstr "生日："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "日历："
 
@@ -768,7 +939,7 @@ msgid "Company:"
 msgstr "公司："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
 #: 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:181
@@ -776,7 +947,7 @@ msgid "Contact"
 msgstr "联系人"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -868,8 +1039,8 @@ msgstr "Web 日志："
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -892,18 +1063,6 @@ msgstr "存档于(_F)："
 msgid "_Where:"
 msgstr "何处(_W)："
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除此联系人吗？"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:350
 #: addressbook/gui/widgets/eab-contact-display.c:365
@@ -911,16 +1070,16 @@ msgid "Address"
 msgstr "地址"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "可编辑"
 
@@ -1892,77 +2051,99 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 即时通讯程序"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:336
-msgid "Yahoo"
-msgstr "雅虎"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "雅虎通"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:332
-msgid "GroupWise"
-msgstr "GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "服务"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "位置"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "用户名"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "家庭"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "其它"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "雅虎"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "来源地址簿"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr "目标地址簿"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "已更改"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2356
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "此联系人属于这些类别："
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2437
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 msgid "No image"
 msgstr "无图像"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -1970,22 +2151,17 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr "联系人无法保存到选中的地址簿。您想要丢弃更改吗？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2731
-#: addressbook/gui/contact-editor/e-contact-editor.c:2755
-msgid "_Discard"
-msgstr "丢弃(_D)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2750
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -1993,28 +2169,6 @@ msgstr ""
 "您即将把联系人从一个地址簿移动到另外一个地址簿，但是无法从源地址簿删除该联系"
 "人。您想要换作复制联系人吗？"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 即时通讯程序"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "雅虎通"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "服务"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "位置"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "用户名"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
@@ -2032,6 +2186,18 @@ msgstr "全名(_F)："
 msgid "E-_mail:"
 msgstr "电子邮件(_M)："
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除这些联系人吗？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除此联系人吗？"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "地址 _2："
@@ -2187,16 +2353,16 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)："
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
+#: smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "地址簿"
 
@@ -2257,6 +2423,397 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "高级搜索"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "无联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d 个联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "查询"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "获取名簿视图出错"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "模型"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "修改卡片错误"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "姓名以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "邮件以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "类别为"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "任何域含有"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "高级..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "类型"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+msgid "Address Book"
+msgstr "地址簿"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "另存为 VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "新建联系人..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "新建联系人列表..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "转到文件夹..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "导入..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "搜索联系人..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+msgid "Address Book Sources..."
+msgstr "地址簿来源..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Pilot 设置..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "给联系人发邮件"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "打印"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "打印信封"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+msgid "Copy to Address Book..."
+msgstr "复制到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+msgid "Move to Address Book..."
+msgstr "移动到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪切"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "粘贴"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "当前视图"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "任何类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "助手"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "助手电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "商务传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "商务电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "商务电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "回拨电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "车载电话"
+
+#: 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:3
+msgid "Categories"
+msgstr "类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "公司电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "电子邮件"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "电子邮件 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "电子邮件 3"
+
+#: 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 "Given Name"
+msgstr "名"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "家庭传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "家庭电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN 电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "日记"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "经理"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "移动电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "昵称"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "注释"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "办公室"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+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
+msgid "Other Phone"
+msgstr "其它电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "寻呼机"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "主要电话"
+
+#: 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:234
+#: 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:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "电传"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "头衔"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "单位"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "网站"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "宽度"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "高度"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "有焦点"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "域"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "域名"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "文字模型"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "最大域名长度"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "列宽"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。\n"
+"\n"
+"请在此双击以创建新联系人。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "适配器"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已选择"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有光标"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2277,11 +2834,6 @@ msgstr "列出成员"
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "组织"
-
 #: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "Position"
 msgstr "位置"
@@ -2312,30 +2864,14 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:364
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "移动电话"
-
 #: addressbook/gui/widgets/eab-contact-display.c:368
 msgid "personal"
 msgstr "个人"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "注释"
-
 #: addressbook/gui/widgets/eab-contact-display.c:541
 msgid "Job Title"
 msgstr "职称"
 
-#: addressbook/gui/widgets/eab-contact-display.c:545
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "电子邮件"
-
 #: addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Home page"
 msgstr "主页"
@@ -2392,12 +2928,12 @@ msgstr "不支持的协议"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
 #: camel/camel-service.c:724 camel/camel-service.c:762
 #: camel/camel-service.c:846 camel/camel-service.c:886
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "已经取消"
 
@@ -2596,16 +3132,6 @@ msgstr "(无)"
 msgid "Primary Email"
 msgstr "主电子邮件"
 
-#: addressbook/gui/widgets/eab-popup-control.c:441
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "电子邮件 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:451
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "电子邮件 3"
-
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "选择一项活动"
@@ -2651,367 +3177,6 @@ msgstr "显示紧凑 VCard"
 msgid "Save in addressbook"
 msgstr "保存在地址簿中"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "无联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d 个联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "查询"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "获取名簿视图出错"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "模型"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "修改卡片错误"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "姓名以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "邮件以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "类别为"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "任何域含有"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "高级..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "类型"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:535
-msgid "Address Book"
-msgstr "地址簿"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:879
-#: addressbook/gui/widgets/e-addressbook-view.c:1099
-#: addressbook/gui/widgets/e-addressbook-view.c:2107
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "另存为 VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-msgid "New Contact..."
-msgstr "新建联系人..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-msgid "New Contact List..."
-msgstr "新建联系人列表..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-msgid "Go to Folder..."
-msgstr "转到文件夹..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
-msgid "Import..."
-msgstr "导入..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1093
-msgid "Search for Contacts..."
-msgstr "搜索联系人..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
-msgid "Address Book Sources..."
-msgstr "地址簿来源..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1096
-msgid "Pilot Settings..."
-msgstr "Pilot 设置..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1101
-msgid "Send Message to Contact"
-msgstr "给联系人发邮件"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1102 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "打印"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
-msgid "Print Envelope"
-msgstr "打印信封"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1108
-msgid "Copy to Address Book..."
-msgstr "复制到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1109
-msgid "Move to Address Book..."
-msgstr "移动到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪切"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1114
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "粘贴"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/e-calendar-view.c:1327
-msgid "Current View"
-msgstr "当前视图"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1692
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "任何类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "助手"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "助手电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "商务传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "商务电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "商务电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "回拨电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "车载电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/e-calendar-table.etspec.h:3
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "Categories"
-msgstr "类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司电话"
-
-#: 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 "Given Name"
-msgstr "名"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "家庭传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "家庭电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "家庭电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN 电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "日记"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "经理"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "昵称"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "办公室"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "其它传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "其它电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "寻呼机"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "主要电话"
-
-#: 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:234
-#: 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:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "电传"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "头衔"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "单位"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "网站"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "宽度"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "高度"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "有焦点"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已选择"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有光标"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "域"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "域名"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "文字模型"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "最大域名长度"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。\n"
-"\n"
-"请在此双击以创建新联系人。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "适配器"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "列宽"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "卡片视图"
@@ -3020,17 +3185,17 @@ msgstr "卡片视图"
 msgid "GTK Tree View"
 msgstr "GTK 树视图"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "回溯测试"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: 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 "版权 (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "这应该测试回溯原始项目"
 
@@ -3054,6 +3219,11 @@ msgstr "Evolution vCard 导入器"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vfg, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "打印信封"
+
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "打印联系人"
@@ -3063,11 +3233,6 @@ msgstr "打印联系人"
 msgid "Print contact"
 msgstr "打印联系人"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "打印信封"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3252,6 +3417,20 @@ msgstr "联系人打印测试"
 msgid "This should test the contact print code"
 msgstr "这应该测试联系人打印代码"
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "无法打开文件"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr "无法获得地址簿列表"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr "打开地址簿失败"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
@@ -3306,20 +3485,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "不可能的内部错误。"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "无法打开文件"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "无法获得地址簿列表"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "打开地址簿失败"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "装入默认地址簿错误。"
@@ -3336,6 +3501,262 @@ msgstr "没有提供文件名。"
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "不删除"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "发送给："
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "您确信您要删除该账户吗？"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "您确定要删除此联系人吗？"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "您确信您要删除该账户吗？"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "您确信您要删除该账户吗？"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "您确信您要删除该账户吗？"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "您确定要删除这些联系人吗？"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "您确信您要删除该账户吗？"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "您确定要删除这些联系人吗？"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "您确定要删除这些联系人吗？"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "您确定要删除这些联系人吗？"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "约会"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "您希望保存更改吗？"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗？"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+msgid "Discard Changes"
+msgstr "丢弃更改"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "保存邮件"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "发送"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar 导入器"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
@@ -3346,29 +3767,93 @@ msgid "Split Multi-Day Events:"
 msgstr "分割多日事件："
 
 #: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
-msgstr "无法启动 wombat 服务器"
-
 #: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "无法启动 wombat"
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
+msgstr "无法启动 wombat 服务器"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "默认优先级："
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr "*Control*F3"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr "*Control*F4"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "日历"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在此配置您的时区、日历和任务列表 "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度邮件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution 任务组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+msgid "_Calendars"
+msgstr "日历(_C)"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "任务(_T)"
+
+#: 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:213
 msgid "Starting:"
 msgstr "开始："
@@ -3461,10 +3946,6 @@ 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:139
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
@@ -3605,8 +4086,28 @@ msgstr "是以 24 小时格式还是以 12 小时格式显示时间"
 msgid "Whether to show week numbers in date navigator"
 msgstr "是否在日期浏览器中显示周数"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "概要含有"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "注释含有"
+
+#: calendar/gui/cal-search-bar.c:53
+msgid "Location contains"
+msgstr "位置含有"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "无匹配"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
@@ -3626,7 +4127,7 @@ msgid "Purge events older than"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "天数"
@@ -3637,12 +4138,8 @@ 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.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m月%d日%A"
@@ -3690,56 +4187,52 @@ msgstr "无法打开日历“%s”来创建事件和会议"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有可创建事件和会议的日历"
 
-#: calendar/gui/calendar-component.c:1060
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/calendar-component.c:1223
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "新建约会"
 
-#: calendar/gui/calendar-component.c:1224
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: calendar/gui/calendar-component.c:1225
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: calendar/gui/calendar-component.c:1231
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "新闻会议"
 
-#: calendar/gui/calendar-component.c:1232
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: calendar/gui/calendar-component.c:1233
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: calendar/gui/calendar-component.c:1239
+#: calendar/gui/calendar-component.c:1240
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: calendar/gui/calendar-component.c:1240
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "全天约会(_D)"
 
-#: calendar/gui/calendar-component.c:1241
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: calendar/gui/calendar-component.c:1247
+#: calendar/gui/calendar-component.c:1248
 msgid "New calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:1248
-msgid "C_alendar"
-msgstr "日历(_A)"
-
 #: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "日历"
+
+#: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -3769,26 +4262,6 @@ msgstr "周视图"
 msgid "Month View"
 msgstr "月视图"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "概要含有"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "描述含有"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "注释含有"
-
-#: calendar/gui/cal-search-bar.c:53
-msgid "Location contains"
-msgstr "位置含有"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "无匹配"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "打开日历时出错"
@@ -3806,211 +4279,133 @@ msgstr "没有权限打开日历"
 msgid "open_client(): %s"
 msgstr "open_client()：%s"
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "音频提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "邮件提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "邮件提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "程序提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "未知提醒选项"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "提醒重复"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "要显示的邮件："
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "要发送的邮件"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "播放声音："
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "重复提醒"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "运行程序："
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "发送给："
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "使用这些参数："
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>提醒</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "每个额外时间"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>日历列表选项</b>"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
-msgid "hours"
-msgstr "小时"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>常规</b>"
 
-#: calendar/gui/dialogs/alarm-page.c:815
-msgid "Action/Trigger"
-msgstr "动作/触发器"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "添加日历"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "添加(_D)"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "撰写邮件"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "基本"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "日期/时间："
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "邮件(_M)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr "弹出警告"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "提醒"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "运行程序"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "发送给："
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "发送电子邮件"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "概要："
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "地址(_A)："
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "运行程序"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "选项(_O)..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "重复提醒"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "发送(_S)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "之后"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "之前"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "天"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "约会结束"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "每个额外时间"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "小时"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "小时"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "分钟"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "约会开始"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "您必须获取日历的位置。"
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "源位置“%s”不是规格的。"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "源位置“%s”不是 Webcal 源。"
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "选中组中已经存在名为“%s”的源"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "“%s”是远程组。您必须指定可获取日历的位置"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "添加日历"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "添加任务组"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "颜色(_O)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "添加日历(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Group"
-msgstr "添加组(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "刷新(_R)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-msgid "_Type:"
-msgstr "类型(_T)："
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "动作/触发器"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL："
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "添加(_D)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
-msgid "weeks"
-msgstr "周"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#, fuzzy
+msgid "Alarms"
+msgstr "在 %s 时提醒"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4119,7 +4514,7 @@ msgid "Free/Busy Publishing"
 msgstr "忙/闲发布"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "星期五"
@@ -4133,7 +4528,7 @@ msgid "Minutes"
 msgstr "分钟"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "星期一"
@@ -4143,7 +4538,7 @@ msgid "S_un"
 msgstr "周日(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1077
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "星期六"
@@ -4157,7 +4552,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1078
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "星期日"
@@ -4171,7 +4566,7 @@ msgid "T_hu"
 msgstr "周四(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "星期四"
@@ -4185,7 +4580,7 @@ msgid "Time format:"
 msgstr "时间格式："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1073
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "星期二"
@@ -4195,7 +4590,7 @@ msgid "W_eek starts:"
 msgstr "一周开始(_E)："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "星期三"
@@ -4228,7 +4623,8 @@ msgstr "不在月视图中显示周末(_C)"
 msgid "_Day begins:"
 msgstr "一天开始(_D)："
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4278,6 +4674,72 @@ msgstr "周三(_W)"
 msgid "before every appointment"
 msgstr "在每次约会前"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "您必须获取日历的位置。"
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "源位置“%s”不是规格的。"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "源位置“%s”不是 Webcal 源。"
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "选中组中已经存在名为“%s”的源"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "“%s”是远程组。您必须指定可获取日历的位置"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "添加日历"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "添加任务组"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "颜色(_O)："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "选取一种颜色"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "添加日历(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Group"
+msgstr "添加组(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+msgid "_Refresh:"
+msgstr "刷新(_R)："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+msgid "_Type:"
+msgstr "类型(_T)："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URL："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "周"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "该事件已经被删除。"
@@ -4322,79 +4784,73 @@ msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
 
-#: calendar/gui/dialogs/comp-editor.c:429
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "校验错误：%s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (预定 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "预定 "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: calendar/gui/dialogs/comp-editor.c:900
-#: calendar/gui/dialogs/comp-editor.c:937
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: calendar/gui/dialogs/comp-editor.c:905
-#: calendar/gui/dialogs/comp-editor.c:942
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日志条目 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:922
-#: calendar/gui/dialogs/comp-editor.c:958
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "没有概要"
 
-#: calendar/gui/dialogs/comp-editor.c:1398
-#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "另存为..."
-
-#: calendar/gui/dialogs/comp-editor.c:1501
-#: calendar/gui/dialogs/comp-editor.c:1536
-#: calendar/gui/dialogs/comp-editor.c:1562
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: calendar/gui/dialogs/comp-editor.c:1586
+#: calendar/gui/dialogs/comp-editor.c:1387
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误：%s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (预定 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "预定 "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "无法打开源"
@@ -4456,8 +4912,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "地址簿..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "联系人"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4467,132 +4924,190 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: calendar/gui/dialogs/event-editor.c:207 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "约会"
 
-#: calendar/gui/dialogs/event-editor.c:216
-msgid "Reminder"
-msgstr "提醒"
-
-#: calendar/gui/dialogs/event-editor.c:223
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "再现"
 
-#: calendar/gui/dialogs/event-editor.c:230
-#: calendar/gui/dialogs/event-editor.c:303
-#: calendar/gui/dialogs/event-editor.c:447
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "调度"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:306
-#: calendar/gui/dialogs/event-editor.c:450 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "方向"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "会议"
 
-#: calendar/gui/dialogs/event-page.c:490
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: calendar/gui/dialogs/event-page.c:493
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: calendar/gui/dialogs/event-page.c:649 calendar/gui/dialogs/task-page.c:516
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: calendar/gui/dialogs/event-page.c:659
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: calendar/gui/dialogs/event-page.c:682
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: calendar/gui/dialogs/event-page.c:689
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: calendar/gui/dialogs/event-page.c:1296
+#: calendar/gui/dialogs/event-page.c:1605
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "在每次约会前"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "约会结束"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "在每次约会前"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "全天事务(_L)"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "在每次约会前"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "忙(_U)"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "在每次约会前"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "类别(_T)..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "在每次约会前"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>任务列表</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "分类"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>时间</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "机密(_N)"
+msgid "A_ll day event"
+msgstr "全天事务(_L)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "日期和时间"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "保存当前视图..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "闲(_R)"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "类别(_T)..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "位置(_O)："
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "日历："
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "私有(_V)"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "分类"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "公开(_B)"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "机密"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "将时间显示为"
+msgid "L_ocation:"
+msgstr "位置(_O)："
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "保密"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "公开"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "将时间显示为"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "概要(_U)："
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "清除(_C)"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "描述："
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
 #: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:928
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
 #: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
 #: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
@@ -4601,32 +5116,26 @@ msgstr "开始时间(_S)："
 msgid "None"
 msgstr "无"
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: calendar/gui/dialogs/meeting-page.c:444
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: calendar/gui/dialogs/meeting-page.c:459
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "需要至少一个参加者。"
 
-#: calendar/gui/dialogs/meeting-page.c:677
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "授权于(_D)..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:681
-#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
-#: mail/em-folder-tree.c:2584 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "删除(_D)"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "删除(_R)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4671,6 +5180,7 @@ msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/dialogs/task-editor.c:158
 #: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
@@ -4679,21 +5189,30 @@ msgid "Status"
 msgstr "状态"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "Add A_ttendee"
-msgstr "添加出席者(_T)"
+#, fuzzy
+msgid "<b>Attendees</b>"
+msgstr "<b>提醒</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Add attendees from addressbook."
-msgstr "从地址簿添加出席者。"
+#, fuzzy
+msgid "<b>Organizer</b>"
+msgstr "<b>其它</b>"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "改变组织者(_C)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "组织者："
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "联系人"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "改变组织者(_C)"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "组织者："
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -4760,146 +5279,137 @@ msgstr "本次和以后各次"
 msgid "All Instances"
 msgstr "所有各次"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的循环。"
 
-#: calendar/gui/dialogs/recurrence-page.c:844
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "在"
 
-#: calendar/gui/dialogs/recurrence-page.c:1016
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "第一"
 
-#: calendar/gui/dialogs/recurrence-page.c:1017
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "第二"
 
-#: calendar/gui/dialogs/recurrence-page.c:1018
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "第三"
 
-#: calendar/gui/dialogs/recurrence-page.c:1019
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "第四"
 
-#: calendar/gui/dialogs/recurrence-page.c:1020
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "最后"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "其它日期"
 
-#: calendar/gui/dialogs/recurrence-page.c:1071
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "天"
 
-#: calendar/gui/dialogs/recurrence-page.c:1208
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "在"
 
-#: calendar/gui/dialogs/recurrence-page.c:1394
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "循环"
 
-#: calendar/gui/dialogs/recurrence-page.c:2378
+#: calendar/gui/dialogs/recurrence-page.c:2309
 msgid "Date/Time"
 msgstr "日期/时间"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "每"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "例外"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
-msgstr "预览"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "再现规则"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "定制再现(_C)"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "修改(_M)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>预览</b>"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "不再现(_N)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "再现"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "删除(_R)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "每"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "简单再现(_S)"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "编辑约会(_E)"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "只"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "永远"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "月"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "直到"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "周"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/select-source-dialog.c:77
+#: calendar/gui/dialogs/select-source-dialog.c:84
 msgid "Select destination"
 msgstr "选择目的"
 
-#: calendar/gui/dialogs/select-source-dialog.c:98
+#: calendar/gui/dialogs/select-source-dialog.c:106
 msgid "_Destination"
 msgstr "目的(_D)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:100
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "任务列表"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<span weight=\"bold\">邮件字体</span>"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "完成百分比(_C)"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "<span weight=\"bold\">警告</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
 #: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
 #: calendar/gui/print.c:2346
 msgid "Completed"
@@ -4913,8 +5423,8 @@ msgstr "高"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "进行中"
@@ -4926,22 +5436,22 @@ msgid "Low"
 msgstr "低"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "尚未开始"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "进度"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "完成率：%i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -4964,36 +5474,42 @@ msgstr "状态(_S)："
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
-#: calendar/gui/dialogs/task-editor.c:215
-#: calendar/gui/dialogs/task-editor.c:278
-#: calendar/gui/dialogs/task-editor.c:415
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "任务"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "指派"
 
-#: calendar/gui/dialogs/task-page.c:489
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: calendar/gui/dialogs/task-page.c:826
+#: calendar/gui/dialogs/task-page.c:831
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "机密(_F)"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">选项</span>"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "<span weight=\"bold\">删除邮件</span>"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
 #: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "描述："
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "文件夹："
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "Sta_rt date:"
 msgstr "开始日期(_R)："
@@ -5002,52 +5518,58 @@ msgstr "开始日期(_R)："
 msgid "_Due date:"
 msgstr "到期日期(_D)："
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "Authentication Credentials for HTTP Server"
-msgstr ""
+#: calendar/gui/dialogs/task-page.glade.h:13
+#, fuzzy
+msgid "_Group:"
+msgstr "组"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "选中要发布的日历"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>日历选项</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "Daily"
-msgstr "每日"
+#, fuzzy
+msgid "<b>Publishing Frequency</b>"
+msgstr "公布频率"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Editor"
-msgstr "忙闲编辑器"
+#, fuzzy
+msgid "<b>Publishing _Location</b>"
+msgstr "忙/闲公布位置"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "忙/闲公布位置"
+msgid "Free/Busy Editor"
+msgstr "忙闲编辑器"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "登录名："
+#, fuzzy
+msgid "_Daily"
+msgstr "每日"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "密码："
+#, fuzzy
+msgid "_Manual"
+msgstr "邮件(_M)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "公布频率"
+#, fuzzy
+msgid "_Password:"
+msgstr "密码："
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
 msgstr "记住密码"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL："
+#, fuzzy
+msgid "_Username:"
+msgstr "用户名(_N)："
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr "用户发布"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
 msgstr "每周"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5124,7 +5646,7 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2378
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
@@ -5133,6 +5655,11 @@ msgstr "单击以打开 %s"
 msgid "Untitled"
 msgstr "无标题"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "概要："
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 msgid "Start Date:"
@@ -5156,20 +5683,93 @@ msgstr "优先级："
 msgid "Web Page:"
 msgstr "网页："
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "公开"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "结束日期"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "保密"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "开始日期"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "机密"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "概要"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "空闲"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "繁忙"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "北"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "南"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "东"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "西"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理位置必须以此格式输入：\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "是"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "否"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "未知"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "重复"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "已指派"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5215,15 +5815,6 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "空闲"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
-msgid "Busy"
-msgstr "繁忙"
-
 #: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
@@ -5234,7 +5825,7 @@ msgstr "更新对象"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
 #: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -5244,7 +5835,7 @@ msgstr "打开网页(_W)"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
 #: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存为(_S)..."
@@ -5267,7 +5858,7 @@ msgstr "剪切(_U)"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
 #: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
-#: mail/em-folder-tree.c:960 mail/message-list.c:1650
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
 #: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
 #: ui/evolution-tasks.xml.h:20
@@ -5298,10 +5889,25 @@ msgstr "标记为完成(_M)"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "把任务标记为完成(_M)"
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "删除(_D)"
+
 #: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "删除选定的任务(_D)"
 
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "另存为..."
+
 #: calendar/gui/e-calendar-table.c:1350
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
@@ -5333,11 +5939,6 @@ msgstr "优先级"
 msgid "Start date"
 msgstr "开始日期"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:22
-msgid "Summary"
-msgstr "概要"
-
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "任务排序"
@@ -5414,95 +6015,13 @@ msgstr "转到日期(_G)..."
 msgid "_Settings..."
 msgstr "设置(_S)..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "结束日期"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "开始日期"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1179
-#: camel/providers/imap4/camel-imap4-utils.c:293
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1117
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "未知"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "重复"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "已指派"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "是"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "北"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "南"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "东"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理位置必须以此格式输入：\n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: 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.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: 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"
@@ -5519,43 +6038,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分钟分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%B%d日"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分钟分割"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "上午"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "下午"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5681,7 +6193,7 @@ msgstr "更新"
 #: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
 #: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
 #: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "确定"
 
@@ -5898,51 +6410,35 @@ msgstr "附件中没有可查看的日历项目"
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1805 calendar/gui/e-itip-control.c:1877
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "由于条目不再存在而无法更新参与者状态"
-
-#: calendar/gui/e-itip-control.c:1821 calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？"
 
-#: calendar/gui/e-itip-control.c:1843
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1862
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA 系统出错\n"
-
-#: calendar/gui/e-itip-control.c:1865
-msgid "Object could not be found\n"
-msgstr "找不到对象\n"
-
-#: calendar/gui/e-itip-control.c:1868
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "您没有适当的权限打开日历\n"
-
-#: calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
-#: calendar/gui/e-itip-control.c:1874
-msgid "Attendee status could not be updated!\n"
-msgstr "无法更新参与者状态！\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1905
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "删除完成"
 
-#: calendar/gui/e-itip-control.c:1928 calendar/gui/e-itip-control.c:1976
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: calendar/gui/e-itip-control.c:1930 calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
@@ -5971,6 +6467,10 @@ msgstr "装入日历"
 msgid "Loading calendar..."
 msgstr "正在装入日历..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "组织者："
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "服务器消息："
@@ -6041,7 +6541,7 @@ msgid "Needs Action"
 msgstr "需要动作"
 
 #: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暂时的"
 
@@ -6054,100 +6554,81 @@ msgstr "被委任的"
 msgid "In Process"
 msgstr "处理中"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%Y年%m月%d日%A"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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 "%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:1604
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
+
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "没有信息"
 
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "Add attendees from addressbook"
-msgstr "从地址簿添加出席者"
-
-#: calendar/gui/e-meeting-time-sel.c:442
-msgid "_Options"
-msgstr "选项(_O)"
+#: calendar/gui/e-meeting-time-sel.c:432
+#, fuzzy
+msgid "O_ptions"
+msgstr "选项"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:459
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
+#: calendar/gui/e-meeting-time-sel.c:539
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:548
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:557
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:566
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: calendar/gui/e-meeting-time-sel.c:595
-msgid "Meeting _start time:"
-msgstr "会议开始时间(_S)："
-
-#: calendar/gui/e-meeting-time-sel.c:615
-msgid "Meeting _end time:"
-msgstr "会议结束时间(_E)："
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2077
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2110
-#: calendar/gui/e-meeting-time-sel-item.c:456 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 "%Y年%m月%d日%A"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: 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:1604
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6166,9 +6647,7 @@ msgstr ""
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:846
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
@@ -6185,15 +6664,6 @@ msgstr "正在删除选中的对象..."
 msgid "Expunging"
 msgstr "销毁"
 
-#: calendar/gui/e-tasks.c:1088
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:873 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "任务"
-
 #: calendar/gui/gnome-cal.c:704
 msgid "Updating query"
 msgstr "更新查询"
@@ -6217,55 +6687,6 @@ msgstr "打开 %s"
 msgid "Purging"
 msgstr "销毁"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr "*Control*F3"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr "*Control*F4"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度邮件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution 任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-msgid "_Calendars"
-msgstr "日历(_C)"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "任务(_T)"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "四月"
@@ -6609,10 +7030,6 @@ msgstr "选中的月(%Y年%m月)"
 msgid "Selected year (%Y)"
 msgstr "选中的年(%Y年)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "任务"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6689,27 +7106,28 @@ msgstr "无法打开任务列表“%s”来创建事件和会议"
 msgid "There is no calendar available for creating tasks"
 msgstr "没有可创建任务的日历"
 
-#: calendar/gui/tasks-component.c:1029
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "新建任务"
 
-#: calendar/gui/tasks-component.c:1030
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: calendar/gui/tasks-component.c:1031
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: calendar/gui/tasks-component.c:1037
+#: calendar/gui/tasks-component.c:1038
 msgid "New tasks group"
 msgstr "新建任务组"
 
-#: calendar/gui/tasks-component.c:1038
-msgid "_Tasks Group"
+#: calendar/gui/tasks-component.c:1039
+#, fuzzy
+msgid "Tasks Gro_up"
 msgstr "任务组(_T)"
 
-#: calendar/gui/tasks-component.c:1039
+#: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
 msgstr "创建新任务组"
 
@@ -8469,41 +8887,6 @@ msgstr "(user-tag)参数无效"
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误：%s：%s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "不支持的操作：附加邮件：附加 %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "不支持的操作：按表达式搜索：搜索 %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "不支持的操作：按 uid 搜索：搜索 %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "移动邮件"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "复制邮件"
-
-#: camel/camel-folder.c:1665
-msgid "Learning junk"
-msgstr "学习垃圾邮件"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr "学习非垃圾邮件"
-
-#: camel/camel-folder.c:1701
-msgid "Filtering new message(s)"
-msgstr "过滤新邮件"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8547,6 +8930,41 @@ msgstr "(match-threads) 需要文件夹集"
 msgid "Performing query on unknown header: %s"
 msgstr "对未知的头进行查询：%s"
 
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "不支持的操作：附加邮件：附加 %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "不支持的操作：按表达式搜索：搜索 %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "不支持的操作：按 uid 搜索：搜索 %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "移动邮件"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "复制邮件"
+
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr "学习垃圾邮件"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr "学习非垃圾邮件"
+
+#: camel/camel-folder.c:1701
+msgid "Filtering new message(s)"
+msgstr "过滤新邮件"
+
 #: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
@@ -8662,26 +9080,6 @@ msgstr "加密内容"
 msgid "Unable to parse message content"
 msgstr "无法分析邮件内容"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "无法为 %s 创建锁定文件：%s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr "用 fcntl(2) 获取锁失败：%s"
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr "用 flock(2) 获取锁失败：%s"
-
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -8702,6 +9100,26 @@ msgstr "无法锁定“%s”：lock-helper 协议错误"
 msgid "Could not lock '%s'"
 msgstr "无法锁定“%s”"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "无法为 %s 创建锁定文件：%s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "对 %s 获取锁文件的尝试超时。请稍后再试。"
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "用 fcntl(2) 获取锁失败：%s"
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "用 flock(2) 获取锁失败：%s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9142,7 +9560,7 @@ msgstr "无法添加加密证书"
 msgid "Cannot add CMS SignerInfo"
 msgstr "无法添加 CMS 签名者信息"
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 msgid "Cannot create encoder context"
 msgstr "无法创建编码器上下文"
 
@@ -9223,7 +9641,8 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "只有证书的邮件，证书已导入并校验"
 
 #: camel/camel-smime-context.c:635
-msgid "Can't find signature digests"
+#, fuzzy
+msgid "Cannot find signature digests"
 msgstr "找不到签名摘要"
 
 #: camel/camel-smime-context.c:651
@@ -9236,47 +9655,51 @@ msgid "Decoder failed"
 msgstr "解码器失败"
 
 #: camel/camel-smime-context.c:804
-#, c-format
-msgid "Can't find certificate for `%s'"
+#, fuzzy, c-format
+msgid "Cannot find certificate for `%s'"
 msgstr "找不到“%s”的证书"
 
 #: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+#, fuzzy
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到公共批量加密算法"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+#, fuzzy
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr "无法为加密批量密钥分配密钥槽"
 
 #: camel/camel-smime-context.c:831
-msgid "Can't create CMS Message"
+#, fuzzy
+msgid "Cannot create CMS Message"
 msgstr "无法创建 CMS 邮件"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
 msgstr "无法创建 CMS 信封数据"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
 msgstr "无法附加 CMS 信封数据"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
+#, fuzzy
+msgid "Cannot attach CMS data object"
 msgstr "无法附加 CMS 数据对象"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
 msgstr "无法创建 CMS 收件人信息"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+#, fuzzy
+msgid "Cannot add CMS RecipientInfo"
 msgstr "无法添加 CMS 收件人信息"
 
-#: camel/camel-smime-context.c:877
-msgid "Can't create encoder context"
-msgstr "无法创建编码器上下文"
-
 #: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "将数据添加到编码器失败"
@@ -9321,7 +9744,8 @@ msgstr "无法创建文件夹：%s：文件夹已存在"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹：%s：无效操作"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹：%s：无效操作"
@@ -9567,7 +9991,7 @@ msgstr "无法将邮件移动或复制到虚拟文件夹中"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹：%s：没有该文件夹"
@@ -9586,8 +10010,8 @@ msgid "Checking for new mail"
 msgstr "检查新邮件"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "在所有文件夹中检查新邮件"
 
@@ -9617,8 +10041,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "访问 Novell GroupWise 服务器"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9636,315 +10060,6 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 msgid "Checklist"
 msgstr "待办清单"
 
-#: camel/providers/imap4/camel-imap4-command.c:531
-#: camel/providers/imap4/camel-imap4-command.c:538
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "向 IMAP 服务器 %s 发送命令失败：%s"
-
-#: camel/providers/imap4/camel-imap4-command.c:637
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "来自 IMAP4 服务器 %s 的意外响应：%s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:232
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "来自 IMAP 服务器 %s 的意外应答。"
-
-#: camel/providers/imap4/camel-imap4-engine.c:416
-#, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "无法选择文件夹“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-engine.c:422
-#, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "无法选择文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 服务器 %s 意外断开连接：%s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr "得到 BYE 响应"
-
-#: camel/providers/imap4/camel-imap4-folder.c:507
-#, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "无法将标志与文件夹“%s”同步：未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:513
-#, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "无法将标志与文件夹“%s”同步：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:650
-#, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "无法销毁文件夹“%s”：未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:655
-#, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "无法销毁文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:845
-#, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "无法从文件夹“%2$s”获取邮件 %1$s：没有这样的邮件"
-
-#: camel/providers/imap4/camel-imap4-folder.c:850
-#, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr "无法从文件夹“%2$s”获取邮件 %1$s：命令无效"
-
-#: camel/providers/imap4/camel-imap4-folder.c:975
-#, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "无法将邮件附加到文件夹“%s”：未知错误"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1004
-#, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "无法将邮件附加到文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1083
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”：未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1087
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”：未知"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1095
-#, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-folder.c:1099
-#, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "文件夹"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只显示订阅了的文件夹"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "覆盖服务器提供的文件夹命名空间"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "命名空间"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-msgid "IMAPv4rev1"
-msgstr "IMAPv4rev1"
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAPv4rev1 服务器上的邮件的读写。试验性！"
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
-
-#: camel/providers/imap4/camel-imap4-store.c:174
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:176
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: camel/providers/imap4/camel-imap4-store.c:217
-#: camel/providers/imap4/camel-imap4-store.c:234
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (端口 %d)：%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:219
-#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL 不可用"
-
-#: camel/providers/imap4/camel-imap4-store.c:231
-#: camel/providers/imap/camel-imap-store.c:564
-#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-#: camel/providers/imap4/camel-imap4-store.c:270
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：服务器不支持 STARTTLS"
-
-#: camel/providers/imap4/camel-imap4-store.c:295
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap/camel-imap-store.c:706
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:296
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: camel/providers/imap4/camel-imap4-store.c:382
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证"
-
-#: camel/providers/imap4/camel-imap4-store.c:427
-#, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s请输入 %s@%s 的 IMAP 密码"
-
-#: camel/providers/imap4/camel-imap4-store.c:501
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s"
-
-#: camel/providers/imap4/camel-imap4-store.c:732
-#, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s：未知"
-
-#: camel/providers/imap4/camel-imap4-store.c:794
-#: camel/providers/imap/camel-imap-store.c:1881
-#: camel/providers/imap/camel-imap-store.c:2259
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
-
-#: camel/providers/imap4/camel-imap4-store.c:838
-#, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "无法创建文件夹“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:843
-#, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "无法创建文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:871
-#, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "无法删除文件夹“%s”：特殊文件夹"
-
-#: camel/providers/imap4/camel-imap4-store.c:904
-#, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "无法删除文件夹“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:909
-#, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "无法删除文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:929
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Special folder"
-msgstr "无法将文件夹“%s”重命名为“%s”：特殊文件夹"
-
-#: camel/providers/imap4/camel-imap4-store.c:961
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
-msgstr "无法将文件夹“%s”重命名为“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:966
-#, c-format
-msgid "Cannot rename folder `%s' to `%s': Bad command"
-msgstr "无法将文件夹“%s”重命名为“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1177
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1179
-msgid "Bad command"
-msgstr "无效命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1241
-#, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "无法订阅文件夹“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:1246
-#, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "无法订阅文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-store.c:1291
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "无法退订文件夹“%s”：无效的邮箱名"
-
-#: camel/providers/imap4/camel-imap4-store.c:1296
-#, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "无法退订文件夹“%s”：无效的命令"
-
-#: camel/providers/imap4/camel-imap4-utils.c:86
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "来自 IMAP4 服务器 %s 的意外响应："
-
-#: camel/providers/imap4/camel-imap4-utils.c:109
-msgid "No data"
-msgstr "无数据"
-
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "IMAP4 服务器 %s 意外断开连接：%s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
@@ -9958,6 +10073,15 @@ msgstr "操作已取消"
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接：%s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "未知的错误"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10026,7 +10150,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10097,6 +10221,27 @@ msgstr "使用自定义命令连接到服务器"
 msgid "Command:"
 msgstr "命令："
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "文件夹"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "只显示订阅了的文件夹"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "覆盖服务器提供的文件夹命名空间"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "命名空间"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
@@ -10117,13 +10262,62 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 服务器 %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (端口 %d)：%s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL 不可用"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
+
 #: camel/providers/imap/camel-imap-store.c:676
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "不支持 SSL/TLS 扩展。"
 
 #: camel/providers/imap/camel-imap-store.c:707
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL 协商失败"
 
@@ -10170,13 +10364,21 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
+
 #: camel/providers/imap/camel-imap-store.c:1939
 #: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
 #: camel/providers/imap/camel-imap-store.c:1994
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, c-format
@@ -10188,6 +10390,229 @@ msgstr "无法创建文件夹：%s：文件夹已存在。"
 msgid "Unknown parent folder: %s"
 msgstr "未知的父文件夹：%s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "向 IMAP 服务器 %s 发送命令失败：%s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "来自 IMAP4 服务器 %s 的意外响应：%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "来自 IMAP 服务器 %s 的意外应答。"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "无法选择文件夹“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "无法选择文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 服务器 %s 意外断开连接：%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr "得到 BYE 响应"
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "无法将标志与文件夹“%s”同步：未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "无法将标志与文件夹“%s”同步：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "无法销毁文件夹“%s”：未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "无法销毁文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "无法从文件夹“%2$s”获取邮件 %1$s：没有这样的邮件"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "无法从文件夹“%2$s”获取邮件 %1$s：命令无效"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "无法将邮件附加到文件夹“%s”：未知错误"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "无法将邮件附加到文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”：未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”：未知"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法将邮件从文件夹“%s”移动到文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "无法将邮件从文件夹“%s”复制到文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+msgid "IMAPv4rev1"
+msgstr "IMAPv4rev1"
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAPv4rev1 服务器上的邮件的读写。试验性！"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败：服务器不支持 STARTTLS"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "无法使用 %2$s 身份验证算法对 IMAP 服务器 %1$s 进行身份验证"
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s请输入 %s@%s 的 IMAP 密码"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "无法使用 %2$s 认证到 IMAP 服务器 %1$s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s：未知"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "无法创建文件夹“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "无法创建文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "无法删除文件夹“%s”：特殊文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "无法删除文件夹“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "无法删除文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "无法将文件夹“%s”重命名为“%s”：特殊文件夹"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "无法将文件夹“%s”重命名为“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "无法将文件夹“%s”重命名为“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+msgid "Bad command"
+msgstr "无效命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "无法订阅文件夹“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "无法订阅文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "无法退订文件夹“%s”：无效的邮箱名"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "无法退订文件夹“%s”：无效的命令"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "来自 IMAP4 服务器 %s 的意外响应："
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+msgid "No data"
+msgstr "无数据"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "IMAP4 服务器 %s 意外断开连接：%s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10352,18 +10777,26 @@ msgstr "无法保存概要：%s：%s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "无法将邮件添加到概要中：未知的原因"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "收件箱"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "邮件目录附加已放弃"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "无法将邮件附加到邮件目录文件夹：%s：%s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10379,48 +10812,48 @@ msgstr ""
 "无法从文件夹 %2$s 获取邮件：%1$s\n"
 "  %3$s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "无效的邮件内容"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "无法获取文件夹“%s”：%s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "无法获得文件夹“%s”：文件夹不存在。"
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, c-format
 msgid "Cannot create folder `%s': %s"
 msgstr "无法创建文件夹“%s”：%s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "无法获取文件夹“%s”：不是 maildir 目录。"
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "无法删除文件夹“%s”：%s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "不是 maildir 目录"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -10860,14 +11293,20 @@ msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
-msgstr "您无法订阅此新闻组：\n\n没有这样的新闻组。选中项目可能是父文件夹。"
+msgstr ""
+"您无法订阅此新闻组：\n"
+"\n"
+"没有这样的新闻组。选中项目可能是父文件夹。"
 
 #: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
-msgstr "您无法订阅此新闻组：\n\n新闻组不存在！"
+msgstr ""
+"您无法订阅此新闻组：\n"
+"\n"
+"新闻组不存在！"
 
 #: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
@@ -10997,48 +11436,53 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "无法连接到 POP 服务器 %s (端口 %d)：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "认证到 POP 服务器 %s 失败：%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "以安全模式连接到 POP 服务器 %s 失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "无法连接到 POP 服务器 %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "无法连接到 POP 服务器 %s：不支持请求认证机制。"
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "使用SASL“%s”登录 POP 服务器 %s 失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "无法登录到 POP 服务器 %s：SASL 协议错误"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "认证到 POP 服务器 %s 失败：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s请输入 %s@%s 的 POP 密码"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11047,7 +11491,16 @@ msgstr ""
 "无法连接到 POP 服务器 %s。\n"
 "发送密码错误：%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"无法连接到 POP 服务器 %s。\n"
+"发送密码错误：%s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "没有文件夹“%s”。"
@@ -11433,78 +11886,6 @@ msgstr "MIME 类型："
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
-#: composer/e-msg-composer.c:704
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "无法对寄出的邮件签名：未对此账户设置签名证书"
-
-#: composer/e-msg-composer.c:711
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "无法对寄出的邮件加密：未对此账户设置加密证书"
-
-#: composer/e-msg-composer.c:1283
-msgid "Could not open file"
-msgstr "无法打开文件"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器获取邮件"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "无标题邮件"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "打开文件"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "自动生成的"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "签名："
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "附加了 <b>%d</b> 个文件"
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "显示附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
-msgid "Compose a message"
-msgstr "撰写邮件"
-
-#: composer/e-msg-composer.c:2649
-#, c-format
-msgid "Attached message - %s"
-msgstr "附加的邮件 - %s"
-
-#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d 封附加的邮件"
-
-#: composer/e-msg-composer.c:4332
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(编写器含有不可编辑的非文本邮件体。)<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "投递目的"
@@ -11583,17 +11964,83 @@ msgstr "单击此处以选择要投递到的文件夹"
 msgid "Attach file(s)"
 msgstr "添加附件"
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "无法对寄出的邮件签名：未对此账户设置签名证书"
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "无法对寄出的邮件加密：未对此账户设置加密证书"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "无法打开文件"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "无法从编辑器获取邮件"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "无标题邮件"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "打开文件"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "自动生成的"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "签名："
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "附加了 <b>%d</b> 个文件"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "隐藏附件栏(将附件拖至此处)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "显示附件栏(将附件拖至此处)(_A)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "撰写邮件"
+
+#: composer/e-msg-composer.c:2649
+#, c-format
+msgid "Attached message - %s"
+msgstr "附加的邮件 - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "%d 封附加的邮件"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(编写器含有不可编辑的非文本邮件体。)<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "您无法将文件“{0}”作为此邮件的附件。"
 
-#. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11617,11 +12064,6 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr "无法从 {0} 获取要附加的邮件。"
 
 #. mail-composer:attach-nomessages secondary
-#. mail-composer:no-sig-file secondary
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
 #: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
 #: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -11683,12 +12125,8 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"关闭此编写窗口将会永久丢弃邮件，除非您选择在草稿文件夹中保存此邮件。"
-"这允许您在稍后继续编写邮件。"
-
-#: composer/mail-composer-errors.xml.h:33
-msgid "Discard Changes"
-msgstr "丢弃更改"
+"关闭此编写窗口将会永久丢弃邮件，除非您选择在草稿文件夹中保存此邮件。这允许您"
+"在稍后继续编写邮件。"
 
 #: composer/mail-composer-errors.xml.h:34
 msgid "Save Message"
@@ -11720,7 +12158,6 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
 
 #. mail-composer:no-address-control primary
-#. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
@@ -11888,16 +12325,12 @@ msgstr "同步类别："
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %A %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %A %H:%M"
@@ -11949,31 +12382,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H点"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12059,7 +12484,6 @@ msgid "Missing file name."
 msgstr "缺少文件名。"
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "您必须指定文件名。"
@@ -12080,7 +12504,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "无法编译正则表达式“{1}”。"
 
 #. filter:no-name primary
-#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "缺少名称。"
@@ -12104,64 +12527,6 @@ msgstr "请另选一个名称。"
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>过滤规则(_F)</b>"
-
-#: filter/filter.glade.h:2
-msgid "Compare against"
-msgstr "比较"
-
-#: filter/filter.glade.h:3
-msgid "Incoming"
-msgstr "接收"
-
-#: filter/filter.glade.h:4
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr "邮件的日期将会与指定日期的午夜12:00进行比较。"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr "邮件的日期将会在过滤执行时与指定时间进行比较。"
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
-
-#: filter/filter.glade.h:11
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#: filter/filter.glade.h:12
-msgid "ago"
-msgstr "过去"
-
-#: filter/filter.glade.h:16
-msgid "months"
-msgstr "月"
-
-#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "秒"
-
-#: filter/filter.glade.h:18
-msgid "the current time"
-msgstr "当前时间"
-
-#: filter/filter.glade.h:19
-msgid "the time you specify"
-msgstr "您指定的时间"
-
-#: filter/filter.glade.h:21
-msgid "years"
-msgstr "年"
-
 #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
 #: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
@@ -12227,6 +12592,64 @@ msgstr "接收"
 msgid "outgoing"
 msgstr "发送"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>过滤规则(_F)</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "比较"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "接收"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr "邮件的日期将会与指定日期的午夜12:00进行比较。"
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr "邮件的日期将会在过滤执行时与指定时间进行比较。"
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr "邮件的日期将会在过滤执行时与当前时间进行比较。"
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "过去"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "月"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "秒"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "当前时间"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "年"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "添加规则"
@@ -12239,6 +12662,70 @@ msgstr "编辑规则"
 msgid "Rule name"
 msgstr "规则名"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr "*Control*F1"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "编写器首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项，包括安全和邮件显示"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和邮件编写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账户"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+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-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+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:99
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "邮件(_M)"
+
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
 msgid "[Default]"
@@ -12290,7 +12777,7 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "过滤规则(_F)"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:493
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
 #: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "选择文件夹"
@@ -12424,7 +12911,7 @@ msgstr "未标志"
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:927
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "标签"
@@ -12529,8 +13016,8 @@ msgstr "开始于"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: mail/em-filter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -12572,7 +13059,7 @@ msgstr "<单击此处以便选择文件夹>"
 msgid "Create New Folder"
 msgstr "创建新文件夹"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2310
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
 #: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
@@ -12585,378 +13072,399 @@ msgstr "创建"
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "虚拟文件夹"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "不匹配"
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "正在装入..."
+
+#: mail/em-folder-tree.c:846
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: mail/em-folder-tree.c:843
+#: mail/em-folder-tree.c:848
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把邮件移动到文件夹 %s"
 
-#: mail/em-folder-tree.c:852 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把邮件复制到文件夹 %s"
 
-#: mail/em-folder-tree.c:868
+#: mail/em-folder-tree.c:873
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将邮件放到顶级文件夹存储"
 
-#: mail/em-folder-tree.c:958 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
-#: mail/em-folder-tree.c:959 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
-#: mail/em-folder-tree.c:961 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: mail/em-folder-tree.c:963 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "取消拖曳(_D)"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-tree.c:2096
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: mail/em-folder-tree.c:2083 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: mail/em-folder-tree.c:2123
+#: mail/em-folder-tree.c:2144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s”"
 
-#: mail/em-folder-tree.c:2310 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: mail/em-folder-tree.c:2499
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
 
-#: mail/em-folder-tree.c:2501
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "重命名文件夹"
 
-#: mail/em-folder-tree.c:2572 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "查看(_V)"
 
-#: mail/em-folder-tree.c:2573
+#: mail/em-folder-tree.c:2604
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
-#: mail/em-folder-tree.c:2577
+#: mail/em-folder-tree.c:2608
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: mail/em-folder-tree.c:2578
+#: mail/em-folder-tree.c:2609
 msgid "_Move..."
 msgstr "移动(_M)..."
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2582
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: mail/em-folder-tree.c:2585
+#: mail/em-folder-tree.c:2616
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: mail/em-folder-tree.c:2588 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:872
-msgid "VFolders"
-msgstr "虚拟文件夹"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr "不匹配"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "收件箱"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "正在装入..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
-msgid "Mail"
-msgstr "邮件"
-
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "跟随(_W)..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_M)"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_V)..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿(_B)"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "应用过滤规则(_Y)"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 msgid "F_ilter Junk"
 msgstr "过滤垃圾(_I)"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "从邮件创建规则(_T)"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "基于主题的虚拟文件夹(_S)"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "基于发件人的虚拟文件夹(_N)"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "基于收件人的虚拟文件夹(_R)"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "基于邮件列表的虚拟文件夹(_L)"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "默认"
 
-#: mail/em-folder-view.c:1847
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "打印邮件"
 
-#: mail/em-folder-view.c:2108
+#: mail/em-folder-view.c:2112
 msgid "_Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: mail/em-folder-view.c:2373
+#: mail/em-folder-view.c:2377
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "发件人"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "回复至"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件人"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "抄送"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "密件抄送"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 邮件：未知错误"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 邮件。显示源文本。"
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "不支持的签名格式"
-
-#: mail/em-format.c:1306
-msgid "Error verifying signature"
-msgstr "校验签名错误"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "校验签名发生了未知错误"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, c-format
-msgid "Retrieving `%s'"
-msgstr "收取“%s”"
+msgid "Matches: %d"
+msgstr "匹配：%d"
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 msgid "Unsigned"
 msgstr "未签名"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:641
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "此邮件未签名。无法保证此邮件是可信的。"
+
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "此邮件已签名，而且签名是有效的。这意味着这封邮件应该是可信的。"
+
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr "签名有效但是无法校验发送者"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr "无法校验此邮件的签名，可能在传送的过程中邮件被篡改了。"
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr "签名有效，无法校验发送者"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:644
+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:650 mail/em-format-html.c:568
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr "此邮件未加密。在 Internet 上传送时所有人都可以看到其内容。"
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:651
+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:652 mail/em-format-html.c:570
 msgid "Encrypted"
 msgstr "加密"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr "强加密"
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+msgid "_View Certificate"
+msgstr "查看证书(_V)"
+
+#: mail/em-format-html-display.c:769
+msgid "This certificate is not viewable"
+msgstr "此证书不可查看"
+
+#: mail/em-format-html-display.c:1004
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%Y年%m月%d日%A，%H:%M完成"
+
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "延误："
+
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "到 %m月%d日%A，%H:%M"
+
+#: mail/em-format-html-display.c:1085
+msgid "_View Inline"
+msgstr "嵌入视图(_V)"
+
+#: mail/em-format-html-display.c:1086
+msgid "_Hide"
+msgstr "隐藏(_H)"
+
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d 页，共 %d 页"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "收取“%s”"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr "签名有效但是无法校验发送者"
+
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
@@ -12990,6 +13498,32 @@ msgstr "指向未知的外部数据 (“%s”类型)"
 msgid "Formatting message"
 msgstr "格式化邮件"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "发件人"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "回复至"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件人"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "抄送"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "密件抄送"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
 #: mail/em-mailer-prefs.c:939
@@ -13006,102 +13540,43 @@ msgstr "<I> (%A，%R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr "匹配：%d"
-
-#: mail/em-format-html-display.c:644
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "此邮件未签名。无法保证此邮件是可信的。"
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "此邮件已签名，而且签名是有效的。这意味着这封邮件应该是可信的。"
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr "无法校验此邮件的签名，可能在传送的过程中邮件被篡改了。"
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr "签名有效，无法校验发送者"
-
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr "此邮件的签名有效，但是无法校验邮件的发送者。"
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日期"
 
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr "此邮件未加密。在 Internet 上传送时所有人都可以看到其内容。"
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "新闻组"
 
-#: mail/em-format-html-display.c:654
-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.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附件"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr "此邮件已加密。外人要想查看此邮件的内容十分困难。"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 S/MIME 邮件：未知错误"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
-"此邮件已加密，且使用的是强加密算法。如果外人想要查看此邮件的内容，可能要花大量"
-"时间进行暴力破解，这十分困难。"
-
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-msgid "_View Certificate"
-msgstr "查看证书(_V)"
-
-#: mail/em-format-html-display.c:772
-msgid "This certificate is not viewable"
-msgstr "此证书不可查看"
-
-#: mail/em-format-html-display.c:1007
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%m月%d日%A，%H:%M完成"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "延误："
 
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%H:%M"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 邮件。显示源文本。"
 
-#: mail/em-format-html-display.c:1088
-msgid "_View Inline"
-msgstr "嵌入视图(_V)"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "不支持的签名格式"
 
-#: mail/em-format-html-display.c:1089
-msgid "_Hide"
-msgstr "隐藏(_H)"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "校验签名错误"
 
-#: mail/em-format-html-print.c:130
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d 页，共 %d 页"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "校验签名发生了未知错误"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13179,8 +13654,8 @@ msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"无法从先前的 Evolution 安装中读取设置，“evolution/config."
-"xmldb”不存在或者已损坏。"
+"无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
+"坏。"
 
 #: mail/em-popup.c:700
 msgid "Save As..."
@@ -13211,7 +13686,7 @@ msgstr "把邮件发送到列表(_N)..."
 msgid "_Add to Addressbook"
 msgstr "添加到地址簿(_A)"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -13258,7 +13733,7 @@ msgid "Add address"
 msgstr "添加地址"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的邮件"
@@ -13267,11 +13742,11 @@ msgstr "来自 %s 的邮件"
 msgid "Virtual _Folders"
 msgstr "虚拟文件夹(_F)"
 
-#: mail/em-vfolder-rule.c:493
+#: mail/em-vfolder-rule.c:494
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: mail/em-vfolder-rule.c:573
+#: mail/em-vfolder-rule.c:574
 msgid "VFolder source"
 msgstr "虚拟文件夹来源"
 
@@ -13737,62 +14212,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "导入"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr "*Control*F1"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "编写器首选项"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项，包括安全和邮件显示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和邮件编写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账户"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "邮件账户"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "邮件(_M)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13850,34 +14296,6 @@ msgstr "导入“%s”"
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14107,14 +14525,6 @@ msgstr "创建新邮件文件夹"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升级邮件设置或文件夹失败。"
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "检查服务"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "正在连接服务器..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "标识"
@@ -14172,6 +14582,14 @@ msgstr ""
 "您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，"
 "成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "检查服务"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "正在连接服务器..."
+
 #: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
 msgid "    "
 msgstr "    "
@@ -14180,10 +14598,6 @@ msgstr "    "
 msgid " Ch_eck for Supported Types "
 msgstr "检查支持的类型(_E)"
 
-#: mail/mail-config.glade.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>预览</b>"
-
 #: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>(在此版本的 evolution 中不支持 SSL)</b>"
@@ -14435,7 +14849,7 @@ msgstr "无法引用原始邮件"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_M)"
 
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
@@ -14791,7 +15205,7 @@ msgstr "<span weight=\"bold\">加密</span>"
 msgid "Accept License"
 msgstr "接受协议"
 
-#: mail/mail-dialogs.glade.h:11
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
 msgid "C_ompleted"
 msgstr "已完成(_O)"
 
@@ -14808,6 +15222,7 @@ msgid "Find:"
 msgstr "查找："
 
 #: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
@@ -14831,7 +15246,7 @@ msgstr "服务器(_E)："
 msgid "Security Information"
 msgstr "安全信息"
 
-#: mail/mail-dialogs.glade.h:23
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14843,11 +15258,11 @@ msgstr ""
 msgid "Tick this to accept the license agreement"
 msgstr "选中此处以表明您接受许可协议"
 
-#: mail/mail-dialogs.glade.h:26
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "延期人(_D)："
 
-#: mail/mail-dialogs.glade.h:27
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "标志(_F)："
 
@@ -14894,12 +15309,13 @@ msgstr "您以登录到服务器“{0}”失败。"
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；"
-"您的 Caps Lock 灯可能为开。"
+"选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 Caps "
+"Lock 灯可能为开。"
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -14914,12 +15330,15 @@ msgid ""
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"请确定下列受检人想要并可以接收 HTML 邮件：\n{0}\n仍然发送吗？"
+"请确定下列受检人想要并可以接收 HTML 邮件：\n"
+"{0}\n"
+"仍然发送吗？"
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
 msgid "_Send"
-msgstr "发送(_S)"
+msgstr "发送"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -14934,7 +15353,6 @@ msgid ""
 msgstr "在您的邮件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。"
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "您确定想要发送只有 BCC 收件人的邮件吗？"
@@ -14997,7 +15415,6 @@ msgid ""
 msgstr "从该文件夹永久删除所有已删除的邮件"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15064,21 +15481,6 @@ msgstr "执行操作时错误。"
 msgid "{0}."
 msgstr "{0}。"
 
-#. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr "{0}"
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 msgid "Enter password."
@@ -15095,8 +15497,6 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "无法保存到目录“{0}”。"
 
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15133,7 +15533,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除系统文件夹“{0}”。"
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15164,13 +15563,11 @@ msgstr ""
 "如果您删除了文件夹，其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "无法将“{0}”重命名为“{1}”。"
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "名为“{1}”的文件夹已经存在。请使用不同的名称。"
@@ -15181,25 +15578,21 @@ msgid "Because \"{2}\"."
 msgstr "原因是“{2}”。"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”移动到“{1}”。"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "无法打开源“{2}”。"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "无法打开目标“{2}”。"
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”复制到“{1}”。"
@@ -15215,7 +15608,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "无法打开源“{1}”"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "无法将更改保存到账户。"
@@ -15237,17 +15629,21 @@ msgstr "删除账户吗？"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
+#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确定要删除此联系人吗？"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
+#, fuzzy
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
+"如果您删除了文件夹，其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "不删除"
+msgstr "取消删除(_U)"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15276,6 +15672,7 @@ msgstr "丢弃更改吗？"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
+#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "您希望保存更改吗？"
 
@@ -15815,6 +16212,53 @@ msgstr "全部回复"
 msgid "Review"
 msgstr "回顾"
 
+#: mail/searchtypes.xml.h:1
+#, fuzzy
+msgid "Body contains"
+msgstr "含有"
+
+#: mail/searchtypes.xml.h:2
+#, fuzzy
+msgid "Body does not contain"
+msgstr "不含有"
+
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "邮件体或主题含有"
+
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "邮件含有"
+
+#: mail/searchtypes.xml.h:5
+#, fuzzy
+msgid "Recipients contain"
+msgstr "描述含有"
+
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "发件人含有"
+
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "主题含有"
+
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "主题不含有"
+
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 测试"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 测试组件"
+
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15878,30 +16322,19 @@ msgstr "是否跳过开发警告对话框"
 msgid "mail"
 msgstr "邮件"
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:786
-msgid "Uknown system error."
-msgstr "未知的系统错误。"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "无效参数"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "无法注册到 OAF"
+#: shell/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "<b>身份验证</b>"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "找不到配置数据库"
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "执行动作"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "通用错误"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16078,23 +16511,6 @@ msgstr "文件夹名不能含有字符“#”。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是保留文件夹名。"
 
-#: shell/e-shell-window.c:337
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-
-#: shell/e-shell-window.c:344
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution 正在脱机过程中。"
-
-#: shell/e-shell-window.c:350
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
-
-#: shell/e-shell-window.c:637
-#, c-format
-msgid "Switch to %s"
-msgstr "切换到 %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具好像并未安装到系统中。"
@@ -16128,10 +16544,88 @@ msgstr "脱机工作(_W)"
 msgid "Work Offline"
 msgstr "脱机工作"
 
+#: shell/e-shell-window.c:337
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
+
+#: shell/e-shell-window.c:344
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution 正在脱机过程中。"
+
+#: shell/e-shell-window.c:350
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
+
+#: shell/e-shell-window.c:637
+#, c-format
+msgid "Switch to %s"
+msgstr "切换到 %s"
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:774
+msgid "Uknown system error."
+msgstr "未知的系统错误。"
+
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "无效参数"
+
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "无法注册到 OAF"
+
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "找不到配置数据库"
+
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "通用错误"
+
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "新建"
 
+#: shell/evolution-startup-wizard.glade.h:2
+#, fuzzy
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 导入助手"
+
+#: shell/evolution-startup-wizard.glade.h:3
+#, fuzzy
+msgid "Importing Files"
+msgstr "导入文件"
+
+#: shell/evolution-startup-wizard.glade.h:4
+#, fuzzy
+msgid "Timezone "
+msgstr "时区(_Z)："
+
+#: shell/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr ""
+
+#: shell/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 ""
+
+#: shell/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 ""
+
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新建测试"
@@ -16144,18 +16638,6 @@ msgstr "测试(_T)"
 msgid "Create a new test item"
 msgstr "创建新测试项"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 测试"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 测试组件"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "单击“导入”以便开始将文件导入到 Evolution。"
@@ -16214,7 +16696,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以从下列文件中导入数据："
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:235
+#: shell/main.c:225
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16246,7 +16728,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: shell/main.c:259
+#: shell/main.c:249
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16254,39 +16736,39 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: shell/main.c:266
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "不要再问我"
 
-#: shell/main.c:471
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr "启动 Evolution 并激活指定组件"
 
-#: shell/main.c:473
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "以脱机模式启动"
 
-#: shell/main.c:475
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "以联机模式启动"
 
-#: shell/main.c:478
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: shell/main.c:482
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 重新升迁"
 
-#: shell/main.c:485
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: shell/main.c:509
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:513
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16295,6 +16777,94 @@ msgstr ""
 "%s：不能同时使用 --online 和 --offline。\n"
 "  详情请使用 %s --help。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
+
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
+
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
+
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "含有"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "无法启动 wombat 服务器"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 账户助手"
+
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
+
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
@@ -16535,6 +17105,11 @@ msgstr "您的证书"
 msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "证书已经存在"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
@@ -16746,11 +17321,6 @@ msgstr "主题唯一 ID"
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "证书已经存在"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
@@ -16890,8 +17460,8 @@ msgstr "查看当前联系人"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "操作(_A)"
@@ -17364,16 +17934,6 @@ msgstr "反转选择(_I)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "关闭(_C)"
-
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
@@ -17774,6 +18334,16 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "取消删除(_U)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "关闭(_C)"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附件"
@@ -17856,10 +18426,6 @@ msgstr "用不同的文件名保存当前文件"
 msgid "Save the message in a specified folder"
 msgstr "在指定的文件夹中保存邮件"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "发送"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -18558,6 +19124,162 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "选中要发布的日历"
+
+#~ msgid "Login name:"
+#~ msgstr "登录名："
+
+#~ msgid "URL:"
+#~ msgstr "URL："
+
+#~ msgid "User Publishes"
+#~ msgstr "用户发布"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "无法启动 wombat"
+
+#~ msgid "C_alendar"
+#~ msgstr "日历(_A)"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "音频提醒选项"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "邮件提醒选项"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "邮件提醒选项"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "程序提醒选项"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "未知提醒选项"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "提醒重复"
+
+#~ msgid "Message to Display:"
+#~ msgstr "要显示的邮件："
+
+#~ msgid "Message to Send"
+#~ msgstr "要发送的邮件"
+
+#~ msgid "Play sound:"
+#~ msgstr "播放声音："
+
+#~ msgid "Run program:"
+#~ msgstr "运行程序："
+
+#~ msgid "With these arguments:"
+#~ msgstr "使用这些参数："
+
+#~ msgid "Basics"
+#~ msgstr "基本"
+
+#~ msgid "Date/Time:"
+#~ msgstr "日期/时间："
+
+#~ msgid "Reminders"
+#~ msgstr "提醒"
+
+#~ msgid "_Options..."
+#~ msgstr "选项(_O)..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "地址簿..."
+
+#~ msgid "Reminder"
+#~ msgstr "提醒"
+
+#~ msgid "B_usy"
+#~ msgstr "忙(_U)"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "机密(_N)"
+
+#~ msgid "Date & Time"
+#~ msgstr "日期和时间"
+
+#~ msgid "F_ree"
+#~ msgstr "闲(_R)"
+
+#~ msgid "Pri_vate"
+#~ msgstr "私有(_V)"
+
+#~ msgid "Pu_blic"
+#~ msgstr "公开(_B)"
+
+#~ msgid "Add A_ttendee"
+#~ msgstr "添加出席者(_T)"
+
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "从地址簿添加出席者。"
+
+#~ msgid "Preview"
+#~ msgstr "预览"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "再现规则"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "定制再现(_C)"
+
+#~ msgid "_Modify"
+#~ msgstr "修改(_M)"
+
+#~ msgid "_No recurrence"
+#~ msgstr "不再现(_N)"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "简单再现(_S)"
+
+#~ msgid "% _Complete"
+#~ msgstr "完成百分比(_C)"
+
+#~ msgid "Progress"
+#~ msgstr "进度"
+
+#~ msgid "Con_fidential"
+#~ msgstr "机密(_F)"
+
+#~ msgid "Folder:"
+#~ msgstr "文件夹："
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA 系统出错\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "找不到对象\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "您没有适当的权限打开日历\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "无法更新参与者状态！\n"
+
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "从地址簿添加出席者"
+
+#~ msgid "_Options"
+#~ msgstr "选项(_O)"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "会议开始时间(_S)："
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "会议结束时间(_E)："
+
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "找不到“%s”的证书"
+
+#~ msgid "Can't create CMS Message"
+#~ msgstr "无法创建 CMS 邮件"
+
+#~ msgid "Can't create encoder context"
+#~ msgstr "无法创建编码器上下文"
+
 #~ msgid ""
 #~ "Selected calendar is read-only, events cannot be created. Please select a "
 #~ "read-write calendar."
@@ -18571,21 +19293,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "_Score Rules"
 #~ msgstr "计分规则(_S)"
 
-#~ msgid "Body or subject contains"
-#~ msgstr "邮件体或主题含有"
-
-#~ msgid "Message contains"
-#~ msgstr "邮件含有"
-
-#~ msgid "Sender contains"
-#~ msgstr "发件人含有"
-
-#~ msgid "Subject contains"
-#~ msgstr "主题含有"
-
-#~ msgid "Subject does not contain"
-#~ msgstr "主题不含有"
-
 #~ msgid "Properties"
 #~ msgstr "属性"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2350622072..96c516abd0 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: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder.liao@msa.hinet.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -23,18 +23,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution 目錄服務迷你名片檢視"
 
-# ui/evolution-addressbook.xml.h:17
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "連絡人: "
-
-# ui/evolution.xml.h:17
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution 視窗(_W)"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -70,40 +58,291 @@ msgstr "名片"
 msgid " card"
 msgstr "1 張名片"
 
+# ui/evolution-addressbook.xml.h:17
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "連絡人: "
+
+# ui/evolution.xml.h:17
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution 視窗(_W)"
+
+# addressbook/conduit/address-conduit.c:201
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "無法載入滑鼠游標\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+# camel/providers/imap/camel-imap-store.c:531
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "無法驗證進入 LDAP 伺服器"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "伺服器回報了不支援的搜尋起點"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
+
+# camel/camel-movemail.c:306
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "無法取得群組：%s"
+
+# camel/providers/imap/camel-imap-command.c:487
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "伺服器沒有回應有效的模式資訊"
+
+# camel/camel-provider.c:140
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "無法載入 %s：%s"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:207
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "類別編輯器無法使用。"
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "存入目錄服務"
+
+# composer/e-msg-composer.c:805
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "載入預設目錄服務時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "進行搜尋時發生錯誤"
+
+# calendar/gui/dialogs/save-comp.c:51
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "您是否須要儲存變更？"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "放棄(_D)"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "和 1 個其他名片。"
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "無法從編輯器取得郵件"
+
+# shell/e-shell-importer.c:404
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "新增名片時發生錯誤"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
 # mail/mail-config.glade.h:29
-#: addressbook/conduit/address-conduit.c:272
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
 # camel/camel-provider.c:140
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "無法載入 %s：%s"
 
 # addressbook/conduit/address-conduit.c:687
 # addressbook/conduit/address-conduit.c:690
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "正以匿名方式存取 LDAP 伺服器"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "驗證憑證失敗。\n"
+# mail/mail-config.glade.h:76
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自動補齊資料夾"
 
-# camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "連絡人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "憑證 ID(_C):"
+
+# ui/evolution-mail.xml.h:19
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "在此設定您的郵件帳號"
+
+# ui/evolution-addressbook.xml.h:17
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "連絡人"
+
+# 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"
+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 pop-up"
+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 address viewer"
+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 card viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 測試元件。"
+
+# 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/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
 #: addressbook/gui/component/addressbook-component.c:93
@@ -146,7 +385,7 @@ msgstr "新的連絡人:"
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "連絡人(_C):"
 
 # shell/e-shortcuts-view.c:292
@@ -175,15 +414,15 @@ msgid "Migrating `%s':"
 msgstr "Pinging %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -193,24 +432,24 @@ msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "自動補齊資料夾"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -218,34 +457,34 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # importers/pine-importer.c:661
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 #, fuzzy
 msgid "New Address Book"
 msgstr "目錄服務"
@@ -261,11 +500,12 @@ msgstr "目錄服務"
 # 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-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 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
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
@@ -275,18 +515,26 @@ msgstr "刪除"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "屬性..."
 
-# ui/evolution-addressbook.xml.h:17
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "連絡人"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "正以匿名方式存取 LDAP 伺服器"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "驗證憑證失敗。\n"
+
+# camel/camel-smime-context.c:194
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -306,77 +554,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-# mail/mail-config.glade.h:76
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Autocompletion"
-msgstr "自動補齊資料夾"
-
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "連絡人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Certificates"
-msgstr "憑證 ID(_C):"
-
-# ui/evolution-mail.xml.h:19
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "在此設定您的郵件帳號"
-
-# 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"
-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 pop-up"
-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 address viewer"
-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 card viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution 測試元件。"
-
-# 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/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -384,7 +561,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -393,8 +570,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -421,6 +597,7 @@ msgstr "636"
 
 # mail/mail-config.glade.h:10
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "驗證"
@@ -477,15 +654,13 @@ msgid "Anonymously"
 msgstr "匿名"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細資料"
 
@@ -764,40 +939,33 @@ msgstr "名片"
 
 # executive-summary/test-service/rdf-summary.c:806
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+# 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 "Select Contacts from Address Book"
-msgstr "從目錄服務選擇連絡人"
+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:208
+msgid "Remove All"
+msgstr "全部移除"
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:161
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "移除"
 
-# 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/e-select-names-popup.c:176
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部移除"
-
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
@@ -820,7 +988,7 @@ msgstr "傳送 HTML 格式的電子郵件？"
 # addressbook/gui/component/e-address-widget.c:424
 # addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "新增到連絡人"
 
@@ -829,18 +997,25 @@ 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
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 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
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 目錄服務名稱選擇界面。"
+msgid "Select Contacts from Address Book"
+msgstr "從目錄服務選擇連絡人"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -871,6 +1046,12 @@ msgstr "類別(_C):"
 msgid "_Find"
 msgstr "尋找"
 
+# mail/mail-search-dialogue.c:113
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "尋找(_S)"
+
 # mail/mail-config.glade.h:65
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
@@ -922,9 +1103,8 @@ msgid "<b>Work</b>"
 msgstr "工作週"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -956,7 +1136,6 @@ msgstr "生日(_Y):"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "行事曆(_A):"
@@ -975,8 +1154,8 @@ msgstr "公司電話"
 
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: 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:181
 msgid "Contact"
@@ -984,7 +1163,7 @@ msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1114,8 +1293,8 @@ msgstr "Web 網址(_W):"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -1141,51 +1320,31 @@ msgstr "檔案名稱:"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "每(_E)"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"您確定要刪除\n"
-"這些連絡人？"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"您確定要刪除\n"
-"這個連絡人？"
-
 # addressbook/backend/ebook/e-card.c:3346
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "地址"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2264,99 +2423,126 @@ msgstr "尚比亞"
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
+# mail/mail-callbacks.c:1407
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "張貼郵件(_P)"
+
 # addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 #, fuzzy
 msgid "Jabber"
 msgstr "未命名的清單"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "約羅"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-# shell/e-shortcuts-view.c:137
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+# camel/providers/smtp/camel-smtp-transport.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "組別"
+msgid "Service"
+msgstr "服務已就緒"
+
+# addressbook/backend/ebook/e-card.c:3442
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "位置:"
+
+# mail/mail-config.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "使用者名稱(_N):"
 
 # addressbook/contact-editor/e-contact-editor.c:1249
 # addressbook/contact-editor/e-contact-editor.c:1311
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "住家電話"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "其它"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "約羅"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+# shell/e-shortcuts-view.c:137
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "組別"
+
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "來源"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新增連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "已變更"
 
 # addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "請在下列選項中選擇"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "諾姆"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
@@ -2365,59 +2551,23 @@ msgstr "循環的日期錯誤"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "無效的目的"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-# ui/evolution-calendar.xml.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "放棄(_D)"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-# mail/mail-callbacks.c:1407
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "張貼郵件(_P)"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-# camel/providers/smtp/camel-smtp-transport.c:180
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "服務已就緒"
-
-# addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "位置:"
-
-# mail/mail-config.glade.h:80
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "使用者名稱(_N):"
-
 # addressbook/contact-editor/e-contact-quick-add.c:233
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2442,6 +2592,26 @@ msgstr "全名(_F):"
 msgid "E-_mail:"
 msgstr "電子郵件"
 
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"您確定要刪除\n"
+"這些連絡人？"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"您確定要刪除\n"
+"這個連絡人？"
+
 # addressbook/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2599,61 +2769,79 @@ msgstr "位置:"
 msgid "\n"
 msgstr "\n"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "從目錄服務選擇連絡人"
+
+# calendar/gui/goto-dialog.glade.h:12
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "會員"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+# composer/e-msg-composer-attachment-bar.c:469
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "自附件清單移除已選擇的項目"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "已選擇"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 
 # composer/e-msg-composer-attachment.glade.h:4
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 #, fuzzy
 msgid "_List name:"
 msgstr "列出名稱(_N):"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 #, fuzzy
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖放連絡人到以下清單:"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "連絡人清單編輯器"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:4
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "書本"
 
 # mail/mail-config.glade.h:45
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "是新的清單"
 
+# mail/mail-config.glade.h:61
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "出席者"
+
 # addressbook/contact-editor/contact-editor.glade.h:7
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "儲存清單為 VCard 檔案格式"
-
 # addressbook/gui/component/addressbook-storage.c:99
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
@@ -2696,527 +2884,11 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.c:239
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:12
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-#, fuzzy
-msgid "List Members"
-msgstr "會員"
-
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-#, fuzzy
-msgid "E-mail"
-msgstr "電子郵件"
-
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "團體"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-#, fuzzy
-msgid "Position"
-msgstr "波士頓"
-
-# shell/e-shortcuts-view.c:137
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "組別"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr ""
-
-# mail/mail-config.glade.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-#, fuzzy
-msgid "Phone"
-msgstr "朋榭"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#, fuzzy
-msgid "work"
-msgstr "工作"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-#, fuzzy
-msgid "Blog"
-msgstr "波隆納"
-
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "行動電話"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-#, fuzzy
-msgid "personal"
-msgstr "個人"
-
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "備註"
-
-# addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:540
-#, fuzzy
-msgid "Job Title"
-msgstr "職稱(_J):"
-
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "電子郵件"
-
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/widgets/eab-contact-display.c:571
-#, fuzzy
-msgid "Home page"
-msgstr "住家傳真"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-# shell/e-shell-view-menu.c:602
-# shell/e-shell-view-menu.c:614
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-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
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "目錄服務不存在"
-
-# ui/evolution-addressbook.xml.h:17
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "新增連絡人清單"
-
-# shell/e-storage.c:475
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "權限不足"
-
-# calendar/gui/calendar-commands.c:266
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-#, fuzzy
-msgid "Contact not found"
-msgstr "找不到名片"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "名片 ID 已經存在"
-
-# shell/e-storage.c:477
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "通訊協定不支援"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "已取消"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "無法開啟共用的資料夾：%s。"
-
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "驗証失敗"
-
-# camel/providers/smtp/camel-smtp-transport.c:218
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "要求驗證"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS 無法使用"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "沒有這封郵件"
-
-# shell/e-storage.c:467
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "其他錯誤"
-
-# addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/widgets/eab-gui-util.c:90
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"無法開啟這個目錄服務。 請檢查路徑是否存在及\n"
-"您是否擁有存取權限。"
-
-# addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:97
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"我們無法開啟這個目錄服務。\n"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者 LDAP 伺服器沒有啟動。"
-
-# addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
-"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
-"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
-
-# addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"我們無法開啟這個目錄服務。\n"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者伺服器沒有啟動。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
-"有許多名片符合此次查詢。\n"
-"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
-"伺服器偏好設定中的結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"執行此次查詢的時間超過了伺服器的限制或是您為\n"
-"此目錄服務所設定的上限。請使用更加明確的查詢\n"
-"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
-"結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "此目錄服務的後端程式無法解析這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "這次的查詢並未完全成功。"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "新增清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-#, fuzzy
-msgid "Error adding contact"
-msgstr "新增名片時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "編輯清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:180
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "編輯名片時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "移除清單時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-#, fuzzy
-msgid "Error removing contact"
-msgstr "移除名片時發生錯誤"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, 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 張名片也會同時開啟 %d 個新視窗。\n"
-"您真的要顯示所有這些名片嗎？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已經存在\n"
-"您是否要複寫它？"
-
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "覆寫"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "清單"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-#, fuzzy
-msgid "Move contact to"
-msgstr "移動名片到"
-
-# calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/eab-gui-util.c:636
-#, fuzzy
-msgid "Copy contact to"
-msgstr "複製名片到"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:639
-#, fuzzy
-msgid "Move contacts to"
-msgstr "移動名片到"
-
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:641
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "複製名片到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "從目錄服務選擇連絡人"
-
-# addressbook/backend/ebook/e-card.c:3745
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "多重 VCard"
-
-# addressbook/backend/ebook/e-card.c:3753
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "給 %s 的 VCard"
-
-# shell/e-storage.c:178
-#.
-#. * 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:199
-msgid "(none)"
-msgstr "(沒有)"
-
-# addressbook/contact-editor/contact-editor.glade.h:14
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "主要電子郵件"
-
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "電子郵件 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1286
-# addressbook/gui/widgets/e-addressbook-view.c:726
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "電子郵件 3"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "選擇一個動作"
-
-# ui/evolution-addressbook.xml.h:2
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "建立新的連絡人 “%s”"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "新增住址到既存之連絡人 “%s”"
-
-# addressbook/gui/widgets/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "查詢目錄服務..."
-
-# addressbook/gui/component/e-address-widget.c:388
-# addressbook/gui/component/select-names/e-select-names-popup.c:281
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "編輯連絡人資訊"
-
-# mail/mail-config.glade.h:29
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "合併電子郵件地址"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "和 1 個其他名片。"
-msgstr[1] "和 1 個其他名片。"
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "顯示全部檔頭(_H)"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# addressbook/gui/widgets/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "存入目錄服務"
-
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
@@ -3233,9 +2905,9 @@ msgstr[1] "連絡人"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
 msgid "Query"
 msgstr "查詢"
 
@@ -3254,16 +2926,16 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
 #: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "類別為"
@@ -3271,29 +2943,29 @@ msgstr "類別為"
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
 msgid "Advanced..."
 msgstr "進階..."
 
 # mail/mail-config.glade.h:78
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 #: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "類型"
 
 # importers/pine-importer.c:661
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
 #, fuzzy
 msgid "Address Book"
 msgstr "目錄服務"
@@ -3302,59 +2974,59 @@ msgstr "目錄服務"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "儲存成 VCard 檔案格式"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
 msgid "New Contact..."
 msgstr "新增連絡人..."
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
 msgid "New Contact List..."
 msgstr "新增連絡人清單..."
 
 # ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
 msgid "Go to Folder..."
 msgstr "移至資料夾..."
 
 # shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
 msgid "Import..."
 msgstr "匯入..."
 
 # ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
 msgid "Search for Contacts..."
 msgstr "尋找連絡人..."
 
 # ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "目錄服務來源..."
 
 # ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
 msgid "Pilot Settings..."
 msgstr "Pilot 設定..."
 
 # ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "轉寄連絡人"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
 msgid "Send Message to Contact"
 msgstr "傳送郵件給連絡人"
 
@@ -3365,7 +3037,7 @@ 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:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
@@ -3374,25 +3046,25 @@ msgstr "列印"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
 # addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
 msgid "Print Envelope"
 msgstr "列印信封"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "目錄服務..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "目錄服務..."
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪下"
@@ -3400,7 +3072,7 @@ msgstr "剪下"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
 #: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
@@ -3409,20 +3081,20 @@ msgstr "複製"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼上"
 
 # widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
 msgid "Current View"
 msgstr "目前檢視"
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
 #: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "任何類別"
@@ -3466,6 +3138,8 @@ 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:3
 msgid "Categories"
 msgstr "類別"
 
@@ -3474,6 +3148,26 @@ msgstr "類別"
 msgid "Company Phone"
 msgstr "公司電話"
 
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+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:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+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:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+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
@@ -3524,16 +3218,34 @@ msgstr "約旦"
 msgid "Manager"
 msgstr "主管"
 
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "行動電話"
+
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: 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:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "備註"
+
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: 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:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+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:28
@@ -3603,33 +3315,22 @@ msgid "Web Site"
 msgstr "網址"
 
 # addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
 msgid "Width"
 msgstr "寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
 msgid "Height"
 msgstr "高度"
 
-#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
 msgid "Has Focus"
 msgstr "得到焦點"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已選擇"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有游標"
-
 # ui/evolution-message-composer.xml.h:47
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -3649,8 +3350,12 @@ msgstr "文字模型"
 msgid "Max field name length"
 msgstr "最大欄位名稱長度"
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "欄寬"
+
 # addressbook/gui/widgets/e-minicard-view.c:216
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view.c:164
 msgid ""
 "\n"
 "\n"
@@ -3665,7 +3370,7 @@ msgstr ""
 "雙擊這裡以建立新的連絡人。"
 
 # addressbook/gui/widgets/e-minicard-view.c:216
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
 msgid ""
 "\n"
 "\n"
@@ -3675,13 +3380,490 @@ msgstr ""
 "\n"
 "沒有項目可供這種檢視方式顯示。"
 
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
 msgid "Adapter"
 msgstr "轉接器"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "欄寬"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已選擇"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有游標"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+# calendar/gui/goto-dialog.glade.h:12
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+#, fuzzy
+msgid "List Members"
+msgstr "會員"
+
+# addressbook/gui/widgets/e-addressbook-view.c:701
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+#, fuzzy
+msgid "E-mail"
+msgstr "電子郵件"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "Position"
+msgstr "波士頓"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr ""
+
+# mail/mail-config.glade.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#, fuzzy
+msgid "Phone"
+msgstr "朋榭"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+#, fuzzy
+msgid "work"
+msgstr "工作"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+#, fuzzy
+msgid "Blog"
+msgstr "波隆納"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#, fuzzy
+msgid "personal"
+msgstr "個人"
+
+# addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:541
+#, fuzzy
+msgid "Job Title"
+msgstr "職稱(_J):"
+
+# addressbook/contact-editor/e-contact-editor.c:1251
+# addressbook/gui/widgets/e-addressbook-view.c:714
+#: addressbook/gui/widgets/eab-contact-display.c:572
+#, fuzzy
+msgid "Home page"
+msgstr "住家傳真"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "成功"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+# shell/e-shell-view-menu.c:602
+# shell/e-shell-view-menu.c:614
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+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
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "目錄服務不存在"
+
+# ui/evolution-addressbook.xml.h:17
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "新增連絡人清單"
+
+# shell/e-storage.c:475
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "權限不足"
+
+# calendar/gui/calendar-commands.c:266
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact not found"
+msgstr "找不到名片"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "名片 ID 已經存在"
+
+# shell/e-storage.c:477
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "通訊協定不支援"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "已取消"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "無法開啟共用的資料夾：%s。"
+
+# camel/camel-sasl-anonymous.c:110
+# camel/camel-sasl-plain.c:87
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "驗証失敗"
+
+# camel/providers/smtp/camel-smtp-transport.c:218
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "要求驗證"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS 無法使用"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "沒有這封郵件"
+
+# shell/e-storage.c:467
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "其他錯誤"
+
+# addressbook/gui/component/addressbook.c:458
+#: addressbook/gui/widgets/eab-gui-util.c:91
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"無法開啟這個目錄服務。 請檢查路徑是否存在及\n"
+"您是否擁有存取權限。"
+
+# addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:98
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"我們無法開啟這個目錄服務。\n"
+"這表示您輸入了一個錯誤的 URI，\n"
+"或者 LDAP 伺服器沒有啟動。"
+
+# addressbook/gui/component/addressbook.c:450
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
+"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
+"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
+
+# addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"我們無法開啟這個目錄服務。\n"
+"這表示您輸入了一個錯誤的 URI，\n"
+"或者伺服器沒有啟動。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
+"有許多名片符合此次查詢。\n"
+"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
+"伺服器偏好設定中的結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"執行此次查詢的時間超過了伺服器的限制或是您為\n"
+"此目錄服務所設定的上限。請使用更加明確的查詢\n"
+"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
+"結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "此目錄服務的後端程式無法解析這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "這次的查詢並未完全成功。"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "新增清單時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+#, fuzzy
+msgid "Error adding contact"
+msgstr "新增名片時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "編輯清單時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:181
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "編輯名片時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "移除清單時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+#, fuzzy
+msgid "Error removing contact"
+msgstr "移除名片時發生錯誤"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, 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 張名片也會同時開啟 %d 個新視窗。\n"
+"您真的要顯示所有這些名片嗎？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它？"
+
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "覆寫"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "清單"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+#, fuzzy
+msgid "Move contact to"
+msgstr "移動名片到"
+
+# calendar/gui/e-calendar-table.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:637
+#, fuzzy
+msgid "Copy contact to"
+msgstr "複製名片到"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/eab-gui-util.c:640
+#, fuzzy
+msgid "Move contacts to"
+msgstr "移動名片到"
+
+# calendar/gui/calendar-model.c:638
+# calendar/gui/calendar-model.c:1176
+# calendar/gui/dialogs/task-editor-dialog.glade.h:14
+# calendar/gui/e-calendar-table.c:419
+#: addressbook/gui/widgets/eab-gui-util.c:642
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "複製名片到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "從目錄服務選擇連絡人"
+
+# addressbook/backend/ebook/e-card.c:3745
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "多重 VCard"
+
+# addressbook/backend/ebook/e-card.c:3753
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "給 %s 的 VCard"
+
+# shell/e-storage.c:178
+#.
+#. * 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:198
+msgid "(none)"
+msgstr "(沒有)"
+
+# addressbook/contact-editor/contact-editor.glade.h:14
+# addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "主要電子郵件"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "選擇一個動作"
+
+# ui/evolution-addressbook.xml.h:2
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "建立新的連絡人 “%s”"
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "新增住址到既存之連絡人 “%s”"
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "查詢目錄服務..."
+
+# addressbook/gui/component/e-address-widget.c:388
+# addressbook/gui/component/select-names/e-select-names-popup.c:281
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "編輯連絡人資訊"
+
+# mail/mail-config.glade.h:29
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "合併電子郵件地址"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "和 1 個其他名片。"
+msgstr[1] "和 1 個其他名片。"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "顯示全部檔頭(_H)"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "存入目錄服務"
 
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3734,6 +3916,13 @@ msgstr "Evolution 郵件編輯器。"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "列印信封"
+
 # ui/evolution-addressbook.xml.h:11
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
@@ -3747,13 +3936,6 @@ msgstr "列印選定的連絡人"
 msgid "Print contact"
 msgstr "列印選定的連絡人"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "列印信封"
-
 # addressbook/printing/e-contact-print.glade.h:1
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3985,6 +4167,26 @@ msgstr "連絡人清單(_L)"
 msgid "This should test the contact print code"
 msgstr ""
 
+# camel/camel-filter-driver.c:671
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "不能開啟郵件"
+
+# camel/camel-provider.c:140
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "無法載入 %s：%s"
+
+# addressbook/gui/component/addressbook.c:438
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "無法開啟目錄服務"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -4047,26 +4249,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "內部錯誤"
 
-# camel/camel-filter-driver.c:671
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "不能開啟郵件"
-
-# camel/camel-provider.c:140
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "無法載入 %s：%s"
-
-# addressbook/gui/component/addressbook.c:438
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "無法開啟目錄服務"
-
 # composer/e-msg-composer.c:805
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -4087,6 +4269,282 @@ msgstr "沒有提供檔案名稱。"
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+# shell/e-shortcuts-view.c:265
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "不要刪除"
+
+# ui/evolution-message-composer.xml.h:26
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "傳送"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "您確定要取消並刪除這個會議？"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:125
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "您確定要刪除 %d 個工作？"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:102
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr "您確定要取消並刪除這個日誌項目？"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:130
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "您確定要刪除 %d 個日誌項目？"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:84
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "您確定要刪除約會 “%s”？"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:120
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "您確定要刪除 %d 個約會？"
+
+# calendar/gui/dialogs/delete-comp.c:93
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "您確定要刪除工作“%s”？"
+
+# calendar/gui/dialogs/delete-comp.c:102
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "您確定要刪除日誌項目 “%s”？"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:84
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "您確定要刪除約會 “%s”？"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:93
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "您確定要刪除工作“%s”？"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+# calendar/gui/dialogs/delete-comp.c:102
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "您確定要刪除日誌項目 “%s”？"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+# calendar/gui/event-editor-dialog.glade.h:3
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "約會"
+
+# calendar/gui/dialogs/save-comp.c:51
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "您是否須要儲存變更？"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編輯器？"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "放棄變更(_D)"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+# ui/evolution-message-composer.xml.h:26
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "傳送"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -4099,45 +4557,131 @@ msgstr "未命名的清單"
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 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:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-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:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-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:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
 # calendar/conduits/todo/todo-conduit.c:600
 # calendar/conduits/todo/todo-conduit.c:603
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+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:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "行事曆"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+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:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "行事曆與工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, 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:8
+#, 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:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# 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:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "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:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "行事曆"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "工作(_T)"
+
+# 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
@@ -4252,12 +4796,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
@@ -4423,11 +4961,36 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
+# calendar/gui/gnome-cal.c:234
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "主旨包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "描述包含"
+
+# calendar/gui/gnome-cal.c:236
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "備註包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "描述包含"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "沒有相符資料"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -4451,8 +5014,8 @@ msgid "Purge events older than"
 msgstr "傳回小於"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "天"
 
@@ -4469,7 +5032,7 @@ msgstr "%A %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -4526,89 +5089,75 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "行事曆"
-
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "新增約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "約會(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "新增會議"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 #, fuzzy
 msgid "M_eeting"
 msgstr "會議"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "建立一個新的會議要求"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "新增全天約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "全天約會(_D)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "建立一個新的約會"
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "新喀里多尼亞島"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "行事曆(_A):"
+msgid "Cale_ndar"
+msgstr "行事曆"
 
 # ui/evolution.xml.h:10
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新增一個資料夾"
@@ -4643,31 +5192,6 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-# calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "主旨包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "描述包含"
-
-# calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "備註包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "描述包含"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "沒有相符資料"
-
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
 #: calendar/gui/comp-editor-factory.c:409
@@ -4690,284 +5214,168 @@ msgstr "權限不足"
 msgid "open_client(): %s"
 msgstr ""
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "音效提醒選項"
-
-# addressbook/gui/component/select-names/select-names.glade.h:2
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "訊息提醒選項"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/alarm-options.c:485
+# data/evolution.keys.in.h:2
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
 #, fuzzy
-msgid "Email Alarm Options"
-msgstr "郵件提醒選項"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "程式提醒選項"
-
-# camel/camel-sasl-login.c:127
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "不明的提醒選項"
+msgid "<b>Alarm</b>\t"
+msgstr "行事曆資訊"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
+# 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/alarm-dialog.glade.h:3
 #, fuzzy
-msgid "Alarm Repeat"
-msgstr "提醒重複"
+msgid "<b>Options</b>"
+msgstr "描述:"
 
-# views/mail/galview.xml.h:4
-#: calendar/gui/dialogs/alarm-options.glade.h:3
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+# calendar/gui/event-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
 #, fuzzy
-msgid "Message to Display:"
-msgstr "郵件顯示"
+msgid "<b>Repeat</b>"
+msgstr "提醒"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+# calendar/gui/e-calendar-table.c:162
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
 #, fuzzy
-msgid "Message to Send"
-msgstr "郵件內容"
-
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "播放音效:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "重複提醒"
-
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "執行程式:"
+msgid "Add Alarm"
+msgstr "提醒"
 
-# ui/evolution-message-composer.xml.h:26
-#: calendar/gui/dialogs/alarm-options.glade.h:8
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
 #, fuzzy
-msgid "Send To:"
-msgstr "傳送"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "具有這些參數:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "提醒間隔每"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "時"
+msgid "Custom _message"
+msgstr "編輯郵件"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 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
-# calendar/gui/event-editor-dialog.glade.h:2
-# mail/mail-config.glade.h:7
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "新增(_A)"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "基本"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "日期/時間:"
+# views/mail/galview.xml.h:4
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "郵件"
 
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "播放這個音效"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-# calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-#, fuzzy
-msgid "Reminders"
-msgstr "提醒"
-
 # calendar/gui/event-editor-dialog.glade.h:22
 # calendar/gui/event-editor.c:1597
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "執行外部程式"
 
+# ui/evolution-message-composer.xml.h:26
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+#, fuzzy
+msgid "Send To:"
+msgstr "傳送"
+
 # calendar/gui/event-editor-dialog.glade.h:23
 # calendar/gui/event-editor.c:1594
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
-# calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "摘要:"
+# mail/mail-config.glade.h:3
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "帳號(_A):"
 
-# addressbook/printing/e-contact-print.glade.h:23
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "選項(_O)..."
+# calendar/gui/event-editor-dialog.glade.h:22
+# calendar/gui/event-editor.c:1597
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "執行程式:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "重複提醒"
+
+# ui/evolution-calendar.xml.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "紹森"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "之後"
 
 # calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "之前"
 
 # calendar/gui/event-editor-dialog.glade.h:35
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "日"
 
 # calendar/gui/event-editor-dialog.glade.h:36
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "約會結束"
 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "提醒間隔每"
+
 # calendar/gui/event-editor-dialog.glade.h:39
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "時"
 
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "時"
+
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "分"
 
 # calendar/gui/event-editor-dialog.glade.h:44
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "約會開始"
 
-# ui/evolution.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "您必須指定一個檔案名稱。"
-
-# calendar/gui/e-tasks.c:310
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "不支援載入“%s”必須的方法"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-# ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "新喀里多尼亞島"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "工作清單"
-
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "顏色(_O)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "選取顏色"
-
-# ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "新喀里多尼亞島"
-
-# shell/e-shortcuts-view.c:291
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "新增群組(_N)..."
-
-# ui/evolution-subscribe.xml.h:4
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "重整清單"
-
-# addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "類型:"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, fuzzy
-msgid "_URL:"
-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
+# calendar/gui/event-editor-dialog.glade.h:2
+# mail/mail-config.glade.h:7
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "新增(_A)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "週"
+# calendar/gui/e-calendar-table.c:162
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "提醒"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
@@ -5111,7 +5519,7 @@ msgstr "空閒/忙碌請求"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "星期五"
@@ -5128,7 +5536,7 @@ msgstr "分"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "星期一"
@@ -5141,7 +5549,7 @@ msgstr "週日(_U)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "星期六"
@@ -5158,7 +5566,7 @@ msgstr "在日期導覽顯示週數(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "星期日"
@@ -5176,7 +5584,7 @@ msgstr "週四(_H)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "星期四"
@@ -5194,7 +5602,7 @@ msgstr "時間格式:"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "星期二"
@@ -5206,7 +5614,7 @@ msgstr "一週開始於(_E):"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "星期三"
@@ -5251,7 +5659,8 @@ msgstr "開始日(_D):"
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -5311,6 +5720,101 @@ msgstr "週三(_W)"
 msgid "before every appointment"
 msgstr "在每個約會前"
 
+# ui/evolution.xml.h:3
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "您必須指定一個檔案名稱。"
+
+# calendar/gui/e-tasks.c:310
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "不支援載入“%s”必須的方法"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "新喀里多尼亞島"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "工作清單"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "顏色(_O)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+# mail/mail-config.glade.h:54
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "選取顏色"
+
+# ui/evolution-addressbook.xml.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "新喀里多尼亞島"
+
+# shell/e-shortcuts-view.c:291
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "新增群組(_N)..."
+
+# ui/evolution-subscribe.xml.h:4
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "重整清單"
+
+# addressbook/printing/e-contact-print.glade.h:40
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "類型:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "網址:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "週"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
@@ -5356,20 +5860,56 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
+# camel/providers/local/camel-mbox-summary.c:879
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "確認上的錯誤： %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (已完成) "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+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:2271
+msgid "Due "
+msgstr "期限 "
+
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "無法更新物件"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -5377,79 +5917,36 @@ msgstr "約會 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "沒有摘要"
 
-# composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "另存新檔..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有更新透過電子郵件到達，對此項目所做的變更可能被放棄"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "無法取得目前的版本！"
 
-# camel/providers/local/camel-mbox-summary.c:879
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "確認上的錯誤： %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (已完成) "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-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:2271
-msgid "Due "
-msgstr "期限 "
-
 # camel/providers/local/camel-mbox-summary.c:655
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
@@ -5520,10 +6017,12 @@ msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 msgid "The item could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
 
-# addressbook/contact-editor/contact-editor.glade.h:18
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "目錄服務..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "連絡人(_C)..."
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
@@ -5536,154 +6035,230 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "約會"
 
-# calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "提醒"
-
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 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:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "會議排程"
 
+# widgets/misc/e-messagebox.c:152
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+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:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "會議"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 msgid "Event with no start date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
 # shell/e-storage.c:475
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "權限不足"
 
-# calendar/gui/event-editor-dialog.glade.h:1
+# calendar/gui/event-editor.c:1612
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "在每個約會前"
+msgstr[1] "在每個約會前"
+
+# calendar/gui/event-editor-dialog.glade.h:36
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "約會結束"
+msgstr[1] "約會結束"
+
+# calendar/gui/event-editor.c:1612
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "在每個約會前"
+msgstr[1] "在每個約會前"
+
+# calendar/gui/event-editor.c:1612
 #: calendar/gui/dialogs/event-page.glade.h:2
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "在每個約會前"
+
+# calendar/gui/event-editor.c:1612
+#: calendar/gui/dialogs/event-page.glade.h:3
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "在每個約會前"
+
+# calendar/gui/event-editor.c:1612
+#: calendar/gui/dialogs/event-page.glade.h:4
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "在每個約會前"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "行事曆資訊"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:7
+# calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:6
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "日期及時間"
+
+# calendar/gui/event-editor-dialog.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:7
 msgid "A_ll day event"
 msgstr "全天事件(_L)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "忙碌(_U)"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "儲存自訂檢視"
 
 # addressbook/contact-editor/contact-editor.glade.h:6
 # calendar/gui/dialogs/task-editor-dialog.glade.h:3
 # calendar/gui/event-editor-dialog.glade.h:5
-#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Ca_tegories..."
 msgstr "類別(_T)..."
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "行事曆(_A):"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
 msgstr "分類"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/dialogs/event-page.glade.h:7
-#, fuzzy
-msgid "Co_nfidential"
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
 msgstr "機密"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
-msgid "Date & Time"
-msgstr "日期/時間:"
-
-# ui/evolution-calendar.xml.h:36
-#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "空閒(_R)"
-
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:13
 #, fuzzy
 msgid "L_ocation:"
 msgstr "位置:"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:15
-# calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "私人(_V)"
+# calendar/gui/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "私人"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:17
-# calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "公開(_B)"
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "公開"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:16
 #, fuzzy
-msgid "Show Time As"
+msgid "Show time as _busy"
 msgstr "顯示時間為"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:19
 # calendar/gui/event-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+# calendar/gui/e-calendar-table.c:162
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "提醒"
+
+# addressbook/gui/component/addressbook-config.c:689
+# calendar/gui/e-itip-control.glade.h:6
+# composer/e-msg-composer-attachment.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "描述:"
+
 # calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "結束時間(_E):"
 
 # calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "開始時間(_S):"
 
@@ -5702,53 +6277,45 @@ 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:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "無"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 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:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
-# addressbook/contact-editor/contact-editor.glade.h:23
-# mail/folder-browser.c:715
-# mail/mail-config.glade.h:85
-# ui/evolution-event-editor.xml.h:57
-# ui/evolution-mail.xml.h:103
-# ui/evolution-task-editor-dialog.xml.h:69
-# ui/evolution.xml.h:46
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "刪除(_D)"
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "移除(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
@@ -5796,7 +6363,7 @@ msgid "Member"
 msgstr "會員"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -5804,34 +6371,43 @@ msgstr "RSVP"
 # 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:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "到會者"
+msgid "<b>Attendees</b>"
+msgstr "<b>開始:</b>"
 
-# addressbook/gui/component/addressbook-config.c:662
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "新增寄件者到目錄服務(_B)"
+msgid "<b>Organizer</b>"
+msgstr "<b>逾期:</b>"
 
 # calendar/gui/e-itip-control.glade.h:9
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "變更會議召集人(_C)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:24
+# calendar/gui/event-editor-dialog.glade.h:29
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "會議召集人:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "連絡人(_C)..."
 
 # calendar/gui/e-itip-control.glade.h:9
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "變更會議召集人(_C)"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "會議召集人:"
 
 # data/evolution.keys.in.h:2
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5930,163 +6506,142 @@ msgid "All Instances"
 msgstr "艾來安斯"
 
 # calendar/gui/event-editor.c:871
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 #, fuzzy
 msgid "Recurrence date is invalid"
 msgstr "循環的日期錯誤"
 
 # calendar/gui/event-editor.c:449
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "於"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "第一"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "第二"
 
 # addressbook/contact-editor/e-contact-editor.c:1254
 # addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "第三"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "第四"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "最後"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "其它日期"
 
 # calendar/gui/event-editor.c:474
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "天"
 
 # calendar/gui/event-editor.c:601
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "在第"
 
 # calendar/gui/event-editor.c:754
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 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:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "日期/時間:"
 
-# calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "每"
-
-# calendar/gui/event-editor-dialog.glade.h:11
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
+# 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/recurrence-page.glade.h:1
 #, fuzzy
-msgid "Exceptions"
-msgstr "例外"
+msgid "<b>Exceptions</b>"
+msgstr "描述:"
 
-# addressbook/printing/e-contact-print.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
+# calendar/gui/event-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 #, fuzzy
-msgid "Preview"
-msgstr "預覽:"
+msgid "<b>Preview</b>"
+msgstr "預覽"
 
-# calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
+# calendar/gui/event-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
 #, fuzzy
-msgid "Recurrence Rule"
-msgstr "循環模式"
-
-# calendar/gui/event-editor-dialog.glade.h:7
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "自訂週期性約會(_C)"
-
-# calendar/gui/event-editor-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "編輯(_M)"
-
-# calendar/gui/event-editor-dialog.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "非週期性約會(_N)"
+msgid "<b>Recurrence</b>"
+msgstr "週期性"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "移除(_R)"
+# calendar/gui/event-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "每"
 
-# calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "簡單循環(_S)"
+# calendar/gui/dialogs/alarm-notify.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "編輯約會(_E)"
 
 # calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "發生"
 
 # calendar/gui/event-editor-dialog.glade.h:38
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "永遠"
 
 # calendar/gui/event-editor-dialog.glade.h:43
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "月"
 
 # calendar/gui/event-editor-dialog.glade.h:45
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "直至"
 
 # calendar/gui/event-editor-dialog.glade.h:46
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "週"
 
 # calendar/gui/event-editor-dialog.glade.h:47
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "年"
 
 # shell/e-shell-importer.c:602
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
 # ui/evolution.xml.h:47
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "刪除這個資料夾"
@@ -6094,7 +6649,7 @@ msgstr "刪除這個資料夾"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 #, fuzzy
 msgid "Task List"
 msgstr "工作清單"
@@ -6103,25 +6658,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/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:2
+# views/mail/galview.xml.h:4
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "顯示郵件"
+
+# views/mail/galview.xml.h:4
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "% 完成"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "顯示郵件"
 
 # calendar/gui/calendar-model.c:644
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "已完成"
 
@@ -6142,8 +6706,8 @@ msgstr "高"
 # calendar/gui/e-calendar-table.c:420
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "進行中"
@@ -6166,9 +6730,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-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "普通"
 
@@ -6178,19 +6741,16 @@ msgstr "普通"
 # calendar/gui/e-calendar-table.c:419
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "未開始"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
+# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: calendar/gui/dialogs/task-details-page.glade.h:10
 #, fuzzy
-msgid "Progress"
-msgstr "進行中"
+msgid "P_ercent complete:"
+msgstr "完成百分比: %i"
 
 # calendar/gui/calendar-model.c:1064
 # calendar/gui/dialogs/task-editor-dialog.glade.h:22
@@ -6222,47 +6782,52 @@ msgstr "狀態(_S):"
 msgid "_Web Page:"
 msgstr "Web 網址(_W):"
 
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "工作"
+
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "指派工作"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
 # addressbook/gui/component/addressbook.c:438
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法開啟目錄服務"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "機密(_F)"
+# views/mail/galview.xml.h:4
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "顯示郵件"
+
+# views/mail/galview.xml.h:4
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "顯示郵件"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "描述:"
 
-# ui/evolution-mail.xml.h:106
-# ui/evolution.xml.h:50
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "資料夾(_F):"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
@@ -6275,40 +6840,45 @@ msgstr "開始日期(_R):"
 msgid "_Due date:"
 msgstr "到期日(_D):"
 
-# camel/camel-sasl-kerberos4.c:218
-# camel/providers/imap/camel-imap-store.c:433
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+# shell/e-shortcuts-view.c:137
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "來自伺服器的不良許可回應。"
+msgid "_Group:"
+msgstr "組別"
 
+# data/evolution.keys.in.h:2
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "行事曆資訊"
 
-# ui/evolution-calendar.xml.h:7
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
+
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Daily"
-msgstr "天"
+msgid "<b>Publishing _Location</b>"
+msgstr "空閒/忙碌請求"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
 msgid "Free/Busy Editor"
 msgstr "空閒/忙碌資訊"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+# ui/evolution-calendar.xml.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Free/Busy Publishing Location"
-msgstr "空閒/忙碌請求"
+msgid "_Daily"
+msgstr "天"
 
-# composer/e-msg-composer-attachment.glade.h:4
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+# addressbook/gui/widgets/e-addressbook-view.c:732
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Login name:"
-msgstr "列出名稱(_N):"
+msgid "_Manual"
+msgstr "馬拿瓜"
 
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
@@ -6316,35 +6886,28 @@ msgstr "列出名稱(_N):"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #, fuzzy
-msgid "Password:"
+msgid "_Password:"
 msgstr "密碼"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
-
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "記住這個密碼"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+# mail/mail-config.glade.h:80
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "網址:"
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
+#, fuzzy
+msgid "_Username:"
+msgstr "使用者名稱(_N):"
 
 # ui/evolution-calendar.xml.h:36
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "週"
 
 # calendar/gui/event-editor.c:1543
@@ -6438,7 +7001,7 @@ msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "請按這裡增加新的工作"
@@ -6447,6 +7010,12 @@ msgstr "請按這裡增加新的工作"
 msgid "Untitled"
 msgstr "未命名"
 
+# calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "摘要:"
+
 # calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
@@ -6463,7 +7032,7 @@ msgstr "到期日(_D):"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "狀態:"
 
@@ -6479,29 +7048,111 @@ msgstr "優先順序(_P):"
 msgid "Web Page:"
 msgstr "Web 網址(_W):"
 
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "公開"
+# calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "結束日期"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "私人"
+# calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "開始日期"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "機密"
+# calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "摘要"
+
+# ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+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:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "忙碌"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+# calendar/gui/calendar-model.c:970
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"經緯必須依此格式輸入：\n"
+"\n"
+"45.436845,125.862501"
+
+# calendar/gui/calendar-model.c:1584
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "是"
+
+# calendar/gui/calendar-model.c:1584
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "否"
+
+# calendar/gui/calendar-model.c:369
+# calendar/gui/event-editor.c:1601
+# calendar/gui/event-editor.c:1628
+# camel/providers/smtp/camel-smtp-transport.c:221
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 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:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "不明"
+
+# calendar/gui/calendar-model.c:1576
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "循環模式"
+
+# calendar/gui/calendar-model.c:1578
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "已指定"
 
 # calendar/gui/e-calendar-table.c:367
 #: calendar/gui/e-calendar-table.c:396
@@ -6558,35 +7209,24 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-# ui/evolution-calendar.xml.h:36
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "空閒"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "忙碌"
-
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "更新物件"
 
 # mail/folder-browser.c:686
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開啟(_O)"
 
 # ui/evolution-mail.xml.h:114
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "開啟郵件(_O)"
@@ -6595,9 +7235,9 @@ msgstr "開啟郵件(_O)"
 # ui/evolution-calendar.xml.h:43
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
@@ -6605,9 +7245,9 @@ msgstr "另存新檔(_S)..."
 # ui/evolution-addressbook.xml.h:18
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -6616,8 +7256,8 @@ msgstr "列印(_P)..."
 
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -6625,54 +7265,77 @@ msgstr "剪下(_U)"
 
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "貼上(_P)"
 
 # calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 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:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
 
 # calendar/gui/e-calendar-table.c:707
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
 # calendar/gui/e-calendar-table.c:713
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
+# addressbook/contact-editor/contact-editor.glade.h:23
+# mail/folder-browser.c:715
+# mail/mail-config.glade.h:85
+# ui/evolution-event-editor.xml.h:57
+# ui/evolution-mail.xml.h:103
+# ui/evolution-task-editor-dialog.xml.h:69
+# ui/evolution.xml.h:46
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "刪除(_D)"
+
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
+# composer/e-msg-composer.c:774
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "另存新檔..."
+
 # calendar/gui/e-calendar-table.c:163
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
 
@@ -6684,228 +7347,145 @@ msgstr "% 完成"
 
 # camel/camel-filter-driver.c:694
 # camel/camel-filter-driver.c:793
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "完成"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "完成日期"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 # calendar/gui/e-calendar-table.c:155
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "到期日"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 # calendar/gui/e-calendar-table.c:158
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "優先順序"
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "開始日期"
 
-# calendar/gui/e-calendar-table.c:159
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "摘要"
-
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "工作排序"
 
+# mail/mail-ops.c:898
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "移動郵件"
+
+# mail/mail-ops.c:898
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "複製郵件"
+
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-mail.xml.h:77
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "選擇相關郵件(_T)"
 
 # ui/evolution-contact-editor.xml.h:3
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
 # mail/folder-browser.c:713
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "複製至資料夾..."
 
 # mail/folder-browser.c:711
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "移至資料夾(_V)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "設定值(_S)..."
 
-# calendar/gui/e-calendar-table.c:153
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "結束日期"
-
-# calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "開始日期"
-
-# calendar/gui/calendar-model.c:369
-# calendar/gui/event-editor.c:1601
-# calendar/gui/event-editor.c:1628
-# camel/providers/smtp/camel-smtp-transport.c:221
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 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:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "不明"
-
-# calendar/gui/calendar-model.c:1576
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "循環模式"
-
-# calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "已指定"
-
-# calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "是"
-
-# calendar/gui/calendar-model.c:1584
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-# calendar/gui/calendar-model.c:970
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"經緯必須依此格式輸入：\n"
-"\n"
-"45.436845,125.862501"
-
 # 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.
@@ -6934,30 +7514,18 @@ msgstr ""
 "\n"
 "%s"
 
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-# calendar/gui/e-day-view.c:573
-# calendar/gui/e-week-view.c:303
-# calendar/gui/print.c:616
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+# calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "間隔 %02i 分鐘"
 
 # 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
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -6967,16 +7535,28 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d %b"
 
-# calendar/gui/e-day-view-time-item.c:519
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "間隔 %02i 分鐘"
+# calendar/gui/e-day-view.c:570
+# calendar/gui/e-week-view.c:300
+# calendar/gui/print.c:617
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "上午"
+
+# calendar/gui/e-day-view.c:573
+# calendar/gui/e-week-view.c:303
+# calendar/gui/print.c:616
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "下午"
 
 # calendar/gui/event-editor-dialog.glade.h:26
 #: calendar/gui/e-itip-control.c:585
@@ -7049,73 +7629,68 @@ msgstr[1] ""
 msgid ", ending on "
 msgstr ""
 
+# calendar/gui/e-meeting-dialog.glade.h:23
+# mail/message-list.c:1081
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>開始:</b>"
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>結束:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "狀況"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>已完成:</b>"
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "恩尼德"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>逾期:</b>"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "期限 "
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 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:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>無</i>"
-
 # addressbook/backend/ebook/e-card.c:3442
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "位置:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
@@ -7123,306 +7698,290 @@ msgstr "婉拒"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "更新"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "確認"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, 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:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, 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:1193
+#: calendar/gui/e-itip-control.c:1206
 #, 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:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, 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:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, 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:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, 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:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "會議取消"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, 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:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, 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:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "工作計畫"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "工作更新"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, 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:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, 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:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, 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:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, 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:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "訊息似乎沒有被適當地組成"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "到會者狀態不能更新，因為項目已經不存在"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "CORBA 系統發生錯誤\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "找不到物件\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "您沒有正確的權限可以更新行事曆\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "無法更新到會者狀態！\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "到會者狀態不能更新，因為項目已經不存在"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -7458,6 +8017,11 @@ msgstr "載入行事曆"
 msgid "Loading calendar..."
 msgstr "載入行事曆..."
 
+# calendar/gui/e-itip-control.glade.h:9
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "會議召集人:"
+
 # calendar/gui/e-itip-control.glade.h:10
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
@@ -7478,12 +8042,6 @@ msgstr "日期開始"
 msgid "Chair Persons"
 msgstr "主席"
 
-# mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "出席者"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "列席者"
@@ -7563,6 +8121,38 @@ msgstr "已委派"
 msgid "In Process"
 msgstr "進行中"
 
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+# e-util/e-time-utils.c:269
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 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"
+
+# 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
+#. 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:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
@@ -7573,116 +8163,69 @@ msgstr "不在辦公室"
 msgid "No Information"
 msgstr "沒有資訊"
 
-# addressbook/gui/component/addressbook-config.c:662
-#: calendar/gui/e-meeting-time-sel.c:417
+# addressbook/printing/e-contact-print.glade.h:23
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "新增寄件者到目錄服務(_B)"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:431
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "選項(_O)"
+msgid "O_ptions"
+msgstr "選項"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:448
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:461
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:479
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:497
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:514
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:528
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "所有人員與資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "所有與會者與一項資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "需要與會者(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "需要與會者與一項資源(_O)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:607
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "會議開始時間(_S):"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "會議結束時間(_E):"
-
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 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"
-
-# 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
-#. 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:1604
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
 # camel/camel-smime-context.c:194
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
@@ -7690,7 +8233,7 @@ msgid "Enter the password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7699,72 +8242,53 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-# mail/mail-ops.c:1262
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "開啟在 %s 的工作"
-
-# mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"發生於 %s 的錯誤：\n"
-" %s"
-
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "載入影像"
 
+# mail/mail-ops.c:1262
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "開啟在 %s 的工作"
+
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 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:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "工作"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "更新物件"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "無約會"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "載入影像"
 
 # mail/mail-display.c:299
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "在 %s 內開啟..."
@@ -7774,77 +8298,11 @@ msgstr "在 %s 內開啟..."
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "杜林"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "行事曆與工作"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-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:6
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, 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:8
-#, 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:9
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# 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/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "行事曆"
-
-# ui/evolution-tasks.xml.h:9
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "工作(_T)"
-
 # calendar/gui/goto-dialog.glade.h:1
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8257,13 +8715,6 @@ msgstr "選擇的月(%b %Y)"
 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:2297
-msgid "Task"
-msgstr "工作"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: calendar/gui/print.c:2356
 #, c-format
@@ -8304,7 +8755,7 @@ msgstr "連絡人: "
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "預覽列印"
 
@@ -8342,7 +8793,7 @@ msgid_plural "%d tasks"
 msgstr[0] "無工作"
 msgstr[1] "無工作"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8364,29 +8815,23 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "工作(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "新增工作"
@@ -8394,13 +8839,13 @@ msgstr "新增工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "建立一個新的工作"
@@ -10143,7 +10588,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:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
@@ -10151,79 +10596,79 @@ msgstr "建立到“%s”的導管失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 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:754
+#: camel/camel-filter-driver.c:756
 #, 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:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:866
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "分析過濾器發生錯誤： %s: %s"
 
 # camel/camel-filter-driver.c:871
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "執行過濾器發生錯誤： %s: %s"
 
 # camel/camel-filter-driver.c:643
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "無法開啟 spool 資料夾"
 
 # camel/camel-filter-driver.c:652
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "無法處理 spool 資料夾"
 
 # camel/camel-filter-driver.c:666
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "接收郵件 %d (%d%%)"
 
 # camel/camel-filter-driver.c:671
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "不能開啟郵件"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, 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:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "同步處理資料夾"
 
 # camel/camel-filter-driver.c:748
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, 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:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "在第 %d / %d 封郵件失敗"
@@ -10253,48 +10698,6 @@ msgstr "無效的參數給 (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "不支援的操作：添加郵件： %s"
-
-# camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "不支援的操作：以詞句搜尋： %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "不支援的操作：以 uids 搜尋： %s"
-
-# mail/mail-ops.c:898
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "移動郵件"
-
-# mail/mail-ops.c:898
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "複製郵件"
-
-# widgets/misc/e-messagebox.c:159
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "蘭辛"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-# mail/mail-ops.c:1565
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "取回 %d 封郵件"
-
 # camel/camel-folder-search.c:328
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
@@ -10349,7 +10752,49 @@ msgstr "(符合-全部) 需要單一布林值結果"
 msgid "Performing query on unknown header: %s"
 msgstr "在不明的檔頭內執行查詢：%s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "不支援的操作：添加郵件： %s"
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "不支援的操作：以詞句搜尋： %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "不支援的操作：以 uids 搜尋： %s"
+
+# mail/mail-ops.c:898
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "移動郵件"
+
+# mail/mail-ops.c:898
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "複製郵件"
+
+# widgets/misc/e-messagebox.c:159
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "蘭辛"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+# mail/mail-ops.c:1565
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "取回 %d 封郵件"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -10360,15 +10805,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -10378,32 +10823,32 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 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:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 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:1141
+#: camel/camel-gpg-context.c:1144
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -10416,74 +10861,96 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "無法 GPG %s： %s\n"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, 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:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, 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:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "執行 gpg 失敗。"
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, 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:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法寫入資料：%s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位加簽的郵件"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "索引內文包含"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
 
+# camel/camel-movemail.c:306
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "不能建立鎖定 helper 導管：%s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "不能分叉鎖定 helper ： %s"
+
+#: 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”： lock-helper 協定錯誤"
+
+# camel/camel-movemail.c:318
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "無法鎖定“%s”"
+
 # camel/camel-lock.c:92
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
@@ -10512,28 +10979,6 @@ msgstr "使用 fcntl(2) 取得鎖失敗： %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗： %s"
 
-# camel/camel-movemail.c:306
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "不能建立鎖定 helper 導管：%s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "不能分叉鎖定 helper ： %s"
-
-#: 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”： lock-helper 協定錯誤"
-
-# camel/camel-movemail.c:318
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "無法鎖定“%s”"
-
 # camel/camel-movemail.c:101
 #: camel/camel-movemail.c:107
 #, c-format
@@ -10816,7 +11261,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:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -10912,65 +11357,65 @@ msgid "Regular expression compilation failed: %s: %s"
 msgstr "正規表示式編譯失敗： %s： %s"
 
 # camel/camel-service.c:154
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL“%s”需要 username 元件"
 
 # camel/camel-service.c:162
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL“%s”需要 host 元件"
 
 # camel/camel-service.c:170
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL“%s”需要 path 元件"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "解析：%s"
 
 # camel/camel-service.c:575
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "搜尋名稱失敗： %s"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "搜尋主機失敗：不明原因"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "搜尋主機失敗： %s ：找不到主機"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "搜尋主機失敗： %s ：不明原因"
 
 # camel/camel-service.c:548
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "解析位址"
 
 # camel/camel-service.c:600
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "搜尋主機失敗：找不到主機"
 
 # camel/camel-service.c:602
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "搜尋主機失敗：不明原因"
 
@@ -11056,7 +11501,7 @@ msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
 # mail/mail-crypto.c:251
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "無法建立一個 S/MIME 解密文本。"
@@ -11171,7 +11616,7 @@ msgstr ""
 # mail/mail-config.glade.h:74
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "儲存簽名檔"
 
 # mail/mail-config.glade.h:72
@@ -11189,51 +11634,55 @@ msgstr "IMAP 指令失敗： %s"
 # camel/camel-smime-context.c:327
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "無法找到“%s”的憑證。"
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "無法找到通用分散運算法。"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
-# mail/folder-browser.c:731
+# camel/camel-filter-driver.c:671
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "從郵件建立規則(_T)"
+msgid "Cannot create CMS Message"
+msgstr "不能開啟郵件"
 
+# camel/camel-filter-driver.c:671
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "不能開啟郵件"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "不能附加檔案 %s： %s"
 
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "不能附加檔案 %s： %s"
 
+# camel/camel-filter-driver.c:671
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "不能開啟郵件"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-# mail/mail-crypto.c:251
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "無法建立一個 S/MIME 解密文本。"
-
 # camel/providers/imap/camel-imap-store.c:531
 #: camel/camel-smime-context.c:888
 #, fuzzy
@@ -11291,7 +11740,8 @@ msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
@@ -11306,8 +11756,8 @@ msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "6月"
@@ -11433,7 +11883,7 @@ msgstr "金鑰的用途並不支援憑證加簽"
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -11446,11 +11896,11 @@ msgstr ""
 "指紋:              %s\n"
 "簽章:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "良好"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "不良"
 
@@ -11476,7 +11926,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -11491,7 +11941,7 @@ msgstr ""
 "\n"
 "您想要接受嗎？"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -11500,7 +11950,7 @@ msgstr ""
 "憑證問題： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -11509,7 +11959,7 @@ msgstr ""
 "不正確的憑證網域： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -11518,7 +11968,7 @@ msgstr ""
 "憑證已逾期： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -11528,7 +11978,7 @@ msgstr ""
 "發照者： %s"
 
 # camel/camel-url.c:289
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
@@ -11558,7 +12008,7 @@ msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
@@ -11584,8 +12034,8 @@ msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "檢查所有資料夾裡的新郵件"
 
@@ -11627,8 +12077,8 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -11648,385 +12098,6 @@ msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 msgid "Checklist"
 msgstr "濃靄"
 
-# camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "從 IMAP 伺服器傳回不當的回應： %s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "不能刪除資料夾： %s ：無效的操作"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/camel-remote-store.c:476
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "伺服器突然中斷連線： %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "不能取得資料夾：%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/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %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/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %s"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "不能將郵件儲存到 mh 資料夾： %s： %s"
-
-# camel/providers/local/camel-mh-folder.c:149
-# camel/providers/local/camel-mh-folder.c:157
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "不能將郵件儲存到 mh 資料夾： %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/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %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/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %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/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %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/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %s"
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:50
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只顯示已訂閱的資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:52
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: 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/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "命名空間"
-
-# mail/mail-config.glade.h:34
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-# camel/providers/imap/camel-imap-provider.c:65
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
-
-# camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
-
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺服器 %s"
-
-# camel/camel-remote-store.c:195
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s 的 IMAP 服務於 %s"
-
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: 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 (埠號 %d)： %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS 無法使用"
-
-# camel/camel-remote-store.c:252
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "連線已取消"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
-# camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr "無法連線到 POP 伺服器 %s：不支援所要求的驗證機制。"
-
-# camel/providers/smtp/camel-smtp-transport.c:395
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
-
-# camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "無法驗證 POP 伺服器 %s：%s"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "不能取得資料夾：%s：%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "不能重新命名資料夾： %s ：無效的操作"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "不能刪除資料夾： %s ：無效的操作"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "不能刪除資料夾： %s ：無效的操作"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-# addressbook/contact-editor/e-contact-editor.c:1248
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "公司電話"
-
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "不能刪除資料夾： %s ：無效的操作"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "不能重新命名資料夾： %s ：無效的操作"
-
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "不能取得資料夾：%s：%s"
-
-# camel/providers/imap/camel-imap-command.c:232
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "從 IMAP 伺服器傳回不當的回應： %s"
-
-# ui/evolution-tasks.xml.h:3
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "無工作"
-
-# camel/camel-remote-store.c:476
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "伺服器突然中斷連線： %s"
-
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -12034,17 +12105,28 @@ msgstr "伺服器突然中斷連線： %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "作業已取消"
 
 # camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線： %s"
 
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
 # camel/providers/imap/camel-imap-command.c:232
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
@@ -12133,7 +12215,7 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -12223,6 +12305,32 @@ msgstr "無法連線至 LDAP 伺服器"
 msgid "Command:"
 msgstr "公司電話"
 
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "資料夾"
+
+# camel/providers/imap/camel-imap-provider.c:50
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "只顯示已訂閱的資料夾"
+
+# camel/providers/imap/camel-imap-provider.c:52
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "覆蓋伺服器提供之資料夾的命名空間"
+
+# camel/providers/imap/camel-imap-provider.c:54
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+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"
@@ -12250,42 +12358,98 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
+# camel/providers/smtp/camel-smtp-transport.c:534
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 伺服器 %s"
+
+# camel/camel-remote-store.c:195
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 的 IMAP 服務於 %s"
+
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: 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 (埠號 %d)： %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS 無法使用"
+
+# camel/camel-remote-store.c:252
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "連線已取消"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
+
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "不支援 SSL/TLS 擴充機能。"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法連線至 %s (埠號 %d)： %s"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
@@ -12293,12 +12457,12 @@ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12311,21 +12475,29 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
@@ -12333,11 +12505,323 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾： %s"
 
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線： %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "不能取得資料夾：%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/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %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/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "不能將郵件儲存到 mh 資料夾： %s： %s"
+
+# camel/providers/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "不能將郵件儲存到 mh 資料夾： %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/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %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/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %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/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %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/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
+# mail/mail-config.glade.h:34
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+# camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
+
+# camel/providers/imap/camel-imap-provider.c:82
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
+
+# camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "無法連線到 POP 伺服器 %s：不支援所要求的驗證機制。"
+
+# camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "公司電話"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# ui/evolution-tasks.xml.h:3
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "無工作"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線： %s"
+
 # camel/providers/pop3/camel-pop3-provider.c:37
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
@@ -12528,16 +13012,25 @@ msgstr "無法儲存摘要： %s： %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "無法新增郵件到摘要資訊：不明的原因"
 
+# mail/local-config.glade.h:8
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "收件匣"
+
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/providers/local/camel-maildir-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir 增添郵件已取消"
 
 # camel/providers/local/camel-maildir-folder.c:150
 # camel/providers/local/camel-maildir-folder.c:158
 # camel/providers/local/camel-maildir-folder.c:169
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
@@ -12545,9 +13038,9 @@ msgstr "無法將郵件儲存到 maildir 資料夾： %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-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -12565,13 +13058,13 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
@@ -12581,7 +13074,7 @@ msgstr "不能取得資料夾：%s：%s"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
@@ -12590,7 +13083,7 @@ msgstr "資料夾“%s”不存在。"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
@@ -12598,7 +13091,7 @@ msgid "Cannot create folder `%s': %s"
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-maildir-store.c:122
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "“%s”不是一個 maildir 目錄。"
@@ -12606,21 +13099,21 @@ msgstr "“%s”不是一個 maildir 目錄。"
 # camel/providers/local/camel-maildir-store.c:151
 # camel/providers/local/camel-maildir-store.c:188
 # camel/providers/local/camel-mh-store.c:127
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "無法刪除資料夾“%s”： %s"
 
 # camel/providers/local/camel-maildir-store.c:152
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -13344,54 +13837,60 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "無法連線至 POP 伺服器 %s (埠號 %d)： %s"
 
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
 # camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "無法以安全模式連線到 POP 伺服器 %s： %s"
 
 # camel/providers/pop3/camel-pop3-store.c:322
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "無法連線到 POP 伺服器 %s"
 
 # camel/providers/pop3/camel-pop3-store.c:409
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr "無法連線到 POP 伺服器 %s：不支援所要求的驗證機制。"
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL “%s”登入失敗於 POP 伺服器 %s： %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "不能登入 POP 伺服器 %s： SASL 通訊協定錯誤"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "無法驗證 POP 伺服器 %s：%s"
 
 # camel/providers/pop3/camel-pop3-store.c:361
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%s 請輸入給 %s@%s 的 POP 密碼"
 
 # camel/providers/pop3/camel-pop3-store.c:417
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -13400,8 +13899,18 @@ msgstr ""
 "無法連線到 POP 伺服器 %s。\n"
 "傳送密碼時發生錯誤：%s"
 
+# camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"無法連線到 POP 伺服器 %s。\n"
+"傳送密碼時發生錯誤：%s"
+
 # camel/providers/pop3/camel-pop3-store.c:484
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "沒有這個資料夾“%s”。"
@@ -13662,116 +14171,116 @@ msgstr ""
 "\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP 伺服器 %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:536
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "經由 %s 傳送 SMTP 郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "不能傳送郵件：沒有定義收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:568
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "不能傳送郵件：寄件者的地址無效。"
 
 # mail/mail-ops.c:603
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "傳送郵件"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "不能傳送郵件：沒有定義收件者。"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "不能傳送郵件：一或多個無效的收件者"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP 迎接"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP 指令失敗： %s"
 
 # mail/mail-config.glade.h:10
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP 驗證"
 
 # camel/providers/smtp/camel-smtp-transport.c:728
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "建立 SASL 驗證物件時發生錯誤。"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:809
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "從伺服器傳回不正確驗證的回應。\n"
 
 # camel/providers/smtp/camel-smtp-transport.c:835
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM 的要求逾時：%s：郵件無法傳送"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:879
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCPT TO 的要求逾時：%s：郵件無法傳送"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> 失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:929
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA 的要求逾時：%s：郵件無法傳送"
@@ -13780,32 +14289,32 @@ msgstr "DATA 的要求逾時：%s：郵件無法傳送"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP 指令失敗： %s"
@@ -13885,108 +14394,6 @@ msgstr "MIME 類型:"
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
-
-# camel/camel-filter-driver.c:671
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "不能開啟郵件"
-
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "無法從編輯器取得郵件"
-
-# mail/mail-search.c:138
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(未命名的郵件)"
-
-# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "開啟檔案"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "自動產生的"
-
-# mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "簽名檔:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "編輯郵件"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用位址選擇器控制元。"
-
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。\n"
-"請確定您已經安裝了正確版本\n"
-"的 gtkhtml 與 libgtkhtml 。\n"
-
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。"
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -14084,6 +14491,93 @@ msgstr "<按這裏選擇資料夾>"
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+# camel/camel-filter-driver.c:671
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "不能開啟郵件"
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "無法從編輯器取得郵件"
+
+# mail/mail-search.c:138
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(未命名的郵件)"
+
+# composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "開啟檔案"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "自動產生的"
+
+# mail/mail-config.glade.h:74
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "簽名檔:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "編輯郵件"
+
+# mail/mail-tools.c:219
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "轉寄的郵件 - %s"
+
+# composer/e-msg-composer-attachment-bar.c:501
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "附加原始訊息"
+msgstr[1] "附加原始訊息"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
+
 # composer/e-msg-composer-attachment-bar.c:501
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
@@ -14091,11 +14585,6 @@ msgstr "附加檔案"
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "附加檔案至郵件"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -14113,29 +14602,44 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
+# camel/camel-movemail.c:306
+#. mail-composer:attach-nomessages primary
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "無法建立導管：%s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
 # mail/mail-search.c:138
 #. mail-composer:recover-autosave title
-#: composer/mail-composer-errors.xml.h:12
+#: composer/mail-composer-errors.xml.h:16
 #, fuzzy
 msgid "Unfinished messages found"
 msgstr "下一封未閱讀的郵件(_U)"
 
 # calendar/gui/dialogs/save-comp.c:51
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "您是否須要儲存變更？"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 # shell/e-shortcuts-view.c:265
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "不要移除"
@@ -14144,34 +14648,34 @@ msgstr "不要移除"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "移除"
 
 # mail/mail-crypto.c:59
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "無法儲存簽名檔： %s"
 
 # shell/e-shortcuts.c:381
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "儲存功能項目時發生錯誤。"
 
 # mail/mail-ops.c:1154
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
 # calendar/gui/dialogs/delete-comp.c:87
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -14179,64 +14683,83 @@ msgid ""
 msgstr "您確定要刪除這個未命名的約會？"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "放棄變更(_D)"
-
 # mail/mail-callbacks.c:1188
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "另存郵件..."
 
 # camel/camel-movemail.c:306
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "無法建立導管：%s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 # mail/mail-crypto.c:59
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "無法儲存簽名檔： %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 # mail/mail-callbacks.c:146
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
 "您必須要先設定一個帳號\n"
 "才可以開始撰寫郵件。"
 
+# camel/camel-movemail.c:306
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "無法建立導管：%s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用位址選擇器控制元。"
+
+# composer/evolution-composer.c:355
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用 HTML 編輯器元件。\n"
+"請確定您已經安裝了正確版本\n"
+"的 gtkhtml 與 libgtkhtml 。\n"
+
 # data/evolution.desktop.in.h:2
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
@@ -14590,11 +15113,6 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "過濾器規則"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
@@ -14627,22 +15145,8 @@ msgstr "您必須指定一個檔案名稱。"
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "排程器“%s”不存在或不是一個合法的檔案。"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "移除資料夾 %s"
-
-# ui/evolution.xml.h:3
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "您必須指定一個資料夾。"
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -14650,163 +15154,40 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 # calendar/gui/calendar-model.c:1578
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "指派工作"
 
 # ui/evolution.xml.h:3
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "您必須為這個過濾器命名。"
 
-# ui/evolution.xml.h:3
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "您必須為這個虛擬資料夾命名。"
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "尚未選擇伺服器"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 # ui/evolution-message-composer.xml.h:12
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>逾期:</b>"
-
-# mail/mail-account-gui.c:682
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "選擇資料夾"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid "    "
-msgstr ""
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "過濾器規則"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "虛擬資料夾來源"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "比較"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "內送"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"郵件日期將會與您在這裡指定\n"
-"日期的 12:00am 做比較。"
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"郵件日期將會與相對於過濾器執行\n"
-"的時間作比較。"
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"郵件日期將會與過濾器執行時的\n"
-"時間作比較。"
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "相對於目前時間的時差"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "前"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "月"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "秒"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "只需指定資料夾"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "目前時間"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "您所指定的時間"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "包括全部可用的遠端資料夾"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "包括全部本地端及可用的遠端資料夾"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "包括全部本地端的資料夾"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "年"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "重要"
 
@@ -14880,6 +15261,71 @@ msgstr "內送"
 msgid "outgoing"
 msgstr "外寄"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "過濾器規則"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "比較"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "內送"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"郵件日期將會與您在這裡指定\n"
+"日期的 12:00am 做比較。"
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"郵件日期將會與相對於過濾器執行\n"
+"的時間作比較。"
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"郵件日期將會與過濾器執行時的\n"
+"時間作比較。"
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "相對於目前時間的時差"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "前"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "月"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "秒"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "目前時間"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "您所指定的時間"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "年"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "新增規則"
@@ -14892,67 +15338,91 @@ msgstr "編輯規則"
 msgid "Rule name"
 msgstr "規則名稱"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "目標規則"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-# mail/message-list.c:1081
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "目標"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "郵件編輯器偏好設定"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "內文包含"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "內文不包含"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "內文或主旨包含"
+# ui/evolution-mail.xml.h:19
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在此設定您的郵件帳號"
 
-# addressbook/gui/component/addressbook.c:619
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "郵件包含"
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-# calendar/gui/gnome-cal.c:235
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "收件者包含"
+# mail/mail-account-editor.c:173
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 帳號編輯器"
 
-# addressbook/gui/component/addressbook.c:619
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "寄件者包含"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution 郵件編輯器。"
 
-# addressbook/gui/component/addressbook.c:619
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "主旨包含"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution 郵件編輯器。"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "主旨不包含"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 郵件編輯器。"
 
-#: filter/vfolder-editor.c:108
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
-msgid "Virtual _Folders"
-msgstr "虛擬資料夾"
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 郵件執行摘要元件。"
 
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "新增(_A)"
+# 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-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "郵件"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-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:99
+msgid "Mail Preferences"
+msgstr "郵件偏好設定"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "郵件(_M)"
 
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
@@ -14992,23 +15462,308 @@ msgid "Signature(s)"
 msgstr "簽名檔"
 
 # mail/mail-ops.c:1154
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "轉寄的郵件"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 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-composer-utils.c:1505
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "過濾器規則"
+
+# mail/mail-account-gui.c:682
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "選擇資料夾"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr "調整目標"
+
+#: mail/em-filter-i18n.h:3
+msgid "Assign Color"
+msgstr "指定色彩"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "指定目標"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "附加檔案"
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "嗶聲"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "包含"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "複製至資料夾"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "收件日期"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "送件日期"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "已刪除"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "不包含"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "不是以此結束"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "不存在"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "沒有傳回"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "不類似"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "不是以此開始"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "不存在"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "草稿"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "以此終結"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "存在"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "存在"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "詞句"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "跟隨"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "是"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "是之後的"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "是之前的"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "有標幟的"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "大於"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "小於"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "不是"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "沒有標幟的"
+
+# calendar/gui/goto-dialog.glade.h:9
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "6月"
+
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "標籤"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "郵件列表"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "郵件內容"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "郵件檔頭"
+
+# views/mail/galview.xml.h:4
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "郵件"
+
+# mail/folder-browser.c:706
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "標示成重要(_I)"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "移至資料夾"
+
+# ui/evolution.xml.h:19
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "離開這個程式"
+
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "播放音效"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "閱讀"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "收件者"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "正規表示式相配"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "回覆"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "傳回"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "傳回大於"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "傳回小於"
+
+# calendar/gui/event-editor-dialog.glade.h:22
+# calendar/gui/event-editor.c:1597
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "執行程式:"
+
+# mail/message-list.c:1081
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "目標"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "寄件者"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "設定狀態"
+
+# addressbook/printing/e-contact-print.glade.h:36
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "大小 (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "類似"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "來源帳號"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "指定檔頭"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "以此開始"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "停止處理"
+
+# mail/mail-format.c:767
+# mail/message-list.c:1082
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "主旨"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "取消設定狀態"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
 #, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
+msgid "<b>Then</b>"
+msgstr "<b>逾期:</b>"
 
 # ui/evolution-mail.xml.h:10
 #: mail/em-folder-browser.c:129
@@ -15018,37 +15773,27 @@ msgstr "從搜尋建立虛擬資料夾(_V)..."
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+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-properties.c:126
-msgid "Properties"
-msgstr "屬性"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "資料夾名稱(_F):"
-
 # camel/providers/smtp/camel-smtp-transport.c:178
-#: mail/em-folder-properties.c:146
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "求助說明訊息"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "求助說明訊息"
+msgstr[1] "求助說明訊息"
 
 # mail/mail-search.c:138
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "下一封未閱讀的郵件(_U)"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "下一封未閱讀的郵件(_U)"
+msgstr[1] "下一封未閱讀的郵件(_U)"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -15060,84 +15805,99 @@ msgid "Create New Folder"
 msgstr "建立新資料夾"
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "指定建立資料夾的位置："
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "克里斯由"
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 #, fuzzy
 msgid "Folder _name:"
 msgstr "資料夾名稱:"
 
+# camel/providers/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "虛擬資料夾"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+# mail/mail-send-recv.c:287
+# mail/mail-send-recv.c:333
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "載入中..."
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "將郵件複製到 %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # ui/evolution-mail.xml.h:101
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
 # ui/evolution-mail.xml.h:112
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # ui/evolution-mail.xml.h:55
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:2
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "取消工作"
 
 # shell/e-shell-importer.c:601
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
@@ -15146,34 +15906,34 @@ msgstr "選擇資料夾"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "複製"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "貯藏資料夾“%s”"
 
 # ui/evolution.xml.h:10
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "新增一個資料夾"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, 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:2465
+#: mail/em-folder-tree.c:2528
 #, fuzzy
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
@@ -15182,75 +15942,51 @@ msgstr "重新命名資料夾"
 # 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:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "檢視(_V)"
 
 # ui/evolution.xml.h:24
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "在新視窗開啟"
 
+# ui/evolution.xml.h:45
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "複製(_C)..."
+
+# ui/evolution.xml.h:57
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "移動(_M)..."
+
 # ui/evolution.xml.h:59
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 #, fuzzy
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)"
 
 # ui/evolution.xml.h:61
-#: mail/em-folder-tree.c:2549
-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:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "屬性(_P)..."
-
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "虛擬資料夾"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-# mail/local-config.glade.h:8
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "收件匣"
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "重新命名(_R)..."
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "載入中..."
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-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:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "屬性"
 
 # 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:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
@@ -15259,37 +15995,37 @@ 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:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -15297,290 +16033,306 @@ 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:907
+#: mail/em-folder-view.c:911
 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:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "標籤"
-
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "過濾器規則"
 
 # mail/folder-browser.c:731
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
 # mail/folder-browser.c:668
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "列印郵件"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "複製連結位址"
 
 # calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "請按這裡增加新的工作"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "寄件者"
-
-# mail/mail-format.c:759
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "回覆"
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件者"
-
-# mail/mail-format.c:765
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "副本"
-
-# composer/e-msg-composer-hdrs.c:394
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "密件副本"
-
-# mail/mail-format.c:767
-# mail/message-list.c:1082
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "主旨"
-
-# mail/mail-format.c:640
-# mail/message-list.c:1082
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-# mail/mail-format.c:527
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附加檔案"
-
-# mail/mail-format.c:573
-#: mail/em-format.c:1024 mail/em-format.c:1143
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-# mail/mail-format.c:573
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
-
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支援的基模"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
-
-# mail/mail-ops.c:1498
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+# mail/mail-search.c:319
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
 #, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "取回郵件 %s"
+msgid "Matches: %d"
+msgstr "符合的資料:"
 
 # calendar/gui/calendar-model.c:1578
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
 #, fuzzy
 msgid "Unsigned"
 msgstr "已指定"
 
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
 # mail/mail-config.glade.h:74
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
 #, fuzzy
 msgid "Valid signature"
 msgstr "儲存簽名檔"
 
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:642
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
 # mail/mail-config.glade.h:74
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
 #, fuzzy
 msgid "Invalid signature"
 msgstr "儲存簽名檔"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
 msgid "Unencrypted"
 msgstr "已中斷"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
+msgstr ""
+
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
 msgid "Encrypted, weak"
 msgstr ""
 
+#: mail/em-format-html-display.c:651
+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.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:652
+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:653 mail/em-format-html.c:571
 msgid "Encrypted, strong"
 msgstr ""
 
+#: mail/em-format-html-display.c:653
+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:754 smime/gui/smime-ui.glade.h:47
+#, fuzzy
+msgid "_View Certificate"
+msgstr "憑證 ID(_C):"
+
+#: mail/em-format-html-display.c:769
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "憑證尚未生效"
+
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1004
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "逾期:"
+
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# mail/mail-display.c:301
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "檢視行內"
+
+# mail/mail-display.c:363
+#: mail/em-format-html-display.c:1086
+#, fuzzy
+msgid "_Hide"
+msgstr "隱藏"
+
+# camel/camel-filter-driver.c:748
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d / %d 頁"
+
+# mail/mail-ops.c:1498
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "取回郵件 %s"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
 # mail/mail-format.c:1842
 #: mail/em-format-html.c:820
 msgid "Malformed external-body part."
@@ -15621,10 +16373,43 @@ msgstr "不明的外部檔案指示 (“%s”類型)"
 msgid "Formatting message"
 msgstr "移動郵件"
 
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "寄件者"
+
+# mail/mail-format.c:759
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "回覆"
+
+# mail/mail-format.c:762
+# mail/message-list.c:1083
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件者"
+
+# mail/mail-format.c:765
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "副本"
+
+# composer/e-msg-composer-hdrs.c:394
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "密件副本"
+
 # addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "寄件者"
 
@@ -15638,115 +16423,52 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-# mail/mail-search.c:319
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "符合的資料:"
-
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:645
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html-display.c:647
-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:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-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:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+# mail/mail-format.c:640
+# mail/message-list.c:1082
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日期"
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "憑證 ID(_C):"
+# mail/mail-format.c:527
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附加檔案"
 
-#: mail/em-format-html-display.c:772
+# mail/mail-format.c:573
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "憑證尚未生效"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1007
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "逾期:"
+# mail/mail-format.c:573
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1018
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
+msgid "Unsupported signature format"
+msgstr "不支援的基模"
 
-# mail/mail-display.c:301
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "檢視行內"
+msgid "Error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
 
-# mail/mail-display.c:363
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "隱藏"
-
-# camel/camel-filter-driver.c:748
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d / %d 頁"
+msgid "Unknown error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -15887,7 +16609,7 @@ msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -15905,7 +16627,7 @@ msgstr "訂閱"
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "資料夾"
 
@@ -15949,11 +16671,26 @@ msgstr "地址"
 
 # mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "郵件來自 %s "
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "虛擬資料夾"
+
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "新增(_A)"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "虛擬資料夾來源"
+
 # mail/mail-config.glade.h:12
 #: mail/evolution-mail.schemas.in.in.h:1
 #, fuzzy
@@ -16480,81 +17217,41 @@ msgstr ""
 msgid "spamd port"
 msgstr "匯入"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "郵件編輯器偏好設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-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:5
-msgid "Configure your email accounts here"
-msgstr "在此設定您的郵件帳號"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-# mail/mail-account-editor.c:173
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 帳號編輯器"
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
 #, fuzzy
-msgid "Evolution Mail component"
+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_Importers.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Mail composer"
+msgid "Evolution Netscape Mail importer"
 msgstr "Evolution 郵件編輯器。"
 
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
+msgid "Evolution Pine importer"
 msgstr "Evolution 郵件編輯器。"
 
-# 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_Importers.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 郵件執行摘要元件。"
-
-# mail/mail-config.glade.h:6
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "郵件帳號"
+msgid "Evolution mbox importer"
+msgstr "Evolution 郵件編輯器。"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "郵件偏好設定"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-msgid "_Mail"
-msgstr "郵件(_M)"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 #: mail/importers/elm-importer.c:88
@@ -16624,42 +17321,6 @@ msgstr "匯入中"
 msgid "Importing mailbox"
 msgstr "匯入檔案中"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.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_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution 郵件編輯器。"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Pine importer"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-#, fuzzy
-msgid "Evolution mbox importer"
-msgstr "Evolution 郵件編輯器。"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
-
 # mail/mail-ops.c:599
 #: mail/importers/mail-importer.c:360
 #, c-format
@@ -16854,93 +17515,97 @@ msgstr "%s 郵件列表"
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d 已選擇"
+msgid_plural "%d deleted"
+msgstr[0] "%d 已選擇"
+msgstr[1] "%d 已選擇"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d 未傳送"
+msgid_plural "%d junk"
+msgstr[0] "%d 未傳送"
+msgstr[1] "%d 未傳送"
 
 # mail/mail-config.glade.h:26
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "草稿"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "草稿"
+msgstr[1] "草稿"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d 已傳送"
+msgid_plural "%d sent"
+msgstr[0] "%d 已傳送"
+msgstr[1] "%d 已傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d 未傳送"
+msgid_plural "%d unsent"
+msgstr[0] "%d 未傳送"
+msgstr[1] "%d 未傳送"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d 全部"
+msgid_plural "%d total"
+msgstr[0] "%d 全部"
+msgstr[1] "%d 全部"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d 未傳送"
+msgid_plural ", %d unread"
+msgstr[0] "%d 未傳送"
+msgstr[1] "%d 未傳送"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "新增虛擬資料夾"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "郵件規則"
 
 # ui/evolution.xml.h:10
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "新增一個資料夾"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "檢查服務"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "正在連線至伺服器..."
-
 # mail/mail-config.glade.h:35
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
@@ -17009,18 +17674,26 @@ msgstr ""
 "理為一個 Evolution 郵件帳號。現請在下面的空白處為這個帳號輸入一個名稱。這個名"
 "稱僅用作顯示用途。"
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "檢查服務"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "正在連線至伺服器..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid "    "
+msgstr ""
+
 # mail/mail-config.glade.h:1
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " 檢查可支援的類別(_C) "
 
-# calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "預覽"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -17328,7 +18001,7 @@ msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要加簽會議邀請(為了相容 Outlook)(_M)"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
@@ -17751,6 +18424,136 @@ msgstr "顏色"
 msgid "description"
 msgstr "描述"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "虛擬資料夾來源"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "接受"
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "已完成(_O)"
+
+# mail/mail-search.c:298
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "區分大小寫"
+
+# mail/mail-search.c:268
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "在郵件內尋找"
+
+# mail/mail-search.c:316
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "尋找:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "要跟隨的標幟"
+
+# mail/subscribe-dialog.c:873
+#: mail/mail-dialogs.glade.h:17
+#, fuzzy
+msgid "Folder Subscriptions"
+msgstr "管理訂閱"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+#, fuzzy
+msgid "None Selected"
+msgstr "已選擇"
+
+# calendar/gui/event-editor-dialog.glade.h:10
+#: mail/mail-dialogs.glade.h:20
+#, fuzzy
+msgid "S_erver:"
+msgstr "每(_E)"
+
+# mail/mail-config.glade.h:4
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "帳號資訊"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"您選擇要跟隨的郵件已在下面列出。\n"
+"請從“標幟”選單中選擇跟隨的動作。"
+
+# mail/mail-config.glade.h:6
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "郵件帳號"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "到期於(_D):"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "標幟(_F):"
+
+# ui/evolution-subscribe.xml.h:8
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "訂閱(_S)"
+
+# ui/evolution-subscribe.xml.h:9
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "取消訂閱(_U)"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "只需指定資料夾"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "包括全部可用的遠端資料夾"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "包括全部本地端及可用的遠端資料夾"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "包括全部本地端的資料夾"
+
 # mail/mail-config.glade.h:10
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
@@ -17973,14 +18776,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 # addressbook/gui/component/addressbook-config.c:165
 # camel/camel-sasl-plain.c:32
 # camel/providers/imap/camel-imap-provider.c:80
@@ -18120,10 +18915,13 @@ msgid ""
 "will be deleted permanently."
 msgstr ""
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "不能移動資料夾：%s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -18182,8 +18980,9 @@ msgstr "無法開啟共用的資料夾：%s。"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "和 1 個其他名片。"
 
 # mail/mail-account-editor.c:105
 #. mail:account-incomplete secondary
@@ -18215,10 +19014,12 @@ msgstr "您確定要刪除這個帳號？"
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-# shell/e-shortcuts-view.c:265
+# mail/folder-browser.c:717
+# ui/evolution-mail.xml.h:121
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "不要刪除"
+msgstr "復原(_U)"
 
 # mail/mail-crypto.c:59
 #. mail:no-save-signature primary
@@ -18287,10 +19088,15 @@ msgid ""
 "to add it explictly, if required."
 msgstr ""
 
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"不能刪除資料夾：\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -18332,13 +19138,48 @@ msgstr ""
 "   “%s”\n"
 "已經更新。"
 
-#. mail:ask-migrate-existing primary
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "移除資料夾 %s"
+
+# ui/evolution.xml.h:3
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "您必須指定一個資料夾。"
+
+# ui/evolution.xml.h:3
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "您必須為這個虛擬資料夾命名。"
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "尚未選擇伺服器"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18346,13 +19187,13 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "覆寫"
@@ -18361,7 +19202,7 @@ msgstr "覆寫"
 # calendar/gui/e-week-view.c:3292
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-message-composer.xml.h:11
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "阿斯本"
@@ -18556,7 +19397,7 @@ msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -18566,52 +19407,23 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-# mail/mail-search.c:298
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "區分大小寫"
-
-# mail/mail-search.c:268
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "在郵件內尋找"
-
-# mail/mail-search.c:316
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "尋找:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-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:157
 msgid "Cancelling..."
@@ -18657,12 +19469,12 @@ msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -18673,17 +19485,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:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -18754,16 +19566,16 @@ msgstr "更新用於 URI： %s 的虛擬資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
@@ -18843,7 +19655,7 @@ msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -18914,10 +19726,6 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "閱讀"
-
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
@@ -18935,62 +19743,61 @@ msgstr "全部回覆"
 msgid "Review"
 msgstr "檢閱"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "要跟隨的標幟"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "內文包含"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "已完成(_O)"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "內文不包含"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"您選擇要跟隨的郵件已在下面列出。\n"
-"請從“標幟”選單中選擇跟隨的動作。"
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "內文或主旨包含"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "到期於(_D):"
+# addressbook/gui/component/addressbook.c:619
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "郵件包含"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "標幟(_F):"
+# calendar/gui/gnome-cal.c:235
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "收件者包含"
 
-# mail/subscribe-dialog.c:873
-#: mail/subscribe-dialog.glade.h:1
-#, fuzzy
-msgid "Folder Subscriptions"
-msgstr "管理訂閱"
+# addressbook/gui/component/addressbook.c:619
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "寄件者包含"
 
-#: mail/subscribe-dialog.glade.h:2
-#, fuzzy
-msgid "None Selected"
-msgstr "已選擇"
+# addressbook/gui/component/addressbook.c:619
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "主旨包含"
 
-# calendar/gui/event-editor-dialog.glade.h:10
-#: mail/subscribe-dialog.glade.h:3
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "主旨不包含"
+
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 #, fuzzy
-msgid "S_erver:"
-msgstr "每(_E)"
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
 
-# ui/evolution-subscribe.xml.h:8
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "訂閱(_S)"
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-# ui/evolution-subscribe.xml.h:9
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "取消訂閱(_U)"
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution 測試元件。"
 
 # calendar/gui/e-calendar-table.c:375
 #: shell/apps_evolution_shell.schemas.in.in.h:1
@@ -19065,37 +19872,21 @@ msgstr ""
 msgid "mail"
 msgstr "電子郵件"
 
-# calendar/gui/e-week-view-main-item.c:342
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: shell/e-shell.c:786
+# shell/e-shell-offline-handler.c:554
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "不明的錯誤"
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "無效的參數"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "不能於 OAF 註冊"
+msgid "<b>Active Connections</b>"
+msgstr "接通連線"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "找不到組態資料庫"
+# shell/e-shell-offline-handler.c:554
+#: shell/e-active-connection-dialog.glade.h:2
+#, fuzzy
+msgid "Active Connections"
+msgstr "接通連線"
 
-# shell/e-storage.c:461
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "一般錯誤"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "按“確定”關閉這些連線以離線"
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
@@ -19313,27 +20104,6 @@ msgstr "資料夾名稱不能包含換行字元。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是資料夾保留名稱。"
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution 現正離線中。"
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
-
-# mail/mail-autofilter.c:70
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "郵件送到 %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具似乎沒有安裝在系統上。"
@@ -19356,143 +20126,107 @@ msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 # shell/e-shortcuts-view.c:137
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "組別"
 
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "離線工作"
 
-# addressbook/contact-editor/e-contact-editor.c:1247
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-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-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "新增"
-
-# ui/evolution-tasks.xml.h:3
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "新增工作"
-
-#: shell/evolution-test-component.c:141
-#, fuzzy
-msgid "_Test"
-msgstr "測試"
-
-# ui/evolution-tasks.xml.h:2
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "Create a new test item"
-msgstr "建立一個新的工作"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
 
-# shell/e-shell-offline-handler.c:554
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "接通連線"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution 現正離線中。"
 
-# shell/e-shell-offline-handler.c:554
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "Active Connections"
-msgstr "接通連線"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "按“確定”關閉這些連線以離線"
+# mail/mail-autofilter.c:70
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "郵件送到 %s"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "行事曆(_A):"
+# calendar/gui/e-week-view-main-item.c:342
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-# ui/evolution-addressbook.xml.h:17
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "連絡人: "
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "郵件(_M):"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "工作(_T):"
+msgid "Uknown system error."
+msgstr "不明的錯誤"
 
-# shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#, fuzzy
-msgid "Folder _type:"
-msgstr "資料夾類型:"
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "無效的參數"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "開啟其他使用者的資料夾"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "不能於 OAF 註冊"
 
-# mail/mail-config.glade.h:3
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "帳號(_A):"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "找不到組態資料庫"
 
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "資料夾名稱(_F):"
+# shell/e-storage.c:461
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "一般錯誤"
 
-# mail/mail-config.glade.h:80
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "使用者(_U):"
+# 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:691
+msgid "New"
+msgstr "新增"
 
 # shell/importer/import.glade.h:2
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
 # shell/e-shell-importer.c:363
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "匯入檔案中"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "時區 "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "歡迎"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 #, fuzzy
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
@@ -19507,7 +20241,7 @@ msgstr ""
 "\n"
 "請單擊“下一步”按鈕繼續 。"
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 #, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
@@ -19520,25 +20254,22 @@ msgstr ""
 "\n"
 "單擊“完成”按鈕以儲存您的設定。"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+# ui/evolution-tasks.xml.h:3
+#: shell/evolution-test-component.c:140
 #, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution shell。"
+msgid "New Test"
+msgstr "新增工作"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "測試"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+# ui/evolution-tasks.xml.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution 測試元件。"
+msgid "Create a new test item"
+msgstr "建立一個新的工作"
 
 # shell/importer/import.glade.h:1
 #: shell/importer/import.glade.h:1
@@ -19623,7 +20354,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19661,7 +20392,7 @@ msgstr ""
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -19673,44 +20404,44 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:507
+#: shell/main.c:472
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強迫升級 Evolution 1.0.x 的組態檔案"
 
 # shell/main.c:185
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19787,6 +20518,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 # mail/mail-account-gui.c:682
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
@@ -20082,6 +20835,12 @@ msgstr "憑證 ID(_C):"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+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
@@ -20337,12 +21096,6 @@ msgstr "主旨是 %s"
 msgid "Certificate Signature Value"
 msgstr "憑證簽章失敗"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "名片 ID 已經存在"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -20520,8 +21273,8 @@ msgstr "檢視目前的連絡人"
 #: 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:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -21180,21 +21933,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:5
-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:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "關閉(_C)"
-
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
@@ -21713,6 +22451,21 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "復原(_U)"
 
+# ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+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:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "關閉(_C)"
+
 # ui/evolution-message-composer.xml.h:1
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -21823,11 +22576,6 @@ msgstr "使用另一名稱儲存目前的檔案"
 msgid "Save the message in a specified folder"
 msgstr "將郵件儲存至指定的資料夾"
 
-# ui/evolution-message-composer.xml.h:26
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "傳送"
-
 # ui/evolution-message-composer.xml.h:29
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
@@ -22551,7 +23299,7 @@ msgstr "Evolution 摘要元件。"
 
 # mail/mail-config.glade.h:69
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -22751,31 +23499,374 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+# camel/camel-sasl-kerberos4.c:218
+# camel/providers/imap/camel-imap-store.c:433
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "來自伺服器的不良許可回應。"
+
+# composer/e-msg-composer-attachment.glade.h:4
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "列出名稱(_N):"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#~ msgid "URL:"
+#~ msgstr "網址:"
+
+# addressbook/contact-editor/contact-editor.glade.h:7
+#~ msgid "contact-list-editor"
+#~ msgstr "連絡人清單編輯器"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+# addressbook/gui/widgets/e-addressbook-view.c:551
+# addressbook/gui/widgets/e-addressbook-view.c:611
+#~ msgid "Save List as VCard"
+#~ msgstr "儲存清單為 VCard 檔案格式"
+
+# shell/e-shortcuts-view.c:137
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "組別"
+
+# addressbook/conduit/address-conduit.c:655
+# calendar/conduits/calendar/calendar-conduit.c:732
+# calendar/conduits/todo/todo-conduit.c:546
+#~ msgid "Could not start wombat"
+#~ msgstr "無法啟動 wombat"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "行事曆(_A):"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#~ msgid "Audio Alarm Options"
+#~ msgstr "音效提醒選項"
+
+# addressbook/gui/component/select-names/select-names.glade.h:2
+#~ msgid "Message Alarm Options"
+#~ msgstr "訊息提醒選項"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#, fuzzy
+#~ msgid "Email Alarm Options"
+#~ msgstr "郵件提醒選項"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "程式提醒選項"
+
+# camel/camel-sasl-login.c:127
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "不明的提醒選項"
+
+#, fuzzy
+#~ msgid "Alarm Repeat"
+#~ msgstr "提醒重複"
+
+# views/mail/galview.xml.h:4
+#, fuzzy
+#~ msgid "Message to Display:"
+#~ msgstr "郵件顯示"
+
+#, fuzzy
+#~ msgid "Message to Send"
+#~ msgstr "郵件內容"
+
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#~ msgid "Play sound:"
+#~ msgstr "播放音效:"
+
+# calendar/gui/event-editor-dialog.glade.h:22
+# calendar/gui/event-editor.c:1597
+#~ msgid "Run program:"
+#~ msgstr "執行程式:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "具有這些參數:"
+
+#~ msgid "Basics"
+#~ msgstr "基本"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:7
+# calendar/gui/event-editor-dialog.glade.h:8
+#~ msgid "Date/Time:"
+#~ msgstr "日期/時間:"
+
+# calendar/gui/event-editor-dialog.glade.h:20
+#, fuzzy
+#~ msgid "Reminders"
+#~ msgstr "提醒"
+
+# addressbook/printing/e-contact-print.glade.h:23
+#~ msgid "_Options..."
+#~ msgstr "選項(_O)..."
+
+# addressbook/contact-editor/contact-editor.glade.h:18
+#~ msgid "Addressbook..."
+#~ msgstr "目錄服務..."
+
+# calendar/gui/event-editor-dialog.glade.h:20
+#~ msgid "Reminder"
+#~ msgstr "提醒"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#~ msgid "B_usy"
+#~ msgstr "忙碌(_U)"
+
+# calendar/gui/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#, fuzzy
+#~ msgid "Co_nfidential"
+#~ msgstr "機密"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:7
+# calendar/gui/event-editor-dialog.glade.h:8
+#, fuzzy
+#~ msgid "Date & Time"
+#~ msgstr "日期/時間:"
+
+# ui/evolution-calendar.xml.h:36
+#~ msgid "F_ree"
+#~ msgstr "空閒(_R)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:15
+# calendar/gui/event-editor-dialog.glade.h:16
+#~ msgid "Pri_vate"
+#~ msgstr "私人(_V)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:17
+# calendar/gui/event-editor-dialog.glade.h:17
+#~ msgid "Pu_blic"
+#~ msgstr "公開(_B)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:744
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "到會者"
+
+# addressbook/gui/component/addressbook-config.c:662
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "新增寄件者到目錄服務(_B)"
+
+# calendar/gui/event-editor-dialog.glade.h:11
+#, fuzzy
+#~ msgid "Exceptions"
+#~ msgstr "例外"
+
+# addressbook/printing/e-contact-print.glade.h:30
+#, fuzzy
+#~ msgid "Preview"
+#~ msgstr "預覽:"
+
+# calendar/gui/event-editor-dialog.glade.h:19
+#, fuzzy
+#~ msgid "Recurrence Rule"
+#~ msgstr "循環模式"
+
+# calendar/gui/event-editor-dialog.glade.h:7
+#~ msgid "_Custom recurrence"
+#~ msgstr "自訂週期性約會(_C)"
+
+# calendar/gui/event-editor-dialog.glade.h:12
+#~ msgid "_Modify"
+#~ msgstr "編輯(_M)"
+
+# calendar/gui/event-editor-dialog.glade.h:13
+#~ msgid "_No recurrence"
+#~ msgstr "非週期性約會(_N)"
+
+# calendar/gui/event-editor-dialog.glade.h:26
+#~ msgid "_Simple recurrence"
+#~ msgstr "簡單循環(_S)"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "% 完成"
+
+# calendar/gui/calendar-model.c:641
+# calendar/gui/calendar-model.c:1178
+# calendar/gui/dialogs/task-editor-dialog.glade.h:11
+# calendar/gui/e-calendar-table.c:420
+#, fuzzy
+#~ msgid "Progress"
+#~ msgstr "進行中"
+
+# calendar/gui/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#~ msgid "Con_fidential"
+#~ msgstr "機密(_F)"
+
+# ui/evolution-mail.xml.h:106
+# ui/evolution.xml.h:50
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "資料夾(_F):"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>開始:</b>"
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>結束:</b>"
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>已完成:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>逾期:</b>"
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>無</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "CORBA 系統發生錯誤\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "找不到物件\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "您沒有正確的權限可以更新行事曆\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "無法更新到會者狀態！\n"
+
+# addressbook/gui/component/addressbook-config.c:662
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "新增寄件者到目錄服務(_B)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:431
+#~ msgid "_Options"
+#~ msgstr "選項(_O)"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:607
+#~ msgid "Meeting _start time:"
+#~ msgstr "會議開始時間(_S):"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:631
+#~ msgid "Meeting _end time:"
+#~ msgstr "會議結束時間(_E):"
+
+# mail/mail-mt.c:190
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "發生於 %s 的錯誤：\n"
+#~ " %s"
+
+# camel/camel-smime-context.c:327
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "無法找到“%s”的憑證。"
+
+# mail/folder-browser.c:731
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "從郵件建立規則(_T)"
+
+# mail/mail-crypto.c:251
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "無法建立一個 S/MIME 解密文本。"
+
+# composer/evolution-composer.c:355
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "無法建立郵件編輯視窗：\n"
+#~ "無法作用 HTML 編輯器元件。"
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "目標規則"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "資料夾名稱(_F):"
+
+# ui/evolution.xml.h:61
+#~ 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
+#~ msgid "_Properties..."
+#~ msgstr "屬性(_P)..."
+
+# addressbook/contact-editor/e-contact-editor.c:1247
+#~ msgid "Checkbox"
+#~ msgstr "核取方塊"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#~ msgid "C_alendar:"
+#~ msgstr "行事曆(_A):"
+
+# ui/evolution-addressbook.xml.h:17
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "連絡人: "
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#~ msgid "_Mail:"
+#~ msgstr "郵件(_M):"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#~ msgid "_Tasks:"
+#~ msgstr "工作(_T):"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#, fuzzy
+#~ msgid "Folder _type:"
+#~ msgstr "資料夾類型:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "開啟其他使用者的資料夾"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#~ msgid "_Folder Name:"
+#~ msgstr "資料夾名稱(_F):"
+
+# mail/mail-config.glade.h:80
+#~ msgid "_User:"
+#~ msgstr "使用者(_U):"
+
 # camel/providers/imap/camel-imap-store.c:531
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "無法連線至 LDAP 伺服器"
 
-# camel/providers/imap/camel-imap-store.c:531
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "無法驗證進入 LDAP 伺服器"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "無法在 Root DSE 上執行查詢"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "伺服器回報了不支援的搜尋起點"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
-
 # mail/mail-callbacks.c:1349
 #~ msgid "Error retrieving schema information"
 #~ msgstr "接收模式資訊時發生錯誤"
 
-# camel/providers/imap/camel-imap-command.c:487
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "伺服器沒有回應有效的模式資訊"
-
 # mail/mail-config.glade.h:1
 #~ msgid "  S_how Supported Bases "
 #~ msgstr " 顯示支援的起點(_S) "
@@ -22870,10 +23961,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Webcam:"
 #~ msgstr "頁"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
-#~ msgid "Category editor not available."
-#~ msgstr "類別編輯器無法使用。"
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -22942,11 +24029,6 @@ msgstr "%s (%d%% 完成)"
 #~ "cancellation notice?"
 #~ msgstr "要刪除的事件是一個會議，您想要送出取消通知嗎？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "您確定要取消並刪除這個會議？"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -22961,55 +24043,18 @@ msgstr "%s (%d%% 完成)"
 #~ "cancellation notice?"
 #~ msgstr "要刪除的日誌項目已經公佈了，您想要送出取消通知嗎？"
 
-# calendar/gui/dialogs/delete-comp.c:102
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr "您確定要取消並刪除這個日誌項目？"
-
-# calendar/gui/dialogs/delete-comp.c:84
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "您確定要刪除約會 “%s”？"
-
 # calendar/gui/dialogs/delete-comp.c:87
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "您確定要刪除這個未命名的約會？"
 
-# calendar/gui/dialogs/delete-comp.c:93
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "您確定要刪除工作“%s”？"
-
 # calendar/gui/dialogs/delete-comp.c:96
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "您確定要刪除這個未命名的工作？"
 
-# calendar/gui/dialogs/delete-comp.c:102
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "您確定要刪除日誌項目 “%s”？"
-
 # calendar/gui/dialogs/delete-comp.c:105
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "您確定要刪除這個未命名的日誌？"
 
-# calendar/gui/dialogs/delete-comp.c:120
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "您確定要刪除 %d 個約會？"
-#~ msgstr[1] "您確定要刪除 %d 個約會？"
-
-# calendar/gui/dialogs/delete-comp.c:125
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "您確定要刪除 %d 個工作？"
-#~ msgstr[1] "您確定要刪除 %d 個工作？"
-
-# calendar/gui/dialogs/delete-comp.c:130
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "您確定要刪除 %d 個日誌項目？"
-#~ msgstr[1] "您確定要刪除 %d 個日誌項目？"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:411
 #~ msgid "_Invite Others..."
 #~ msgstr "邀請其他人(_I)..."
@@ -23045,11 +24090,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "The task information has changed. Send an updated version?"
 #~ msgstr "工作資訊已變更。是否傳送更新後的資訊？"
 
-# camel/camel-movemail.c:306
-#, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "無法取得群組：%s"
-
 # mail/mail-ops.c:1755
 #, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
@@ -23080,190 +24120,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "不明的伺服器回應： %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "調整目標"
-
-#~ msgid "Assign Color"
-#~ msgstr "指定色彩"
-
-#~ msgid "Assign Score"
-#~ msgstr "指定目標"
-
-#~ msgid "Attachments"
-#~ msgstr "附加檔案"
-
-# addressbook/printing/e-contact-print.glade.h:36
-#~ msgid "Beep"
-#~ msgstr "嗶聲"
-
-#~ msgid "contains"
-#~ msgstr "包含"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "複製至資料夾"
-
-#~ msgid "Date received"
-#~ msgstr "收件日期"
-
-#~ msgid "Date sent"
-#~ msgstr "送件日期"
-
-#~ msgid "Deleted"
-#~ msgstr "已刪除"
-
-#~ msgid "does not contain"
-#~ msgstr "不包含"
-
-#~ msgid "does not end with"
-#~ msgstr "不是以此結束"
-
-#~ msgid "does not exist"
-#~ msgstr "不存在"
-
-#~ msgid "does not return"
-#~ msgstr "沒有傳回"
-
-#~ msgid "does not sound like"
-#~ msgstr "不類似"
-
-#~ msgid "does not start with"
-#~ msgstr "不是以此開始"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "不存在"
-
-#~ msgid "Draft"
-#~ msgstr "草稿"
-
-#~ msgid "ends with"
-#~ msgstr "以此終結"
-
-#~ msgid "Exist"
-#~ msgstr "存在"
-
-#~ msgid "exists"
-#~ msgstr "存在"
-
-#~ msgid "Expression"
-#~ msgstr "詞句"
-
-#~ msgid "Follow Up"
-#~ msgstr "跟隨"
-
-#~ msgid "is"
-#~ msgstr "是"
-
-#~ msgid "is after"
-#~ msgstr "是之後的"
-
-#~ msgid "is before"
-#~ msgstr "是之前的"
-
-#~ msgid "is Flagged"
-#~ msgstr "有標幟的"
-
-#~ msgid "is greater than"
-#~ msgstr "大於"
-
-#~ msgid "is less than"
-#~ msgstr "小於"
-
-#~ msgid "is not"
-#~ msgstr "不是"
-
-#~ msgid "is not Flagged"
-#~ msgstr "沒有標幟的"
-
-# calendar/gui/goto-dialog.glade.h:9
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "6月"
-
-#~ msgid "Mailing list"
-#~ msgstr "郵件列表"
-
-#~ msgid "Message Body"
-#~ msgstr "郵件內容"
-
-#~ msgid "Message Header"
-#~ msgstr "郵件檔頭"
-
-# views/mail/galview.xml.h:4
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "郵件"
-
-# mail/folder-browser.c:706
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "標示成重要(_I)"
-
-#~ msgid "Move to Folder"
-#~ msgstr "移至資料夾"
-
-# ui/evolution.xml.h:19
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "離開這個程式"
-
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
-#~ msgid "Play Sound"
-#~ msgstr "播放音效"
-
-#~ msgid "Recipients"
-#~ msgstr "收件者"
-
-#~ msgid "Regex Match"
-#~ msgstr "正規表示式相配"
-
-#~ msgid "Replied to"
-#~ msgstr "回覆"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#~ msgid "returns"
-#~ msgstr "傳回"
-
-#~ msgid "returns greater than"
-#~ msgstr "傳回大於"
-
-#~ msgid "returns less than"
-#~ msgstr "傳回小於"
-
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "執行程式:"
-
-#~ msgid "Sender"
-#~ msgstr "寄件者"
-
-#~ msgid "Set Status"
-#~ msgstr "設定狀態"
-
-# addressbook/printing/e-contact-print.glade.h:36
-#~ msgid "Size (kB)"
-#~ msgstr "大小 (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "類似"
-
-#~ msgid "Source Account"
-#~ msgstr "來源帳號"
-
-#~ msgid "Specific header"
-#~ msgstr "指定檔頭"
-
-#~ msgid "starts with"
-#~ msgstr "以此開始"
-
-#~ msgid "Stop Processing"
-#~ msgstr "停止處理"
-
-#~ msgid "Unset Status"
-#~ msgstr "取消設定狀態"
-
 # mail/mail-mt.c:516
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
@@ -23544,11 +24400,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Finished"
 #~ msgstr "已完成"
 
-# shell/e-shortcuts-view.c:137
-#, fuzzy
-#~ msgid "Group:"
-#~ msgstr "組別"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -24181,10 +25032,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "component"
 #~ msgstr "約會"
 
-# calendar/gui/e-calendar-table.c:162
-#~ msgid "Alarms"
-#~ msgstr "提醒"
-
 # calendar/gui/e-calendar-table.c:156
 #~ msgid "Geographical Position"
 #~ msgstr "經緯位置"
@@ -24907,10 +25754,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Could not create a directory for the new addressbook."
 #~ msgstr "無法建立目錄 %s： %s"
 
-#, fuzzy
-#~ msgid "Select Contents from Address Book"
-#~ msgstr "從目錄服務選擇連絡人"
-
 # addressbook/contact-editor/contact-editor.glade.h:20
 #, fuzzy
 #~ msgid "Birthdays"
@@ -24991,11 +25834,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "行事曆資訊"
 
-# data/evolution.keys.in.h:2
-#, fuzzy
-#~ msgid "<b>Alarm Sound</b>"
-#~ msgstr "行事曆資訊"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
@@ -25003,19 +25841,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "<b>Classification</b>"
 #~ msgstr "分類"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
-#, fuzzy
-#~ msgid "<b>Date &amp; Time</b>"
-#~ msgstr "日期及時間"
-
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
-#, fuzzy
-#~ msgid "<b>Description</b>"
-#~ msgstr "描述:"
-
 #, fuzzy
 #~ msgid "<b>Su_mmary</b>"
 #~ msgstr "<b>開始:</b>"
@@ -25563,10 +26388,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "接收 LDAP 搜尋結果..."
 
-# executive-summary/component/e-summary.c:940
-#~ msgid "Error performing search"
-#~ msgstr "進行搜尋時發生錯誤"
-
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
 #, fuzzy
@@ -25717,11 +26538,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution 目錄服務迷你名片檢視"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 #~ msgid "Evolution Addressbook local backend"
@@ -25848,10 +26664,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Use Score"
 #~ msgstr "使用累計"
 
-# addressbook/conduit/address-conduit.c:201
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "無法載入滑鼠游標\n"
-
 # mail/mail-callbacks.c:1349
 #~ msgid "Folder containing contact information"
 #~ msgstr "資料夾包含連絡人資訊"
@@ -28466,9 +29278,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Emporia"
 #~ msgstr "恩波里亞"
 
-#~ msgid "Enid"
-#~ msgstr "恩尼德"
-
 # mail/mail-mt.c:516
 # mail/mail-mt.c:545
 # mail/mail-mt.c:880
@@ -30029,9 +30838,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "La Junta"
 #~ msgstr "亨塔"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -30467,10 +31273,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "曼莫斯湖"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
-#~ msgid "Managua"
-#~ msgstr "馬拿瓜"
-
 #~ msgid "Manassas"
 #~ msgstr "馬納沙斯"
 
@@ -33221,10 +34023,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "South Dakota"
 #~ msgstr "南達科他"
 
-# ui/evolution-calendar.xml.h:15
-#~ msgid "Southend"
-#~ msgstr "紹森"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -35699,10 +36497,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "View the selected folder"
 #~ msgstr "檢視選定的資料夾"
 
-# ui/evolution.xml.h:45
-#~ msgid "_Copy..."
-#~ msgstr "複製(_C)..."
-
 # ui/evolution.xml.h:51
 #~ msgid "_Folder Bar"
 #~ msgstr "資料夾清單(_F)"
@@ -35716,10 +36510,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "移至資料夾(_G)..."
 
-# ui/evolution.xml.h:57
-#~ msgid "_Move..."
-#~ msgstr "移動(_M)..."
-
 # ui/evolution.xml.h:59
 #~ msgid "_New Folder"
 #~ msgstr "新增資料夾(_N)"
@@ -35728,10 +36518,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "移除其他使用者的資料夾(_R)"
 
-# ui/evolution.xml.h:61
-#~ msgid "_Rename..."
-#~ msgstr "重新命名(_R)..."
-
 # ui/evolution.xml.h:62
 #~ msgid "_Shortcut Bar"
 #~ msgstr "功能列(_S)"
@@ -35740,10 +36526,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "_Shortcut..."
 #~ msgstr "功能(_S)..."
 
-# widgets/misc/e-messagebox.c:152
-#~ msgid "Information"
-#~ msgstr "資訊"
-
 # executive-summary/test-service/rdf-summary.c:512
 # executive-summary/test-service/rdf-summary.c:549
 # executive-summary/test-service/rdf-summary.c:594
@@ -35867,11 +36649,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Create _New Folder..."
 #~ msgstr "新增資料夾(_N)..."
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
-#~ msgid "_Contacts..."
-#~ msgstr "連絡人(_C)..."
-
 # addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 #~ msgid "Factory to import LDIF files into Evolution."
 #~ msgstr "匯入 LDIF 檔案到 Evolution 的元件工廠。"